manage-client-xy 3.2.9 → 3.2.10

package/package.json

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

package/src/components/sale/businessquery/OtherChargeQuery.vue

@@ -83,6 +83,15 @@
                             close-on-select clear-button>
                   </v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">是否<br/>手持设备</label>
+                  <v-select :value.sync="$parent.$parent.f_outlets"
+                            :options="$parent.$parent.isPos"
+                            :search="false"
+                            placeholder='请选择'
+                            condition="{}"
+                            close-on-select></v-select>
+                </div>
               </div>
             </div>
           </criteria>
@@ -246,6 +255,8 @@
         },
         show:false,
         showdetail:false,
+        isPos: [{label: '全部', value: ''}, {label: '是', value: '是'}, {label: '否', value: '否'}],
+        f_outlets: [],
         otherchargeid:'',
         rowdata:{},
         //合计数据
@@ -266,6 +277,12 @@
         this.$refs.paged.$refs.cri.search()
       },
       selfSearch(args) {
+        // 手持设备查询条件
+        if(this.f_outlets[0] === '是'){
+          args.condition += ` and f_outlets = '手持设备'`
+        } else if (this.f_outlets[0] === '否'){
+          args.condition += ` and f_outlets is null`
+        }
         args.condition = `${args.condition}` + this.orgCondtionStr
         this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums

package/src/main.js

@@ -4,10 +4,10 @@ import { all } from 'vue-client'
 import { system } from 'system-clients'
 import { sale } from 'sale-client'
 import saleManage from './saleManage'
-import webmeterManage from './webmeterManage'
-import reportManage from './reportManage'
-import newmanage from './newmanage'
-import ManageHome from './ManageHome'
+// 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';
 
@@ -41,10 +41,10 @@ all()
 sale()
 system(false)
 saleManage()
-webmeterManage()
-ManageHome()
-newmanage()
-reportManage()
+// webmeterManage()
+// ManageHome()
+// newmanage()
+// reportManage()
 require('./bootstrap/less/bootstrap.less')
 require('./bootstrap/less/manageStyle/manageStyle.less')
 require('./bootstrap/less/manageStyle/manageChile.less')