manage-client 3.2.289 → 3.2.290-2

package/src/filiale/wenxi/ManageUserTypeSell.vue

@@ -45,6 +45,14 @@
                         :initresid='queryData.operatorid'>
             </res-select>
           </div>
+          <div class="col-sm-3 form-group">
+            <label class="font_normal_body" for="oper">pos收费:&nbsp;</label>
+            <v-select :value.sync="queryData.f_payment"
+                      v-model="queryData.f_payment"
+                      :options='f_payents' placeholder='请选择'
+                      condition="f_bank_name = '{}'"
+                      close-on-select></v-select>
+          </div>
           <div class="col-sm-2 form-group" style="float:right;">
             <button class="button_search" @click="searchData()">查询</button>
             <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':criteriaShow,
@@ -75,7 +83,8 @@ export default {
       queryData: {
         f_orgid: [],
         f_depid: [],
-        f_operatorid: []
+        f_operatorid: [],
+        f_payment: []
       },
       orgname: '',
       depresid: [],
@@ -84,6 +93,7 @@ export default {
       operatorname: '',
       operatorid: [],
       depid: [],
+      f_payents: [{label: 'pos收费', value: '在线支付'}],
       criteriaShow: false
     }
   },

package/src/main.js

@@ -6,9 +6,9 @@ import { all } from 'vue-client'
 import { system } from 'system-clients'
 import { ldap } from 'ldap-clients'
 import saleManage from './saleManage'
+import kelaisaleManage from './filiale/macheng/sale'
 import webmeterManage from './webmeterManage'
 import reportManage from './reportManage'
-import reportManageF from './filiale/xinkang/reportManage'
 import newmanage from './newmanage'
 import ManageHome from './ManageHome'
 import echarts from 'echarts'
@@ -46,11 +46,11 @@ ldap()
 system(false)
 
 saleManage()
+kelaisaleManage()
 webmeterManage()
 ManageHome()
 newmanage()
 reportManage()
-reportManageF()
 require('system-clients/src/styles/less/bootstrap.less')
 require('./components/qinhua/Style/qinhuaStyle.less')
 // require('./bootstrap/less/manageStyle/manageChile.less')