manage-client-xy 3.2.9 → 3.2.11

package/build/dev-server.js

@@ -11,7 +11,7 @@ var compiler = webpack(config)
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
 // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
-var bendi = 'http://127.0.0.1:8888/'
+var bendi = 'http://172.16.16.163:8300/'
   , fuwu = 'http://172.16.16.163:8300/'
 // ,fuwu = 'http://172.16.16.163:8300/'
 var proxyTable = {
@@ -22,12 +22,6 @@ var proxyTable = {
   '/rs/logic/exportfile': {
     target: bendi
   },
-  '/rs/logic/saleExport': {
-    target: fuwu
-  },
-  '/rs/sql/qc_statistics_manage': {
-    target: fuwu
-  },
   '/files': {
     target: fuwu
   },
@@ -84,7 +78,7 @@ var proxyTable = {
     target: fuwu
   },
   '/rs/logic/SumSettleFileImport': {
-    target: fuwu
+    target: 'http://127.0.0.1:8087'
   },
   '/rs': {
     target: fuwu

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client-xy",
-  "version": "3.2.9",
+  "version": "3.2.11",
   "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/components/sale/filesquery/UserQuery.vue

@@ -45,9 +45,9 @@
                   <div class="col-sm-2">
                     <label class="font_normal_body">客户状态</label>
                     <v-select :value.sync="model.f_user_state"
-                              v-model="model.f_user_state"
+                              v-model="model.f_user_state" multiple
                               :options='$parent.$parent.userstates' placeholder='请选择'
-                              condition="f_user_state = '{}'"
+                              condition="f_user_state in {}"
                               close-on-select></v-select>
                   </div>
                   <div class="col-sm-2">
@@ -253,9 +253,9 @@
                   <div class="col-sm-2">
                     <label class="font_normal_body">气表状态</label>
                     <v-select :value.sync="model.f_table_state"
-                              v-model="model.f_table_state"
+                              v-model="model.f_table_state" multiple
                               :options='$parent.$parent.meterstate' placeholder='请选择'
-                              condition="f_table_state = '{}'"
+                              condition="f_table_state in {}"
                               close-on-select></v-select>
                   </div>
                 </div>