apply-clients 3.4.94 → 3.4.95

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.
@@ -8,10 +8,18 @@ var compiler = webpack(config)
8
8
  // var proxy = httpProxy.createProxyServer()
9
9
  // var ldap = 'http://121.36.79.201:8400'
10
10
  // var applyinstall = 'http://121.36.79.201:8400'
11
- var ldap = 'http://192.168.50.4:8400'
12
- var applyinstall = 'http://192.168.50.4:8400'
11
+ var ldap = 'http://125.71.238.50:30789'
12
+ var applyinstall = 'http://125.71.238.50:30789'
13
13
 
14
14
  var proxyTable = {
15
+ '/apply/rs/entity': {
16
+ target: ldap,
17
+ changeOrigin: true
18
+ },
19
+ '/rs/file/uploadFile': {
20
+ target: ldap,
21
+ changeOrigin: true
22
+ },
15
23
  '/rs/logic/getSaleInitData': {
16
24
  target: ldap,
17
25
  changeOrigin: true
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "apply-clients",
3
- "version": "3.4.94",
3
+ "version": "3.4.95",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -1,185 +1,210 @@
1
- <template>
2
- <div class="col-sm-12" style="margin: 20px 0px;">
3
- <data-grid :model="model" v-ref:grid class="list_area table_sy" style="padding: 0px">
4
- <template partial='head'>
5
- <tr>
6
- <th>合同金额</th>
7
- <th>付款节点</th>
8
- <th>付款比例</th>
9
- <th>应收金额</th>
10
- <th><button type="button" class="btn btn-primary" @click="$parent.$parent.showAdd()">新增</button></th>
11
- </tr>
12
- </template>
13
- <template partial='body'>
14
- <tr >
15
- <td style="text-align: center;">
16
- <nobr><font>{{row.f_amount}}</font></nobr>
17
- </td>
18
- <td style="text-align: center;">
19
- <nobr><font>{{row.defname}}</font></nobr>
20
- </td>
21
- <td style="text-align: center;">
22
- <nobr><font>{{row.f_payment_ratio}}%</font></nobr>
23
- </td>
24
- <td style="text-align: center;">
25
- <nobr><font>{{$parent.$parent.toFixed(row.f_due_money)}}</font></nobr>
26
- </td>
27
- <td style="text-align: center;">
28
- <nobr><font>
29
- <button type="button" class="btn btn-primary" @click="$parent.$parent.updateData(row)">修改</button>
30
- <button type="button" class="btn btn-primary" @click="$parent.$parent.delData(row)">删除</button>
31
- </font></nobr>
32
- </td>
33
- </tr>
34
- </template>
35
- </data-grid>
36
- <modal
37
- :show.sync="addModal"
38
- backdrop="false"
39
- :title="titleText"
40
- cancel-text="取消"
41
- ok-text="确认"
42
- :callback="saveOrUpdate"
43
- >
44
- <div class="form-horizontal" slot="modal-body">
45
- <div class="form-group" style="margin: 10px auto">
46
- <label class="col-sm-3 control-label">合同金额(元):</label>
47
- <div class="col-sm-9">
48
- <input type="number" style="width: 60%" v-model="addData.f_amount" readonly/>
49
- </div>
50
- </div>
51
- <div class="form-group" style="margin: 10px auto">
52
- <label class="col-sm-3 control-label">付款节点:</label>
53
- <div class="col-sm-9">
54
- <v-select
55
- v-model="addData.applyType"
56
- placeholder='请选择需要发起的工程类型'
57
- :value.sync="addData.applyType"
58
- :options='payProjects'
59
- :value-single="true"
60
- class="select select_list"
61
- :search="false"
62
- close-on-select ></v-select>
63
- </div>
64
- <div class="form-group" style="margin: 10px auto">
65
- <label class="col-sm-3 control-label">付款比例(%):</label>
66
- <div class="col-sm-9">
67
- <input type="number" style="width: 60%" v-model="addData.f_payment_ratio" @change="inputChange(1)"/>
68
- </div>
69
- </div>
70
- <div class="form-group" style="margin: 10px auto">
71
- <label class="col-sm-3 control-label">预付款金额(元):</label>
72
- <div class="col-sm-9">
73
- <input type="number" style="width: 60%" v-model="addData.f_due_money" @change="inputChange(2)"/>
74
- </div>
75
- </div>
76
- </div>
77
- </div>
78
- </modal>
79
- </div>
80
- </template>
81
- <script>
82
- import {HttpResetClass} from 'vue-client'
83
- import Vue from "vue";
84
- export default {
85
- title: '付款预设',
86
- props: {
87
- selectdata: {
88
- type: Object
89
- },
90
- mark: {
91
- type: Number,
92
- default: 1
93
- }
94
- },
95
- data () {
96
- return {
97
- model: {rows: [{f_process_id: 100, f_payment_ratio: '', defname: '', f_due_money: ''}]},
98
- payProjects: [{label: '合同签订', value: '合同签订'}, {label: '验收通气', value: '验收通气'}, {label: '完工', value: '完工'}],
99
- addModal: false,
100
- addData: {f_amount: 0, f_process_id: '', f_payment_ratio: '', defname: '', f_due_money: ''},
101
- titleText: ''
102
- }
103
- },
104
- methods: {
105
- toFixed (num) {
106
- return parseFloat(num).toFixed(2)
107
- },
108
- showAdd () {
109
- this.addData = {
110
- f_amount: this.selectdata.f_contract_money,
111
- f_process_id: this.selectdata.f_process_id,
112
- f_payment_ratio: '',
113
- defname: '',
114
- f_due_money: ''
115
- }
116
- this.titleText = '新增付款预设'
117
- this.addModal = true
118
- },
119
- inputChange (type) {
120
- if (this.addData.f_amount) {
121
- if (type === 1) {
122
- this.addData.f_due_money = (this.addData.f_amount * (this.addData.f_payment_ratio / 100)).toFixed(2)
123
- //this.addData.f_due_money转为数字类型
124
- this.addData.f_due_money = parseFloat(this.addData.f_due_money)
125
- this.selectdata.f_contract_money = parseFloat(this.selectdata.f_contract_money)
126
- if( this.addData.f_due_money > this.selectdata.f_contract_money) {
127
- this.addData.f_payment_ratio = 0
128
- this.addData.f_due_money = 0
129
- this.$showMessage('预付款金额不能大于合同金额')
130
- }
131
- } else {
132
- this.addData.f_payment_ratio = Math.floor(this.addData.f_due_money / this.addData.f_amount * 100)
133
- this.addData.f_payment_ratio= parseFloat(this.addData.f_payment_ratio)
134
- if (this.addData.f_payment_ratio > 100) {
135
- this.addData.f_payment_ratio = 0
136
- this.addData.f_due_money = 0
137
- this.$showMessage('付款比率不能大于100%')
138
- }
139
- }
140
- }
141
- },
142
- updateData (row){
143
- this.addData = row
144
- this.addData.f_amount=this.selectdata.f_contract_money
145
- this.titleText = '修改付款预设'
146
- this.addModal = true
147
- },
148
- delData (row){
149
- console.log("delData=========")
150
- this.$resetdelete(`apply/rs/entity/t_contract_charge`, {id: row.id}, {resolveMsg: null, rejectMsg: null}).then(() => {
151
- this.search()
152
- })
153
- this.addModal = false
154
- },
155
- saveOrUpdate () {
156
- // this.addData
157
- console.log("saveOrUpdate=========")
158
- this.addData.defname=this.addData.applyType
159
- new HttpResetClass().load('POST', 'apply/rs/entity/t_contract_charge', this.addData, {resolveMsg: null, rejectMsg: null}).then(() => {
160
- this.search()
161
- })
162
- //关闭弹窗
163
- this.addModal = false
164
- },
165
- search (){
166
- let data = {
167
- condition: `f_process_id = '${this.selectdata.f_process_id}'`
168
- }
169
- new HttpResetClass().load('POST', 'rs/sql/getContractCharge', {data: data}
170
- , {resolveMsg: null, rejectMsg: null})
171
- .then((res) => {
172
- this.model.rows = res.data
173
- })
174
- }
175
- },
176
- ready () {
177
- this.payProjects = this.$appdata.getParam(this.selectdata.f_apply_type + '付款预设')
178
- this.search()
179
- }
180
- }
181
- </script>
182
-
183
- <style scoped>
184
-
185
- </style>
1
+ <template>
2
+ <div class="col-sm-12" style="margin: 20px 0px;">
3
+ <data-grid :model="model" v-ref:grid class="list_area table_sy" style="padding: 0px">
4
+ <template partial='head'>
5
+ <tr>
6
+ <th>合同金额</th>
7
+ <th>付款节点</th>
8
+ <th>付款比例</th>
9
+ <th>应收金额</th>
10
+ <th>
11
+ <button type="button" class="btn btn-primary" @click="$parent.$parent.showAdd()">新增</button>
12
+ </th>
13
+ </tr>
14
+ </template>
15
+ <template partial='body'>
16
+ <tr>
17
+ <td style="text-align: center;">
18
+ <nobr><font>{{ row.f_amount }}</font></nobr>
19
+ </td>
20
+ <td style="text-align: center;">
21
+ <nobr><font>{{ row.defname }}</font></nobr>
22
+ </td>
23
+ <td style="text-align: center;">
24
+ <nobr><font>{{ row.f_payment_ratio }}%</font></nobr>
25
+ </td>
26
+ <td style="text-align: center;">
27
+ <nobr><font>{{ $parent.$parent.toFixed(row.f_due_money) }}</font></nobr>
28
+ </td>
29
+ <td style="text-align: center;">
30
+ <nobr><font>
31
+ <button type="button" class="btn btn-primary" @click="$parent.$parent.updateData(row)">修改</button>
32
+ <button type="button" class="btn btn-primary" @click="$parent.$parent.delData(row)">删除</button>
33
+ </font></nobr>
34
+ </td>
35
+ </tr>
36
+ </template>
37
+ </data-grid>
38
+ <modal
39
+ :show.sync="addModal"
40
+ backdrop="false"
41
+ :title="titleText"
42
+ >
43
+ <header slot="modal-header" class="modal-header">
44
+ <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
45
+ <h4 class="modal-title">{{ titleText }}</h4>
46
+ </header>
47
+ <article slot="modal-body" class="modal-body clearfix">
48
+ <div class="form-group col-sm-12">
49
+ <label class="col-sm-3 control-label">合同金额(元)::</label>
50
+ <div class="col-sm-9">
51
+ <input type="text"
52
+ class="form-control input_view"
53
+ style="width: 60%"
54
+ readonly
55
+ v-model="addData.f_amount"/>
56
+ </div>
57
+ </div>
58
+ <div class="form-group col-sm-12">
59
+ <label class="col-sm-3 control-label">付款节点:</label>
60
+ <div class="col-sm-9">
61
+ <v-select
62
+ v-model="addData.applyType"
63
+ placeholder='请选择需要发起的工程类型'
64
+ :value.sync="addData.applyType"
65
+ :options='payProjects'
66
+ :value-single="true"
67
+ class="select select_list"
68
+ :search="false"
69
+ close-on-select></v-select>
70
+ </div>
71
+ </div>
72
+ <div class="form-group col-sm-12">
73
+ <label class="col-sm-3 control-label">付款比例(%):</label>
74
+ <div class="col-sm-9">
75
+ <input type="text"
76
+ class="form-control input_view" style="width: 60%"
77
+ v-model="addData.f_payment_ratio" @change="inputChange(1)"/>
78
+ </div>
79
+ </div>
80
+ <div class="form-group col-sm-12">
81
+ <label class="col-sm-3 control-label">预付款金额(元):</label>
82
+ <div class="col-sm-9">
83
+ <input type="text"
84
+ style="width: 60%"
85
+ class="form-control input_view"
86
+ v-model="addData.f_due_money"
87
+ @change="inputChange(2)"/>
88
+ </div>
89
+ </div>
90
+ </article>
91
+ <footer slot="modal-footer" class="modal-footer">
92
+ <button type="button" class="btn btn-primary" @click="saveOrUpdate()">确认</button>
93
+ </footer>
94
+ </modal>
95
+ </div>
96
+ </template>
97
+ <script>
98
+ import {HttpResetClass} from 'vue-client'
99
+
100
+ export default {
101
+ title: '付款预设',
102
+ props: {
103
+ selectdata: {
104
+ type: Object
105
+ },
106
+ mark: {
107
+ type: Number,
108
+ default: 1
109
+ }
110
+ },
111
+ data () {
112
+ return {
113
+ model: {rows: [{f_process_id: 100, f_payment_ratio: '', defname: '', f_due_money: ''}]},
114
+ payProjects: [{label: '合同签订', value: '合同签订'}, {label: '验收通气', value: '验收通气'}, {label: '完工', value: '完工'}],
115
+ addModal: false,
116
+ addData: {f_amount: 0, f_process_id: '', f_payment_ratio: '', defname: '', f_due_money: ''},
117
+ titleText: ''
118
+ }
119
+ },
120
+ methods: {
121
+ toFixed (num) {
122
+ return parseFloat(num).toFixed(2)
123
+ },
124
+ showAdd () {
125
+ this.addData = {
126
+ f_amount: this.selectdata.f_contract_money,
127
+ f_process_id: this.selectdata.f_process_id,
128
+ f_payment_ratio: '',
129
+ defname: '',
130
+ f_due_money: ''
131
+ }
132
+ this.titleText = '新增付款预设'
133
+ this.addModal = true
134
+ },
135
+ inputChange (type) {
136
+ if (this.addData.f_amount) {
137
+ if (type === 1) {
138
+ this.addData.f_due_money = (this.addData.f_amount * (this.addData.f_payment_ratio / 100)).toFixed(2)
139
+ // this.addData.f_due_money转为数字类型
140
+ this.addData.f_due_money = parseFloat(this.addData.f_due_money)
141
+ this.selectdata.f_contract_money = parseFloat(this.selectdata.f_contract_money)
142
+ if (this.addData.f_due_money > this.selectdata.f_contract_money) {
143
+ this.addData.f_payment_ratio = 0
144
+ this.addData.f_due_money = 0
145
+ this.$showMessage('预付款金额不能大于合同金额')
146
+ }
147
+ } else {
148
+ this.addData.f_payment_ratio = Math.floor(this.addData.f_due_money / this.addData.f_amount * 100)
149
+ this.addData.f_payment_ratio = parseFloat(this.addData.f_payment_ratio)
150
+ if (this.addData.f_payment_ratio > 100) {
151
+ this.addData.f_payment_ratio = 0
152
+ this.addData.f_due_money = 0
153
+ this.$showMessage('付款比率不能大于100%')
154
+ }
155
+ }
156
+ }
157
+ },
158
+ updateData (row) {
159
+ this.addData = row
160
+ this.addData.f_amount = this.selectdata.f_contract_money
161
+ this.titleText = '修改付款预设'
162
+ this.addModal = true
163
+ },
164
+ delData (row) {
165
+ console.log('delData=========')
166
+ this.$resetdelete('apply/rs/entity/t_contract_charge', {id: row.id}, {
167
+ resolveMsg: null,
168
+ rejectMsg: null
169
+ }).then(() => {
170
+ this.search()
171
+ })
172
+ this.addModal = false
173
+ },
174
+ saveOrUpdate () {
175
+ // this.addData
176
+ console.log('saveOrUpdate=========')
177
+ this.addData.defname = this.addData.applyType
178
+ new HttpResetClass().load('POST', 'apply/rs/entity/t_contract_charge', this.addData, {
179
+ resolveMsg: null,
180
+ rejectMsg: null
181
+ }).then(() => {
182
+ this.search()
183
+ })
184
+ // 关闭弹窗
185
+ this.addModal = false
186
+ },
187
+ closeModal () {
188
+ this.addModal = false
189
+ },
190
+ search () {
191
+ let data = {
192
+ condition: `f_process_id = '${this.selectdata.f_process_id}'`
193
+ }
194
+ new HttpResetClass().load('POST', 'rs/sql/getContractCharge', {data: data}
195
+ , {resolveMsg: null, rejectMsg: null})
196
+ .then((res) => {
197
+ this.model.rows = res.data
198
+ })
199
+ }
200
+ },
201
+ ready () {
202
+ this.payProjects = this.$appdata.getParam(this.selectdata.f_apply_type + '付款预设')
203
+ this.search()
204
+ }
205
+ }
206
+ </script>
207
+
208
+ <style scoped>
209
+
210
+ </style>