manage-client 3.2.108 → 3.2.111

package/package.json

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

package/src/components/SellReport/ManageBusSummary.vue

@@ -173,9 +173,6 @@
         if(this.f_operatorid && this.f_operatorid[0]) {
           orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
         }*/
-        if(this.f_state && this.f_state[0]) {
-          orgcondition += ` and f_state in('${this.f_state.toString().replace(/,/g,"','")}')`
-        }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)
       },

package/src/components/daping/CallCenter.vue

@@ -84,7 +84,7 @@
 
 <script>
   import {HttpResetClass} from "vue-client";
-  import dataManage from 'src/components/daping/json/dataManage.json'
+  import dataManage from './json/dataManage.json'
   export default {
     title: '收费',
     data() {

package/src/components/daping/DataManagement.vue

@@ -84,7 +84,7 @@
 
 <script>
 import {HttpResetClass} from 'vue-client'
-import dataManage from 'src/components/daping/json/dataManage.json'
+import dataManage from './json/dataManage.json'
 export default {
   title: '数据展示',
   data() {

package/src/components/daping/SafecheckBarChart.vue

@@ -5,7 +5,7 @@
 
 <script>
   import {HttpResetClass} from "vue-client";
-  import dataManage from 'src/components/daping/json/dataManage.json'
+  import dataManage from './json/dataManage.json'
   export default {
     title: '收费',
     data() {

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

@@ -266,9 +266,6 @@
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               卡费合计:&emsp;{{sumsmodel.f_cardfees}}
             </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              户数合计:&emsp;{{sumsmodel.hushu}}
-            </td>
           </tr>
         </table>
       </div>
@@ -312,7 +309,7 @@
         data: {},
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/fillCardQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_cardfees: 0,hushu:0}),
+        model: new PagedList('rs/sql/fillCardQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_cardfees: 0}),
         criteriaShow: false,
         headData: ["客户编号", "客户名称", "客户电话", "身份证号", "地址", "补卡类型", "表编号", "卡号", "气表品牌", "气表状态", "卡费", "补卡日期", "人员", "部门", "公司"],
         bodyData: ["f_userinfo_code", "f_user_name", "f_user_phone", "f_idnumber", "address", " f_type", "f_user_id", "f_card_id", "f_meter_brand", "f_table_state", "f_cardfees", "f_operate_date", "f_operator", "f_depname", "f_orgname"],
@@ -396,7 +393,6 @@
         args.condition = `${args.condition}` + this.orgCondtionStr
        await this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
-        this.sumsmodel.hushu=[...new Set(this.$refs.paged.$refs.grid.model.rows.map(item => item.f_userinfo_code))].length
       },
 
       initParams() {

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

@@ -229,12 +229,12 @@
           user:[],
         },
         //排序
-        orderitem:'f_open_date desc',
+        orderitem:'f_operate_date desc',
         orderFields: {
-          f_open_date: 'no'
+          f_operate_date: 'no'
         },
-        orderDefault: "'f_open_date desc'",
-        model: new PagedList('rs/sql/overDueQuery', 20,{orderitem: this.orderitem?`${this.orderitem}`:"'f_open_date desc'"},{
+        orderDefault: "'f_operate_date desc'",
+        model: new PagedList('rs/sql/overDueQuery', 20,{orderitem: this.orderitem?`${this.orderitem}`:"'f_operate_date desc'"},{
           f_latefee_ought:0
         }),
         f_orgid: this.$login.f.orgid,
@@ -439,7 +439,7 @@
       }
       return {
         condition: con,
-        orderitem: this.orderitem?`${this.orderitem}`: " f_open_date desc"
+        orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"
       }
     },
     getfield() {