manage-client 3.2.97 → 3.2.99-2
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/sale/businessquery/HandplanQuery.vue +8 -10
- package/src/filiale/liaoyuan/HandplanQuery.vue +1288 -0
- package/src/filiale/liaoyuan/sale.js +2 -0
- package/src/filiale/qianneng/MeterQuery.vue +1016 -0
- package/src/filiale/qianneng/sale.js +14 -12
- package/src/filiale/rongchuang/SellingTable.vue +251 -250
- package/src/filiale/shaoguan/HandplanQuery.vue +7 -5
- package/src/main.js +66 -65
package/package.json
CHANGED
|
@@ -13,8 +13,7 @@
|
|
|
13
13
|
v-model="model.startDate"
|
|
14
14
|
:value.sync="model.startDate"
|
|
15
15
|
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
16
|
-
:show-reset-button="true"
|
|
17
|
-
condition="f_input_date >= '{}'">
|
|
16
|
+
:show-reset-button="true">
|
|
18
17
|
</datepicker>
|
|
19
18
|
</div>
|
|
20
19
|
<div class="col-sm-2 form-group">
|
|
@@ -23,8 +22,7 @@
|
|
|
23
22
|
v-model="model.endDate"
|
|
24
23
|
:value.sync="model.endDate"
|
|
25
24
|
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
26
|
-
:show-reset-button="true"
|
|
27
|
-
condition="f_input_date <= '{}'">
|
|
25
|
+
:show-reset-button="true">
|
|
28
26
|
</datepicker>
|
|
29
27
|
</div>
|
|
30
28
|
<div class="col-sm-2 form-group">
|
|
@@ -352,7 +350,7 @@
|
|
|
352
350
|
</th>
|
|
353
351
|
<th>
|
|
354
352
|
<nobr>上期底数</nobr>
|
|
355
|
-
</th
|
|
353
|
+
</th>
|
|
356
354
|
<th>
|
|
357
355
|
<nobr>本期底数</nobr>
|
|
358
356
|
</th>
|
|
@@ -743,8 +741,8 @@
|
|
|
743
741
|
// self.loadMeterBooks()
|
|
744
742
|
self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
|
|
745
743
|
self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
|
|
746
|
-
self.$refs.paged.$refs.cri.model.handStartDate = self.$login.toStandardDateString() + ' 00:00:00'
|
|
747
|
-
self.$refs.paged.$refs.cri.model.handEndDate = self.$login.toStandardDateString() + ' 23:59:59'
|
|
744
|
+
// self.$refs.paged.$refs.cri.model.handStartDate = self.$login.toStandardDateString() + ' 00:00:00'
|
|
745
|
+
// self.$refs.paged.$refs.cri.model.handEndDate = self.$login.toStandardDateString() + ' 23:59:59'
|
|
748
746
|
|
|
749
747
|
// self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
|
|
750
748
|
// self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
|
|
@@ -766,7 +764,7 @@
|
|
|
766
764
|
other:[],
|
|
767
765
|
footer:[],
|
|
768
766
|
data: {},
|
|
769
|
-
model: new PagedList('rs/sql/handplanQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`' z '
|
|
767
|
+
model: new PagedList('rs/sql/handplanQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`' z '`,startDate: 'this.model.startDate', endDate: 'this.model.endDate'}, {
|
|
770
768
|
f_oughtamount: 0,
|
|
771
769
|
f_oughtfee: 0,
|
|
772
770
|
f_debt_money: 0,
|
|
@@ -1052,8 +1050,8 @@
|
|
|
1052
1050
|
this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
|
|
1053
1051
|
this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
|
|
1054
1052
|
}
|
|
1055
|
-
if (this.$refs.paged.$refs.cri.model.
|
|
1056
|
-
this.$showMessage('
|
|
1053
|
+
if (this.$refs.paged.$refs.cri.model.startDate === ''|| this.$refs.paged.$refs.cri.model.endDate === '') {
|
|
1054
|
+
this.$showMessage('请选择录入日期开始时间和结束时间!')
|
|
1057
1055
|
return
|
|
1058
1056
|
}
|
|
1059
1057
|
this.area = this.$refs.paged.$refs.cri.model.f_residential_area
|