sale-client 3.6.341 → 3.6.343
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/.gradle/5.2.1/fileChanges/last-build.bin +0 -0
- package/.gradle/5.2.1/fileHashes/fileHashes.lock +0 -0
- package/.gradle/5.2.1/gc.properties +0 -0
- package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.gradle/buildOutputCleanup/cache.properties +2 -0
- package/.gradle/vcs-1/gc.properties +0 -0
- package/package.json +1 -1
- package/src/components/charge/business/OtherChargeAudit.vue +5 -3
- package/src/components/common/userinfo_detail/ic_detail/HandQueryUser.vue +1 -1
- package/src/components/revenue/HandManager/HandManager.vue +27 -25
- package/src/filiale/bayan/ChargeManage.vue +37 -35
- package/src/filiale/meihekou/HandManager.vue +27 -28
- package/src/filiale/yangchun/HandplanQuery.vue +1403 -0
- package/src/filiale/yangchun/machineHand.vue +2157 -0
- package/src/filiale/yangchun/machineHandAudit.vue +12 -1
- package/src/filiale/yangchun/sale.js +4 -0
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
File without changes
|
package/package.json
CHANGED
|
@@ -163,7 +163,9 @@ export default {
|
|
|
163
163
|
}
|
|
164
164
|
},
|
|
165
165
|
ready () {
|
|
166
|
-
|
|
166
|
+
setTimeout(()=>{
|
|
167
|
+
this.search()
|
|
168
|
+
},300)
|
|
167
169
|
},
|
|
168
170
|
methods: {
|
|
169
171
|
loadMeterBooks () {
|
|
@@ -211,7 +213,7 @@ export default {
|
|
|
211
213
|
}
|
|
212
214
|
},
|
|
213
215
|
async success (row) {
|
|
214
|
-
let res = await this.$showMessage('
|
|
216
|
+
let res = await this.$showMessage('确定审核通过吗?操作后将不可取消', ['confirm', 'cancel'])
|
|
215
217
|
if (res === 'confirm') {
|
|
216
218
|
row['f_audit_person'] = this.$login.f.name
|
|
217
219
|
let data = {
|
|
@@ -247,7 +249,7 @@ export default {
|
|
|
247
249
|
}
|
|
248
250
|
},
|
|
249
251
|
async faild (row) {
|
|
250
|
-
let res = await this.$showMessage('
|
|
252
|
+
let res = await this.$showMessage('确定审核不通过吗?操作后将不可取消', ['confirm', 'cancel'])
|
|
251
253
|
if (res === 'confirm') {
|
|
252
254
|
row['f_audit_person'] = this.$login.f.name
|
|
253
255
|
let data = {
|
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
|
|
53
53
|
<div style="float: right">
|
|
54
54
|
<button @click="search()" class="button_search" style="margin-right: 10px" v-el:cba>查询</button>
|
|
55
|
-
<print-data :defaultfield="$parent.$parent.defaultfield" :field="$parent.$parent.fields" :
|
|
55
|
+
<print-data :defaultfield="$parent.$parent.defaultfield" :field="$parent.$parent.fields" :model="$parent.$parent.printModel"
|
|
56
56
|
@print-data="$parent.$parent.print()"
|
|
57
57
|
:starthead="$parent.$parent.starthead"
|
|
58
58
|
titletable="预存气费打印明细"
|
|
@@ -968,36 +968,38 @@
|
|
|
968
968
|
f_operatorid: this.$login.f.id
|
|
969
969
|
}
|
|
970
970
|
console.log('下发参数：', param)
|
|
971
|
-
await this.$resetpost('rs/logic/downHand', {data: param}, {resolveMsg: null, rejectMsg: null}).then((res) => {
|
|
971
|
+
await this.$resetpost('rs/logic/downHand', {data: param}, {resolveMsg: null, rejectMsg: null}).then(async (res) => {
|
|
972
972
|
console.log('下发计划成功')
|
|
973
|
-
|
|
974
|
-
|
|
975
|
-
|
|
976
|
-
|
|
977
|
-
|
|
978
|
-
|
|
979
|
-
|
|
980
|
-
|
|
981
|
-
|
|
973
|
+
let hanid = await this.$resetpost('/rs/sql/querySingleTable', {
|
|
974
|
+
data: {
|
|
975
|
+
items: 'max(id) id',
|
|
976
|
+
tablename: 't_handplan',
|
|
977
|
+
condition: ` f_userfiles_id = '${this.danhu.info.f_userfiles_id}' `
|
|
978
|
+
}
|
|
979
|
+
}, {resolveMsg: null, rejectMsg: '查询抄表信息失败'})
|
|
980
|
+
let handParam = {
|
|
981
|
+
f_meter_classify: this.danhu.info.f_meter_classify,
|
|
982
|
+
f_meter_brand: this.danhu.info.f_meter_brand,
|
|
983
|
+
f_hand_id: hanid.data[0].id,
|
|
984
|
+
f_tablebase: this.danhu.f_tablebase,
|
|
985
|
+
f_userinfo_id: this.danhu.info.f_userinfo_id
|
|
982
986
|
}
|
|
983
|
-
|
|
984
|
-
|
|
985
|
-
|
|
986
|
-
|
|
987
|
-
|
|
988
|
-
|
|
989
|
-
|
|
990
|
-
|
|
991
|
-
|
|
992
|
-
|
|
993
|
-
rejectMsg: null
|
|
994
|
-
}).then((res) => {
|
|
995
|
-
this.$showAlert(`单户抄表成功!`, 'success', 2000)
|
|
996
|
-
this.danhuShow()
|
|
987
|
+
await this.$resetpost('rs/logic/sale_commonEnter', {data: handParam}, {
|
|
988
|
+
resolveMsg: null,
|
|
989
|
+
rejectMsg: null
|
|
990
|
+
}).then((res) => {
|
|
991
|
+
this.$showAlert(`单户抄表成功!`, 'success', 2000)
|
|
992
|
+
this.danhuShow()
|
|
993
|
+
}).catch((error) => {
|
|
994
|
+
this.danhu.show = false
|
|
995
|
+
this.$showAlert(`单户抄表失败!` + JSON.toString(error), 'danger', 2000)
|
|
996
|
+
})
|
|
997
997
|
}).catch((error) => {
|
|
998
998
|
this.danhu.show = false
|
|
999
|
-
this.$showAlert(
|
|
999
|
+
this.$showAlert(`下发失败,请注意查看，失败原因：` + JSON.toString(error), 'danger', 2000)
|
|
1000
|
+
|
|
1000
1001
|
})
|
|
1002
|
+
|
|
1001
1003
|
},
|
|
1002
1004
|
// 获得本月的最后一天。
|
|
1003
1005
|
getLastDayOfMonth (year, month) {
|
|
@@ -1,44 +1,46 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<div
|
|
3
|
-
<div class="
|
|
4
|
-
<
|
|
5
|
-
|
|
6
|
-
<div class="binary-right" style="width:68%;overflow-y: scroll" >
|
|
7
|
-
<div :style="{height:(row?'auto':'100%')}">
|
|
8
|
-
<!--<div class="auto" v-if="sustainMoney != null">-->
|
|
9
|
-
<!--<h2 style="margin-top: 10px">当前连续收款金额: {{sustainMoney}}</h2>-->
|
|
10
|
-
<!--</div>-->
|
|
11
|
-
<div>
|
|
12
|
-
<charge-list :row="row" @select-oper="showWork" @dblclick="toBusiness" @deal-msg="dealMsg"
|
|
13
|
-
v-ref:list></charge-list>
|
|
14
|
-
|
|
15
|
-
<div class="auto" style="margin-top: 1%;" v-if="row">
|
|
16
|
-
<charge-oper :data.sync="row" :card-info="cardInfo" v-ref:oper></charge-oper>
|
|
17
|
-
</div>
|
|
2
|
+
<div>
|
|
3
|
+
<div id="unit" class="flex-row three" v-show="listpage">
|
|
4
|
+
<div class="binary-left" style="overflow: scroll;width:15%" >
|
|
5
|
+
<mulitinfo :warninginfo="warningInfo" style="height:auto" @deal-msg="dealMsg" :data="row" :card-data="cardInfo" v-ref:info></mulitinfo>
|
|
18
6
|
</div>
|
|
7
|
+
<div class="binary-right" style="width:68%;overflow-y: scroll" >
|
|
8
|
+
<div :style="{height:(row?'auto':'100%')}">
|
|
9
|
+
<!--<div class="auto" v-if="sustainMoney != null">-->
|
|
10
|
+
<!--<h2 style="margin-top: 10px">当前连续收款金额: {{sustainMoney}}</h2>-->
|
|
11
|
+
<!--</div>-->
|
|
12
|
+
<div>
|
|
13
|
+
<charge-list :row="row" @select-oper="showWork" @dblclick="toBusiness" @deal-msg="dealMsg"
|
|
14
|
+
v-ref:list></charge-list>
|
|
15
|
+
|
|
16
|
+
<div class="auto" style="margin-top: 1%;" v-if="row">
|
|
17
|
+
<charge-oper :data.sync="row" :card-info="cardInfo" v-ref:oper></charge-oper>
|
|
18
|
+
</div>
|
|
19
|
+
</div>
|
|
20
|
+
</div>
|
|
19
21
|
</div>
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
22
|
+
<div class="binary-right" style="width:22%" >
|
|
23
|
+
<ul class="nav nav-pills span" style="height:auto;margin:8px 0px;padding:4px 0;border-bottom: 1px solid #e7e7e7;" class="nav nav-tabs" >
|
|
24
|
+
<li ><a :style="selectFiled == '其他信息'?'color:#333333!important;':'color:#666666!important;'" :class="{'tel_voiceActive':selectFiled == '其他信息','tel_f_size':selectFiled != '其他信息'}" href="#" @click="setField('其他信息')">其他信息</a></li>
|
|
25
|
+
<li ><a :style="selectFiled == '历史操作'?'color:#333333!important;':'color:#666666!important;'" :class="{'tel_voiceActive':selectFiled == '历史操作','tel_f_size':selectFiled != '历史操作'}" href="#" @click="setField('历史操作')">历史操作</a></li>
|
|
26
|
+
<li v-if="row ?row.f_meter_type=='机表' : false"><a :style="selectFiled == '历史抄表'?'color:#333333!important;':'color:#666666!important;'" :class="{'tel_voiceActive':selectFiled == '历史抄表','tel_f_size':selectFiled != '历史抄表'}" href="#" @click="setField('历史抄表')">历史抄表</a></li>
|
|
27
|
+
</ul>
|
|
28
|
+
<div class="tab-content span" style="overflow-y: auto">
|
|
29
|
+
<otherinfo v-show="worktype === '其他信息'" style="height:auto" @deal-msg="dealMsg" :data="row" :card-data="cardInfo" v-ref:info></otherinfo>
|
|
30
|
+
<card-list v-show="worktype === '历史操作'" :btns="operatebtn" :f_orgid="f_orgid" :userinfoid="row ? row.f_userinfo_code : ''" @list-select-oper="recordCancel"
|
|
31
|
+
v-ref:card></card-list>
|
|
32
|
+
<hand-list v-if="worktype === '历史抄表'" :f_userfiles_id="row ? row.f_userfiles_id : ''" v-ref:hand></hand-list>
|
|
33
|
+
</div>
|
|
34
|
+
|
|
32
35
|
</div>
|
|
33
36
|
|
|
34
37
|
</div>
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
<
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
<charge-modal :warninginfo="warningInfo" :row="modalrow" :modal-show.sync="showModal" @close="close" @modalsuccess="modalsuccess"></charge-modal>
|
|
38
|
+
<div v-if="!listpage">
|
|
39
|
+
<user-info-detail-manage-new parentname="charge-manage" :f_userfiles_id="rowData.f_userfiles_id" @cancel-main="cancel" @cancel-re="cancelAndRefresh"></user-info-detail-manage-new>
|
|
40
|
+
</div>
|
|
41
|
+
<div v-if="showModal">
|
|
42
|
+
<charge-modal :warninginfo="warningInfo" :row="modalrow" :modal-show.sync="showModal" @close="close" @modalsuccess="modalsuccess"></charge-modal>
|
|
43
|
+
</div>
|
|
42
44
|
</div>
|
|
43
45
|
</template>
|
|
44
46
|
<script>
|
|
@@ -934,37 +934,36 @@
|
|
|
934
934
|
f_operatorid: this.$login.f.id
|
|
935
935
|
}
|
|
936
936
|
console.log('下发参数：', param)
|
|
937
|
-
await this.$resetpost('rs/logic/downHand', {data: param}, {resolveMsg: null, rejectMsg: null}).then((res) => {
|
|
938
|
-
|
|
939
|
-
|
|
940
|
-
|
|
941
|
-
|
|
942
|
-
|
|
943
|
-
|
|
944
|
-
|
|
945
|
-
|
|
946
|
-
|
|
947
|
-
|
|
937
|
+
await this.$resetpost('rs/logic/downHand', {data: param}, {resolveMsg: null, rejectMsg: null}).then(async (res) => {
|
|
938
|
+
let hanid = await this.$resetpost('/rs/sql/querySingleTable', {
|
|
939
|
+
data: {
|
|
940
|
+
items: 'max(id) id',
|
|
941
|
+
tablename: 't_handplan',
|
|
942
|
+
condition: ` f_userfiles_id = '${this.danhu.info.f_userfiles_id}' `
|
|
943
|
+
}
|
|
944
|
+
}, {resolveMsg: null, rejectMsg: '查询抄表信息失败'})
|
|
945
|
+
let handParam = {
|
|
946
|
+
f_meter_classify: this.danhu.info.f_meter_classify,
|
|
947
|
+
f_meter_brand: this.danhu.info.f_meter_brand,
|
|
948
|
+
f_hand_id: hanid.data[0].id,
|
|
949
|
+
f_result_state: this.f_new_result_state,
|
|
950
|
+
f_operator: this.$login.f.name,
|
|
951
|
+
f_tablebase: this.danhu.f_tablebase,
|
|
952
|
+
f_userinfo_id: this.danhu.info.f_userinfo_id
|
|
948
953
|
}
|
|
949
|
-
|
|
950
|
-
|
|
951
|
-
|
|
952
|
-
|
|
953
|
-
|
|
954
|
-
|
|
955
|
-
|
|
956
|
-
|
|
957
|
-
|
|
958
|
-
|
|
959
|
-
await this.$resetpost('rs/logic/sale_commonEnter', {data: handParam}, {
|
|
960
|
-
resolveMsg: null,
|
|
961
|
-
rejectMsg: null
|
|
962
|
-
}).then((res) => {
|
|
963
|
-
this.$showAlert(`单户抄表成功!`, 'success', 2000)
|
|
964
|
-
this.danhuShow()
|
|
954
|
+
await this.$resetpost('rs/logic/sale_commonEnter', {data: handParam}, {
|
|
955
|
+
resolveMsg: null,
|
|
956
|
+
rejectMsg: null
|
|
957
|
+
}).then((res) => {
|
|
958
|
+
this.$showAlert(`单户抄表成功!`, 'success', 2000)
|
|
959
|
+
this.danhuShow()
|
|
960
|
+
}).catch((error) => {
|
|
961
|
+
this.danhu.show = false
|
|
962
|
+
this.$showAlert(`单户抄表失败!` + JSON.toString(error), 'danger', 2000)
|
|
963
|
+
})
|
|
965
964
|
}).catch((error) => {
|
|
966
965
|
this.danhu.show = false
|
|
967
|
-
this.$showAlert(
|
|
966
|
+
this.$showAlert(`下发失败,请注意查看，失败原因：` + JSON.toString(error), 'danger', 2000)
|
|
968
967
|
})
|
|
969
968
|
this.f_new_result_state = '正常使用'
|
|
970
969
|
},
|