manage-client 3.2.109 → 3.2.111
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/components/SellReport/ManageBusSummary.vue +0 -3
- package/src/components/sale/businessquery/overDueQuery.vue +5 -5
- package/src/components/sale/businessquery/sellingChargePrice.vue +716 -716
- package/src/components/webmeter/WebmeterQuery.vue +64 -64
- package/src/filiale/tongchuan/DeviceQuery.vue +1 -1
- package/src/filiale/tongchuan/FillGasQuery.vue +1 -1
- package/src/filiale/tongchuan/PriceChangeQuery.vue +1 -1
- package/src/filiale/tongchuan/UserDeviceQuery.vue +1 -1
- package/src/main.js +66 -66
- package/.gradle/4.4/taskHistory/taskHistory.lock +0 -0
package/package.json
CHANGED
|
@@ -173,9 +173,6 @@
|
|
|
173
173
|
if(this.f_operatorid && this.f_operatorid[0]) {
|
|
174
174
|
orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
|
|
175
175
|
}*/
|
|
176
|
-
if(this.f_state && this.f_state[0]) {
|
|
177
|
-
orgcondition += ` and f_state in('${this.f_state.toString().replace(/,/g,"','")}')`
|
|
178
|
-
}
|
|
179
176
|
this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
|
|
180
177
|
this.$refs.paged.search(args)
|
|
181
178
|
},
|
|
@@ -229,12 +229,12 @@
|
|
|
229
229
|
user:[],
|
|
230
230
|
},
|
|
231
231
|
//排序
|
|
232
|
-
orderitem:'
|
|
232
|
+
orderitem:'f_operate_date desc',
|
|
233
233
|
orderFields: {
|
|
234
|
-
|
|
234
|
+
f_operate_date: 'no'
|
|
235
235
|
},
|
|
236
|
-
orderDefault: "'
|
|
237
|
-
model: new PagedList('rs/sql/overDueQuery', 20,{orderitem: this.orderitem?`${this.orderitem}`:"'
|
|
236
|
+
orderDefault: "'f_operate_date desc'",
|
|
237
|
+
model: new PagedList('rs/sql/overDueQuery', 20,{orderitem: this.orderitem?`${this.orderitem}`:"'f_operate_date desc'"},{
|
|
238
238
|
f_latefee_ought:0
|
|
239
239
|
}),
|
|
240
240
|
f_orgid: this.$login.f.orgid,
|
|
@@ -439,7 +439,7 @@
|
|
|
439
439
|
}
|
|
440
440
|
return {
|
|
441
441
|
condition: con,
|
|
442
|
-
orderitem: this.orderitem?`${this.orderitem}`: "
|
|
442
|
+
orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"
|
|
443
443
|
}
|
|
444
444
|
},
|
|
445
445
|
getfield() {
|