doctor-admin-components 1.0.14-beta.35 → 1.0.14-beta.36
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
CHANGED
|
@@ -11,55 +11,54 @@
|
|
|
11
11
|
<!-- 合同争议详情对话框 -->
|
|
12
12
|
<el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
|
|
13
13
|
<el-form :model="form">
|
|
14
|
-
<el-table
|
|
15
|
-
:data="form.containerPurchaseAmountRespList"
|
|
16
|
-
:cell-style="{'padding': '10px 0'}"
|
|
17
|
-
:header-cell-style="{'padding': '10px 0'}"
|
|
18
|
-
>
|
|
14
|
+
<el-table :data="form.containerPurchaseAmountRespList" :cell-style="{ padding: '10px 0' }" :header-cell-style="{ padding: '10px 0' }">
|
|
19
15
|
<el-table-column align="center" prop="containerNo" width="150" label="柜号"></el-table-column>
|
|
20
|
-
<el-table-column align="center" label="货物名称"
|
|
16
|
+
<el-table-column align="center" label="货物名称" width="150">
|
|
21
17
|
<template slot-scope="{ row }">
|
|
22
|
-
<div style="white-space: pre-line !important" v-for="(item, index) in getColumnPropArray(row)" :key="index">{{item.askName}};</div>
|
|
18
|
+
<div style="white-space: pre-line !important" v-for="(item, index) in getColumnPropArray(row)" :key="index">{{ item.askName }};</div>
|
|
23
19
|
</template>
|
|
24
20
|
</el-table-column>
|
|
25
21
|
<el-table-column align="center" label="净重(MT)" prop="goodsNetWeight">
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
22
|
+
<template slot-scope="{ row }">
|
|
23
|
+
<div style="white-space: pre-line !important" v-for="(item, index) in getColumnPropArray(row)" :key="index">
|
|
24
|
+
<span :style="item.goodsNetWeight != item.purchaseActualNetWeight ? 'color:red' : ''">{{ $formatNumber(item.goodsNetWeight, 3) }};</span>
|
|
25
|
+
</div>
|
|
26
|
+
</template>
|
|
31
27
|
</el-table-column>
|
|
32
28
|
<el-table-column align="center" label="单价($)" width="100" prop="purchasePriceResult">
|
|
33
29
|
<template slot-scope="{ row }">
|
|
34
30
|
<div style="white-space: pre-line !important" v-for="(item, index) in getColumnPropArray(row)" :key="index">
|
|
35
31
|
<el-tooltip v-if="getPurchaseAmountTip(item, row)" class="ml10" effect="dark" placement="top">
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
32
|
+
<template slot="content">
|
|
33
|
+
{{ getPurchaseAmountTip(item, row) }}
|
|
34
|
+
</template>
|
|
35
|
+
<span>
|
|
36
|
+
<span :style="item.purchasePriceResult != item.purchaseActualUnitPrice ? 'color:red' : ''">
|
|
37
|
+
{{ item.purchasePriceResult ? $formatNumber(item.purchasePriceResult, 2) : item.purchaseUnitPriceFormula || getPrice(item) }}
|
|
38
|
+
</span>
|
|
39
|
+
<i class="el-icon-question"></i>
|
|
40
|
+
;</span
|
|
41
|
+
>
|
|
44
42
|
</el-tooltip>
|
|
45
|
-
<span v-else :style="item.purchasePriceResult != item.purchaseActualUnitPrice ? 'color:red' : ''">
|
|
43
|
+
<span v-else :style="item.purchasePriceResult != item.purchaseActualUnitPrice ? 'color:red' : ''">
|
|
44
|
+
{{ item.purchasePriceResult ? $formatNumber(item.purchasePriceResult, 2) : item.purchaseUnitPriceFormula || getPrice(item) }};
|
|
46
45
|
</span>
|
|
47
46
|
</div>
|
|
48
|
-
|
|
47
|
+
</template>
|
|
49
48
|
</el-table-column>
|
|
50
49
|
<el-table-column align="center" label="修正净重(MT)" width="130" prop="purchaseActualNetWeight">
|
|
51
50
|
<template slot-scope="{ row }">
|
|
52
51
|
<div style="white-space: pre-line !important" v-for="(item, index) in getColumnPropArray(row)" :key="index">
|
|
53
|
-
<span :style="item.goodsNetWeight != item.purchaseActualNetWeight ? 'color:red' : ''">{{$formatNumber(item.purchaseActualNetWeight, 3)}}</span>
|
|
54
|
-
<i class="el-icon-edit-outline edit-style" @click.stop="editInfo(item,'purchaseActualNetWeight', '1')"/>
|
|
52
|
+
<span :style="item.goodsNetWeight != item.purchaseActualNetWeight ? 'color:red' : ''">{{ $formatNumber(item.purchaseActualNetWeight, 3) }}</span>
|
|
53
|
+
<i class="el-icon-edit-outline edit-style" @click.stop="editInfo(item, 'purchaseActualNetWeight', '1')" />
|
|
55
54
|
</div>
|
|
56
55
|
</template>
|
|
57
56
|
</el-table-column>
|
|
58
57
|
<el-table-column align="center" label="修正单价($)" width="130" prop="purchaseActualUnitPrice">
|
|
59
58
|
<template slot-scope="{ row }">
|
|
60
59
|
<div style="white-space: pre-line !important" v-for="(item, index) in getColumnPropArray(row)" :key="index">
|
|
61
|
-
<span :style="item.purchasePriceResult != item.purchaseActualUnitPrice ? 'color:red' : ''"> {{$formatNumber(item.purchaseActualUnitPrice, 2)}}</span>
|
|
62
|
-
<i class="el-icon-edit-outline edit-style" @click.stop="editInfo(item, 'purchaseActualUnitPrice', '1')"/>
|
|
60
|
+
<span :style="item.purchasePriceResult != item.purchaseActualUnitPrice ? 'color:red' : ''"> {{ $formatNumber(item.purchaseActualUnitPrice, 2) }}</span>
|
|
61
|
+
<i class="el-icon-edit-outline edit-style" @click.stop="editInfo(item, 'purchaseActualUnitPrice', '1')" />
|
|
63
62
|
</div>
|
|
64
63
|
</template>
|
|
65
64
|
</el-table-column>
|
|
@@ -74,112 +73,112 @@
|
|
|
74
73
|
</el-table-column>
|
|
75
74
|
</el-table>
|
|
76
75
|
<div class="my-footer">
|
|
77
|
-
<div class="footer-item" style="width:150px;text-align:center"
|
|
78
|
-
<div class="footer-item" style="width:150px;text-align:center">
|
|
79
|
-
|
|
80
|
-
<div style="width:100px"></div>
|
|
81
|
-
<div class="footer-item">装运总修正净重：<br/>{{$formatNumber(form.actualTotalNetWeight || 0, 3) + 'MT'}}</div>
|
|
82
|
-
<div style="width:135px"></div>
|
|
83
|
-
<div class="footer-item">采购总金额：
|
|
84
|
-
<i class="el-icon-edit-outline edit-style" @click.stop="editInfo(form,'purchaseActualTotalAmount', '2')"/>
|
|
85
|
-
<br/>$ {{ $formatNumber(form.totalPurchaseAmount, 2) }}
|
|
76
|
+
<div class="footer-item" style="width: 150px; text-align: center">总计</div>
|
|
77
|
+
<div class="footer-item" style="width: 150px; text-align: center">
|
|
78
|
+
柜数：{{ form && form.containerPurchaseAmountRespList && form.containerPurchaseAmountRespList.length }}柜
|
|
86
79
|
</div>
|
|
87
|
-
<div class="footer-item"
|
|
88
|
-
|
|
89
|
-
|
|
80
|
+
<div class="footer-item">装运总净重：<br />{{ $formatNumber(form.totalNetWeight || 0, 3) + 'MT' }}</div>
|
|
81
|
+
<div style="width: 100px"></div>
|
|
82
|
+
<div class="footer-item">装运总修正净重：<br />{{ $formatNumber(form.actualTotalNetWeight || 0, 3) + 'MT' }}</div>
|
|
83
|
+
<div style="width: 135px"></div>
|
|
84
|
+
<div class="footer-item">
|
|
85
|
+
采购总金额：
|
|
86
|
+
<i class="el-icon-edit-outline edit-style" @click.stop="editInfo(form, 'purchaseActualTotalAmount', '2')" />
|
|
87
|
+
<br />$ {{ $formatNumber(form.totalPurchaseAmount, 2) }}
|
|
90
88
|
</div>
|
|
91
|
-
<div class="footer-item"
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
89
|
+
<div class="footer-item">
|
|
90
|
+
本次扣减定金：
|
|
91
|
+
<i class="el-icon-edit-outline edit-style" @click.stop="editInfo(form, 'purchaseDepositAmount', '2')" />
|
|
92
|
+
<br />$ {{ $formatNumber(form.purchaseDepositAmount, 2) }}
|
|
93
|
+
</div>
|
|
94
|
+
<div class="footer-item">采购总尾款：<br />$ {{ $formatNumber(form.totalPurchaseAmount - form.purchaseDepositAmount, 2) }}</div>
|
|
96
95
|
</div>
|
|
97
|
-
|
|
96
|
+
<!-- 自定义合并行 -->
|
|
97
|
+
<div></div>
|
|
98
|
+
<el-row style="margin-top: 20px">
|
|
98
99
|
<el-col :span="8">
|
|
99
100
|
<el-form-item label="本次装运总修正净重:">
|
|
100
101
|
<el-tooltip class="ml10" effect="dark" content="本次一共装了多少吨的货（取修正重量汇总）" placement="top">
|
|
101
102
|
<span>
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
103
|
+
{{ $formatNumber(form.actualTotalNetWeight || 0) + 'MT' }}
|
|
104
|
+
<i class="el-icon-question"></i>
|
|
105
|
+
</span>
|
|
106
|
+
</el-tooltip>
|
|
106
107
|
</el-form-item>
|
|
107
108
|
</el-col>
|
|
108
109
|
<el-col :span="8">
|
|
109
110
|
<el-form-item label="本次装运柜数:">
|
|
110
111
|
<el-tooltip class="ml10" effect="dark" content="当前装运装了多少柜" placement="top">
|
|
111
112
|
<span>
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
113
|
+
{{ form && form.containerPurchaseAmountRespList && form.containerPurchaseAmountRespList.length }}柜
|
|
114
|
+
<i class="el-icon-question"></i>
|
|
115
|
+
</span>
|
|
116
|
+
</el-tooltip>
|
|
116
117
|
</el-form-item>
|
|
117
118
|
</el-col>
|
|
118
119
|
<el-col :span="8">
|
|
119
120
|
<el-form-item label="定金总额:">
|
|
120
121
|
<el-tooltip class="ml10" effect="dark" content="采购定金发票一共已付多少金额" placement="top">
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
</span>
|
|
127
|
-
</el-tooltip>
|
|
122
|
+
<span>
|
|
123
|
+
$ {{ $formatNumber(form.totalPurchaseDepositAmount || 0, 2) }}
|
|
124
|
+
<i class="el-icon-question"></i>
|
|
125
|
+
</span>
|
|
126
|
+
</el-tooltip>
|
|
128
127
|
</el-form-item>
|
|
129
128
|
</el-col>
|
|
130
129
|
<el-col :span="8">
|
|
131
130
|
<el-form-item label="总已装运净重:">
|
|
132
131
|
<el-tooltip class="ml10" effect="dark" content="该采购合同一共装了多少吨的货" placement="top">
|
|
133
132
|
<span>
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
133
|
+
{{ $formatNumber(form.totalNetWeight, 3) + 'MT' }}
|
|
134
|
+
<i class="el-icon-question"></i>
|
|
135
|
+
</span>
|
|
136
|
+
</el-tooltip>
|
|
138
137
|
</el-form-item>
|
|
139
138
|
</el-col>
|
|
140
139
|
<el-col :span="8">
|
|
141
140
|
<el-form-item label="总已装运柜数:">
|
|
142
141
|
<el-tooltip class="ml10" effect="dark" content="此采购合同一共已经装了多少柜（根据最新的装运数据实时刷新）" placement="top">
|
|
143
142
|
<span>
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
143
|
+
{{ form.loadedContainerNumber + '柜' }}
|
|
144
|
+
<i class="el-icon-question"></i>
|
|
145
|
+
</span>
|
|
146
|
+
</el-tooltip>
|
|
148
147
|
</el-form-item>
|
|
149
148
|
</el-col>
|
|
150
149
|
<el-col :span="8">
|
|
151
150
|
<el-form-item label="上次剩余定金:">
|
|
152
151
|
<el-tooltip class="ml10" effect="dark" content="创建时间在此之前的装运还剩多少定金可以抵扣，不会随着上次的抵扣金额中途变更而刷新，可为负数" placement="top">
|
|
153
152
|
<span>
|
|
154
|
-
<span v-if="form.
|
|
153
|
+
<span v-if="form.purchaseDepositBalance == null">$0</span>
|
|
155
154
|
<span v-else>
|
|
156
|
-
$ {{
|
|
157
|
-
|
|
155
|
+
$ {{ $formatNumber(form.purchaseDepositBalance, 2) }}
|
|
156
|
+
<span @click.stop="queryDeductionRecords" class="edit-style">点击查询扣减记录</span>
|
|
158
157
|
</span>
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
158
|
+
<i class="el-icon-question"></i>
|
|
159
|
+
</span>
|
|
160
|
+
</el-tooltip>
|
|
162
161
|
</el-form-item>
|
|
163
162
|
</el-col>
|
|
164
163
|
<el-col :span="8">
|
|
165
164
|
<el-form-item label="签约总净重:">
|
|
166
165
|
<el-tooltip class="ml10" effect="dark" content="该采购合同一共签了多少吨的货（实时刷新合同的签约重量）" placement="top">
|
|
167
166
|
<span>
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
167
|
+
{{ $formatNumber(form.signedContractWeight || 0, 3) + 'MT' }}
|
|
168
|
+
<i class="el-icon-question"></i>
|
|
169
|
+
</span>
|
|
170
|
+
</el-tooltip>
|
|
172
171
|
</el-form-item>
|
|
173
172
|
</el-col>
|
|
174
173
|
<el-col :span="8">
|
|
175
174
|
<el-form-item label="本次扣减定金基于总柜数:">
|
|
176
175
|
<el-tooltip class="ml10" effect="dark" content="生成此装运时，采购合同签了多少柜（在此装运后再修改合同不刷新该数据）" placement="top">
|
|
177
176
|
<span>
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
177
|
+
{{ (form.purchaseDepositContainerNumber || 0) + '柜' }}
|
|
178
|
+
<i class="el-icon-question"></i>
|
|
179
|
+
<span class="edit-style" @click.stop="editInfo(form, 'purchaseDepositContainerNumber', '2')">编辑</span>
|
|
180
|
+
</span>
|
|
181
|
+
</el-tooltip>
|
|
183
182
|
</el-form-item>
|
|
184
183
|
</el-col>
|
|
185
184
|
<el-col :span="8">
|
|
@@ -187,25 +186,23 @@
|
|
|
187
186
|
<el-tooltip class="ml10" effect="dark" content="当前装运抵扣了多少定金" placement="top">
|
|
188
187
|
<span>
|
|
189
188
|
<span v-if="form.purchaseDepositAmount == null">$0</span>
|
|
190
|
-
<span v-else>
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
</span>
|
|
195
|
-
</el-tooltip>
|
|
189
|
+
<span v-else> $ {{ $formatNumber(form.purchaseDepositAmount || 0, 2) }} </span>
|
|
190
|
+
<i class="el-icon-question"></i>
|
|
191
|
+
</span>
|
|
192
|
+
</el-tooltip>
|
|
196
193
|
</el-form-item>
|
|
197
194
|
</el-col>
|
|
198
195
|
<el-col :span="8">
|
|
199
|
-
<span style="color
|
|
196
|
+
<span style="color: #fff">--</span>
|
|
200
197
|
</el-col>
|
|
201
198
|
<el-col :span="8">
|
|
202
199
|
<el-form-item label="签约总柜:">
|
|
203
200
|
<el-tooltip class="ml10" effect="dark" content="采购合同签了多少柜（根据最新的合同数据实时刷新）" placement="top">
|
|
204
201
|
<span>
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
202
|
+
{{ (form.signedContainerNumber || 0) + '柜' }}
|
|
203
|
+
<i class="el-icon-question"></i>
|
|
204
|
+
</span>
|
|
205
|
+
</el-tooltip>
|
|
209
206
|
</el-form-item>
|
|
210
207
|
</el-col>
|
|
211
208
|
<el-col :span="8">
|
|
@@ -213,49 +210,45 @@
|
|
|
213
210
|
<el-tooltip class="ml10" effect="dark" content="当前时间该合同还剩余多少定金可以用于抵扣，随着每次的抵扣行为实时刷新，可为负数" placement="top">
|
|
214
211
|
<span>
|
|
215
212
|
<span v-if="form.purchaseDepositBalanceAmount == null">$0</span>
|
|
216
|
-
<span v-else>
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
</span>
|
|
221
|
-
</el-tooltip>
|
|
213
|
+
<span v-else> $ {{ $formatNumber(form.purchaseDepositBalanceAmount || 0, 2) }} </span>
|
|
214
|
+
<i class="el-icon-question"></i>
|
|
215
|
+
</span>
|
|
216
|
+
</el-tooltip>
|
|
222
217
|
</el-form-item>
|
|
223
218
|
</el-col>
|
|
224
219
|
<el-col :span="8">
|
|
225
|
-
<span style="color
|
|
220
|
+
<span style="color: #fff">--</span>
|
|
226
221
|
</el-col>
|
|
227
222
|
<el-col :span="8">
|
|
228
|
-
<span style="color
|
|
223
|
+
<span style="color: #fff">--</span>
|
|
229
224
|
</el-col>
|
|
230
225
|
<el-col :span="8">
|
|
231
|
-
<div style="width:66%"></div>
|
|
226
|
+
<div style="width: 66%"></div>
|
|
232
227
|
<el-form-item label="本次剩余定金:">
|
|
233
228
|
<el-tooltip class="ml10" effect="dark" content="本次还剩多少定金可供下次抵扣，不会随着下次的抵扣行为刷新，可为负数" placement="top">
|
|
234
229
|
<span>
|
|
235
230
|
<span v-if="form.thisRemainingDeposit == null">$0</span>
|
|
236
|
-
<span v-else>
|
|
237
|
-
$ {{ $formatNumber(form.thisRemainingDeposit || 0, 2) }}
|
|
238
|
-
</span>
|
|
231
|
+
<span v-else> $ {{ $formatNumber(form.thisRemainingDeposit || 0, 2) }} </span>
|
|
239
232
|
<i class="el-icon-question"></i>
|
|
240
233
|
</span>
|
|
241
|
-
|
|
234
|
+
</el-tooltip>
|
|
242
235
|
</el-form-item>
|
|
243
236
|
</el-col>
|
|
244
237
|
<el-col :span="24">
|
|
245
238
|
<el-form-item>
|
|
246
239
|
<div>
|
|
247
|
-
<span style="font-weight: bold;margin-right:5px
|
|
240
|
+
<span style="font-weight: bold; margin-right: 5px">备注:</span>
|
|
248
241
|
<el-button size="mini" v-if="!remarkEditable" type="primary" @click.stop="remarkEditable = true">编辑备注</el-button>
|
|
249
242
|
<el-button size="mini" v-else type="success" @click.stop="editRemark">保存备注</el-button>
|
|
250
243
|
</div>
|
|
251
|
-
<el-input type="textarea" :rows="2" v-model="form.remark" :disabled="!remarkEditable"/>
|
|
244
|
+
<el-input type="textarea" :rows="2" v-model="form.remark" :disabled="!remarkEditable" />
|
|
252
245
|
</el-form-item>
|
|
253
246
|
</el-col>
|
|
254
247
|
</el-row>
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
248
|
+
</el-form>
|
|
249
|
+
<ShipmentPurchaseAmountEditDialog ref="ShipmentPurchaseAmountEditDialog" @refresh="refresh"></ShipmentPurchaseAmountEditDialog>
|
|
250
|
+
<ChangrLogList :list="form.changeLogList"></ChangrLogList>
|
|
251
|
+
<QueryDeductionRecords ref="QueryDeductionRecords"></QueryDeductionRecords>
|
|
259
252
|
</el-dialog>
|
|
260
253
|
</div>
|
|
261
254
|
</template>
|
|
@@ -278,7 +271,7 @@ export default {
|
|
|
278
271
|
open: false,
|
|
279
272
|
// 表单参数
|
|
280
273
|
form: {
|
|
281
|
-
changrLogList: []
|
|
274
|
+
changrLogList: []
|
|
282
275
|
},
|
|
283
276
|
// 非单个禁用
|
|
284
277
|
single: true,
|
|
@@ -308,12 +301,11 @@ export default {
|
|
|
308
301
|
* @return {*}
|
|
309
302
|
*/
|
|
310
303
|
queryDeductionRecords() {
|
|
311
|
-
if(!this.form.shipmentId) {
|
|
312
|
-
|
|
313
|
-
|
|
304
|
+
if (!this.form.shipmentId) {
|
|
305
|
+
this.$message.error('shipmentId不能为空')
|
|
306
|
+
return
|
|
314
307
|
}
|
|
315
308
|
this.$refs.QueryDeductionRecords.handlerOpen(this.form.shipmentId)
|
|
316
|
-
|
|
317
309
|
},
|
|
318
310
|
/**
|
|
319
311
|
* @description: 编辑备注
|
|
@@ -337,15 +329,15 @@ export default {
|
|
|
337
329
|
this.remarkEditable = false
|
|
338
330
|
let textInfo = {}
|
|
339
331
|
let info = {}
|
|
340
|
-
if(type == 1) {
|
|
332
|
+
if (type == 1) {
|
|
341
333
|
info = {
|
|
342
334
|
containerId: detail.containerId,
|
|
343
335
|
containerDetailId: detail.containerDetailId,
|
|
344
336
|
purchaseActualNetWeight: detail.purchaseActualNetWeight,
|
|
345
|
-
purchaseActualUnitPrice: detail.purchaseActualUnitPrice
|
|
346
|
-
}
|
|
337
|
+
purchaseActualUnitPrice: detail.purchaseActualUnitPrice
|
|
338
|
+
}
|
|
347
339
|
// 修改表格净重
|
|
348
|
-
if(prop == 'purchaseActualNetWeight') {
|
|
340
|
+
if (prop == 'purchaseActualNetWeight') {
|
|
349
341
|
textInfo = {
|
|
350
342
|
title: `请输入柜号${detail.containerNo}的修正净重`,
|
|
351
343
|
label: detail.askName,
|
|
@@ -353,7 +345,7 @@ export default {
|
|
|
353
345
|
}
|
|
354
346
|
}
|
|
355
347
|
// 修改表格单价
|
|
356
|
-
if(prop == 'purchaseActualUnitPrice') {
|
|
348
|
+
if (prop == 'purchaseActualUnitPrice') {
|
|
357
349
|
textInfo = {
|
|
358
350
|
title: `请输入柜号${detail.containerNo}的修正单价`,
|
|
359
351
|
label: detail.askName,
|
|
@@ -362,21 +354,21 @@ export default {
|
|
|
362
354
|
}
|
|
363
355
|
}
|
|
364
356
|
|
|
365
|
-
if(type == 2) {
|
|
357
|
+
if (type == 2) {
|
|
366
358
|
info = {
|
|
367
359
|
shipmentId: detail.shipmentId,
|
|
368
360
|
purchaseDepositContainerNumber: detail.purchaseDepositContainerNumber,
|
|
369
361
|
purchaseActualTotalAmount: detail.totalPurchaseAmount,
|
|
370
|
-
purchaseDepositAmount: detail.purchaseDepositAmount
|
|
362
|
+
purchaseDepositAmount: detail.purchaseDepositAmount
|
|
371
363
|
}
|
|
372
|
-
if(prop == 'purchaseDepositContainerNumber') {
|
|
364
|
+
if (prop == 'purchaseDepositContainerNumber') {
|
|
373
365
|
textInfo = {
|
|
374
366
|
title: `请输入本次扣减定金基于总柜数`,
|
|
375
367
|
label: '本次扣减定金基于总柜数',
|
|
376
368
|
unit: '柜'
|
|
377
369
|
}
|
|
378
370
|
}
|
|
379
|
-
if(prop == 'purchaseActualTotalAmount') {
|
|
371
|
+
if (prop == 'purchaseActualTotalAmount') {
|
|
380
372
|
textInfo = {
|
|
381
373
|
title: `直接修改采购总金额`,
|
|
382
374
|
label: '',
|
|
@@ -384,7 +376,7 @@ export default {
|
|
|
384
376
|
}
|
|
385
377
|
}
|
|
386
378
|
|
|
387
|
-
if(prop == 'purchaseDepositAmount') {
|
|
379
|
+
if (prop == 'purchaseDepositAmount') {
|
|
388
380
|
textInfo = {
|
|
389
381
|
title: `请输入本次扣减定金`,
|
|
390
382
|
label: '本次扣减定金',
|
|
@@ -392,7 +384,7 @@ export default {
|
|
|
392
384
|
}
|
|
393
385
|
}
|
|
394
386
|
}
|
|
395
|
-
this.$refs.ShipmentPurchaseAmountEditDialog.handlerOpen(info, type, textInfo,prop)
|
|
387
|
+
this.$refs.ShipmentPurchaseAmountEditDialog.handlerOpen(info, type, textInfo, prop)
|
|
396
388
|
},
|
|
397
389
|
//更新装运采购定金
|
|
398
390
|
updateShipmentDepositAmount(shipmentId, purchaseDepositAmount) {
|
|
@@ -425,7 +417,7 @@ export default {
|
|
|
425
417
|
})
|
|
426
418
|
},
|
|
427
419
|
getPurchaseAmountTip(item, row) {
|
|
428
|
-
if(item.quoteType == 'FIXED' || !item.pointDate) {
|
|
420
|
+
if (item.quoteType == 'FIXED' || !item.pointDate) {
|
|
429
421
|
return ''
|
|
430
422
|
}
|
|
431
423
|
let msg = '成交单价为'
|
|
@@ -434,7 +426,11 @@ export default {
|
|
|
434
426
|
return msg
|
|
435
427
|
},
|
|
436
428
|
getPrice(item) {
|
|
437
|
-
return
|
|
429
|
+
return item.quoteType.includes('CMX')
|
|
430
|
+
? item.quoteType + '-' + item.purchaseUnitPrice
|
|
431
|
+
: item.quoteType.includes('LME')
|
|
432
|
+
? item.purchaseUnitPrice + '%' + item.quoteType
|
|
433
|
+
: ''
|
|
438
434
|
},
|
|
439
435
|
getColumnProp(row, type) {
|
|
440
436
|
var list = []
|
|
@@ -483,7 +479,7 @@ export default {
|
|
|
483
479
|
font-weight: bold;
|
|
484
480
|
.footer-item {
|
|
485
481
|
text-align: center;
|
|
486
|
-
width:130px;
|
|
482
|
+
width: 130px;
|
|
487
483
|
}
|
|
488
484
|
}
|
|
489
485
|
::v-deep .cell {
|