manage-client 3.2.289 → 3.2.290

package/package.json

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

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

@@ -65,7 +65,7 @@
                                 :footer="$parent.$parent.footer"
                                 :header="$parent.$parent.other"
                                 sqlurl="rs/logic/exportfile"
-                                sql-name="areaGeneralQuery"
+                                sql-name="newAreaGeneralQuery"
                                 template-name='小区综合查询导出'
                                 :choose-col="true"></export-excel>
                   <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"

package/src/filiale/rongcheng/AreaBuildingInfoSummary.vue

@@ -228,7 +228,7 @@ export default {
       if (!this.f_filialeid) {
         this.f_filialeid = this.$login.f.orgid
       }
-      args.condition = `${args.condition} and ui.f_orgid = '${this.f_filialeid}'`
+      args.condition = `${args.condition} and ui.f_filialeid = '${this.f_filialeid}'`
       this.criteriaShow = false
       this.$refs.paged.$refs.grid.$el.scrollTop = 0
       this.condition = args.condition
@@ -248,7 +248,7 @@ export default {
       let HttpReset = new HttpResetClass()
       var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
         data: {
-          condition: `1=1 and s.f_orgid = '${this.$login.f.orgid}'`
+          condition: `1=1 and s.f_filialeid = '${this.$login.f.orgid}'`
         }
       }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
       console.log('小区',data)
@@ -260,7 +260,7 @@ export default {
       this.residentialArea = house
       let street= await HttpReset.load('POST', 'rs/sql/manage_getstreetlist', {
         data: {
-          condition: `1=1 and s.f_orgid = '${this.$login.f.orgid}'`
+          condition: `1=1 and s.f_filialeid = '${this.$login.f.orgid}'`
         }
       }, {resolveMsg: null, rejectMsg: '获取区域失败!'})
       console.log('区域',data)

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
     }
   },