manage-client 3.3.240 → 3.3.241

package/package.json

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

package/src/filiale/kelai/NewAccountQuery.vue

@@ -60,11 +60,10 @@
                   <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
                   <!--<button class="btn btn-default" @click="$parent.$parent.stamp()">打印</button>-->
 
-<!--                  <export-excel :data="$parent.$parent.getCondition"-->
-<!--                                :field="$parent.$parent.getfield"-->
-<!--                                v-if="$parent.$parent.authArr.includes('开户查询导出')"-->
-<!--                                sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="newAccountQuery" template-name='开户查询导出'-->
-<!--                                :choose-col="true"></export-excel>-->
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="newAccountQuery" template-name='开户查询导出'
+                                :choose-col="true"></export-excel>
 
 <!--                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>-->
                 </div>
@@ -215,8 +214,7 @@
 
 <script>
   import {PagedList} from 'vue-client'
-  import defaultPrint from './../../components/sale/config/DefaultPrint'
-  import exportConfig from './../../components/sale/config/exportConfig'
+  import exportConfig from './exportConfig'
   import plugins from './../../plugins/GetLoginInfoService'
 
   let readySomething = async function (self) {
@@ -251,8 +249,8 @@
         fields: {},
         thead: '',
         tfoot: '',
-        orgCondtionStr: '(' + this.$login.f.orgid + ')',
-        // orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`,
+        //orgCondtionStr: '(' + this.$login.f.orgid + ')',
+        orgCondtionStr: ``,
         meterbrands: [],
         showinfo:false,
         rowdata:{},
@@ -395,15 +393,9 @@
         return this.$login.r ? this.$login.r : []
       },
       getCondition () {
-        var con = ""
-        if (this.orgCondtionStr) {
-          con = `${this.$refs.paged.$refs.cri.condition} and u.f_orgid in  (${this.orgCondtionStr})`
-        }
-        else {
-          con = `${this.$refs.paged.$refs.cri.condition}and u.f_orgid in ('${this.$login.f.orgid}' )`
-        }
         return {
-          condition: con
+          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+          orderitem: this.orderitem?`${this.orderitem}`: " f_open_date desc"
         }
       },
       getfield() {

package/src/filiale/kelai/exportConfig.js

@@ -596,9 +596,12 @@ export default{
     'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司'
   },
   NewAccountConfig: {
-    'f_userinfo_code': '用户编号', 'f_user_name': '用户姓名', 'f_user_phone': '用户电话', 'f_idnumber': '身份证号', 'f_address': '客户地址', 'f_price_name': '气价名称',
-    'f_open_date': '开户时间', 'f_meternumber': '表号', 'f_gas_person': '置换员', 'f_gas_date': '通气时间',
-    'f_total_gas': '累购气量', 'f_meter_brand': '气表品牌', 'isbgl': '是否有壁挂炉', 'f_operator': '操作员'
+    'f_userinfo_code': '用户编号',
+    'f_user_name': '用户姓名',
+    'f_user_phone': '用户电话',
+    'f_idnumber': '身份证号',
+    'f_address': '客户地址',
+    'f_open_date': '开户时间'
   },
   Wrongquery: {
     'f_userinfo_code': '用户编号', 'f_meternumber': '表号', 'f_operator_date': '抄表时间', 'f_operator_type': '错误类型', 'f_error_type': '错误原因', 'f_bankname': '银行名称', 'f_msg': '错误信息'