朱园亮 / erp-mobile · Commits

Commit 8e1e6ae24b6d12a82bf0ab3132a25ec58ad7d6ac

Authored by gesilong
2 parents 1b7cf04a 64357a73

Merge branch 'cjerp-contract-1.0' into test_cjerp

Inline Side-by-side
Showing 24 changed files with 142 additions and 57 deletions
@@ -44,7 +44,8 @@ @@ -44,7 +44,8 @@
44 44
45 <!-- 产品 --> 45 <!-- 产品 -->
46 <view class="section2"> 46 <view class="section2">
47 - <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange" :orderDate="form.orderDate" /> 47 + <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange"
  48 + :orderDate="form.orderDate" :contractType="form.contractType" />
48 </view> 49 </view>
49 50
50 <view class="section"> 51 <view class="section">
@@ -17,12 +17,14 @@ @@ -17,12 +17,14 @@
17 17
18 <!-- 产品-变更前 --> 18 <!-- 产品-变更前 -->
19 <view class="mgb10"> 19 <view class="mgb10">
20 - <Product title="变更前" mode="view" :list="form.beforeChangeSpecList" :totalQuantity="form.totalQuantity || 0" /> 20 + <Product title="变更前" mode="view" :list="form.beforeChangeSpecList" :totalQuantity="form.totalQuantity || 0"
  21 + :contractType="form.contractType" />
21 </view> 22 </view>
22 23
23 <!-- 产品-变更后 --> 24 <!-- 产品-变更后 -->
24 <view class="mgb10"> 25 <view class="mgb10">
25 - <Product title="变更后" mode="view" :list="form.afterChangeSpecList" :totalQuantity="form.afterTotalQuantity || 0" /> 26 + <Product title="变更后" mode="view" :list="form.afterChangeSpecList" :totalQuantity="form.afterTotalQuantity || 0"
  27 + :contractType="form.contractType" />
26 </view> 28 </view>
27 29
28 <view class="section"> 30 <view class="section">
@@ -43,7 +43,8 @@ @@ -43,7 +43,8 @@
43 43
44 <!-- 产品 --> 44 <!-- 产品 -->
45 <view class="section2"> 45 <view class="section2">
46 - <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange" :orderDate="form.orderDate" /> 46 + <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange"
  47 + :orderDate="form.orderDate" :contractType="form.contractType" />
47 </view> 48 </view>
48 49
49 <view class="section"> 50 <view class="section">
@@ -118,7 +118,7 @@ @@ -118,7 +118,7 @@
118 /> 118 />
119 </template> 119 </template>
120 </uni-list-item> 120 </uni-list-item>
121 - <uni-list-item v-if="item.showSalesPrice" title="销售价格"> 121 + <uni-list-item v-if="item.showSalesPrice" :title="salesPriceTitle">
122 <template v-slot:footer> 122 <template v-slot:footer>
123 <uni-easyinput type="digit" v-model="item.salesPrice" placeholder="请输入销售价格" 123 <uni-easyinput type="digit" v-model="item.salesPrice" placeholder="请输入销售价格"
124 :inputBorder="false" 124 :inputBorder="false"
@@ -128,7 +128,7 @@ @@ -128,7 +128,7 @@
128 </uni-list-item> 128 </uni-list-item>
129 <uni-list-item class="amount-item"> 129 <uni-list-item class="amount-item">
130 <template v-slot:body> 130 <template v-slot:body>
131 - <view class="item-title"><text>包装费</text></view> 131 + <view class="item-title"><text>{{ packagingFeeTitle }}</text></view>
132 </template> 132 </template>
133 <template v-slot:footer> 133 <template v-slot:footer>
134 <view class="amount-row"> 134 <view class="amount-row">
@@ -136,7 +136,7 @@ @@ -136,7 +136,7 @@
136 :inputBorder="false" 136 :inputBorder="false"
137 @input="onNonNegativeNumberInput($event, item, idx, 'packagingFee')" 137 @input="onNonNegativeNumberInput($event, item, idx, 'packagingFee')"
138 @blur="onNonNegativeNumberBlur(item, idx, 'packagingFee')" /> 138 @blur="onNonNegativeNumberBlur(item, idx, 'packagingFee')" />
139 - <text class="unit">元</text> 139 + <text class="unit">{{ moneyUnit }}</text>
140 </view> 140 </view>
141 </template> 141 </template>
142 </uni-list-item> 142 </uni-list-item>
@@ -206,9 +206,9 @@ @@ -206,9 +206,9 @@
206 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view> 206 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
207 <view class="row"><text class="label">数量kg</text><text class="value">{{ item.quantity }}</text></view> 207 <view class="row"><text class="label">数量kg</text><text class="value">{{ item.quantity }}</text></view>
208 <!-- showSalesPrice 判断是否显示 --> 208 <!-- showSalesPrice 判断是否显示 -->
209 - <view class="row" v-if="item.showSalesPrice"><text class="label">销售价格</text><text class="value">{{ 209 + <view class="row" v-if="item.showSalesPrice"><text class="label">{{ salesPriceTitle }}</text><text class="value">{{
210 item.salesPrice }}</text></view> 210 item.salesPrice }}</text></view>
211 - <view class="row"><text class="label">包装费</text><text class="value">{{ 211 + <view class="row"><text class="label">{{ packagingFeeTitle }}</text><text class="value">{{
212 item.packagingFee }}</text></view> 212 item.packagingFee }}</text></view>
213 <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text> 213 <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text>
214 </view> 214 </view>
@@ -235,7 +235,8 @@ export default { @@ -235,7 +235,8 @@ export default {
235 list: { type: Array, default: () => [] }, 235 list: { type: Array, default: () => [] },
236 max: { type: Number, default: 8 }, 236 max: { type: Number, default: 8 },
237 totalQuantity: { type: Number, default: 0 }, 237 totalQuantity: { type: Number, default: 0 },
238 - orderDate: { type: String, default: '' } 238 + orderDate: { type: String, default: '' },
  239 + contractType: { type: String, default: '' }
239 }, 240 },
240 data() { 241 data() {
241 return { 242 return {
@@ -258,6 +259,18 @@ export default { @@ -258,6 +259,18 @@ export default {
258 const mm = String(dt.getMonth() + 1).padStart(2, '0') 259 const mm = String(dt.getMonth() + 1).padStart(2, '0')
259 const dd = String(dt.getDate()).padStart(2, '0') 260 const dd = String(dt.getDate()).padStart(2, '0')
260 return `${yy}/${mm}/${dd}` 261 return `${yy}/${mm}/${dd}`
  262 + },
  263 + isIntlContract() {
  264 + return ['INTL_STD_CONTRACT', 'INTL_INVENTORY_AGMT', 'INTL_OPEN_SPEC_AGMT'].includes(String(this.contractType || ''))
  265 + },
  266 + moneyUnit() {
  267 + return this.isIntlContract ? '美元' : '元'
  268 + },
  269 + salesPriceTitle() {
  270 + return `单价(${this.moneyUnit}/kg)`
  271 + },
  272 + packagingFeeTitle() {
  273 + return `包装费(${this.moneyUnit}/kg)`
261 } 274 }
262 }, 275 },
263 watch: { 276 watch: {
@@ -16,13 +16,13 @@ @@ -16,13 +16,13 @@
16 <!-- 产品-变更前 --> 16 <!-- 产品-变更前 -->
17 <view class="mgb10"> 17 <view class="mgb10">
18 <Product title="变更前" mode="view" :options="genderOptions" :list="form.beforeChangeSpecList" 18 <Product title="变更前" mode="view" :options="genderOptions" :list="form.beforeChangeSpecList"
19 - :totalQuantity="form.totalQuantity || 0" /> 19 + :totalQuantity="form.totalQuantity || 0" :contractType="form.contractType" />
20 </view> 20 </view>
21 21
22 <!-- 产品-变更后 --> 22 <!-- 产品-变更后 -->
23 <view class="mgb10"> 23 <view class="mgb10">
24 <Product title="变更后" mode="view" :options="genderOptions" :list="form.afterChangeSpecList" 24 <Product title="变更后" mode="view" :options="genderOptions" :list="form.afterChangeSpecList"
25 - :totalQuantity="form.afterTotalQuantity || 0" /> 25 + :totalQuantity="form.afterTotalQuantity || 0" :contractType="form.contractType" />
26 </view> 26 </view>
27 27
28 <view class="section"> 28 <view class="section">
@@ -37,6 +37,11 @@ @@ -37,6 +37,11 @@
37 <uni-easyinput v-model="qualityForm.packaging" placeholder="请输入" /> 37 <uni-easyinput v-model="qualityForm.packaging" placeholder="请输入" />
38 </template> 38 </template>
39 </uni-list-item> 39 </uni-list-item>
  40 + <uni-list-item title="备注">
  41 + <template v-slot:footer>
  42 + <uni-easyinput v-model="qualityForm.remarks" placeholder="请输入" />
  43 + </template>
  44 + </uni-list-item>
40 </uni-list> 45 </uni-list>
41 </view> 46 </view>
42 <view class="block" v-for="(item, idx) in items" :key="item.raw && (item.raw.id || item.raw.lineId || item.raw.productId) || ('row-' + idx)"> 47 <view class="block" v-for="(item, idx) in items" :key="item.raw && (item.raw.id || item.raw.lineId || item.raw.productId) || ('row-' + idx)">
@@ -245,7 +250,8 @@ export default { @@ -245,7 +250,8 @@ export default {
245 tolerance: '', 250 tolerance: '',
246 performance: '', 251 performance: '',
247 component: '', 252 component: '',
248 - packaging: '' 253 + packaging: '',
  254 + remarks: ''
249 } 255 }
250 } 256 }
251 }, 257 },
@@ -341,7 +347,8 @@ export default { @@ -341,7 +347,8 @@ export default {
341 tolerance: data.tolerance || '', 347 tolerance: data.tolerance || '',
342 performance: data.performance || '', 348 performance: data.performance || '',
343 component: data.component || '', 349 component: data.component || '',
344 - packaging: data.packaging || '' 350 + packaging: data.packaging || '',
  351 + remarks: data.remarks || ''
345 } 352 }
346 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : [] 353 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : []
347 const init = lines.map(v => ({ 354 const init = lines.map(v => ({
@@ -534,6 +541,7 @@ export default { @@ -534,6 +541,7 @@ export default {
534 performance: this.qualityForm.performance, 541 performance: this.qualityForm.performance,
535 component: this.qualityForm.component, 542 component: this.qualityForm.component,
536 packaging: this.qualityForm.packaging, 543 packaging: this.qualityForm.packaging,
  544 + remarks: this.qualityForm.remarks,
537 contractDistributorLineList: selected 545 contractDistributorLineList: selected
538 } 546 }
539 547
@@ -37,6 +37,11 @@ @@ -37,6 +37,11 @@
37 <uni-easyinput v-model="qualityForm.packaging" placeholder="请输入" /> 37 <uni-easyinput v-model="qualityForm.packaging" placeholder="请输入" />
38 </template> 38 </template>
39 </uni-list-item> 39 </uni-list-item>
  40 + <uni-list-item title="备注">
  41 + <template v-slot:footer>
  42 + <uni-easyinput v-model="qualityForm.remarks" placeholder="请输入" />
  43 + </template>
  44 + </uni-list-item>
40 </uni-list> 45 </uni-list>
41 </view> 46 </view>
42 <view class="block" v-for="(item, idx) in items" :key="item.raw && (item.raw.id || item.raw.lineId || item.raw.productId) || ('row-' + idx)"> 47 <view class="block" v-for="(item, idx) in items" :key="item.raw && (item.raw.id || item.raw.lineId || item.raw.productId) || ('row-' + idx)">
@@ -245,7 +250,8 @@ export default { @@ -245,7 +250,8 @@ export default {
245 tolerance: '', 250 tolerance: '',
246 performance: '', 251 performance: '',
247 component: '', 252 component: '',
248 - packaging: '' 253 + packaging: '',
  254 + remarks: ''
249 } 255 }
250 } 256 }
251 }, 257 },
@@ -357,7 +363,8 @@ export default { @@ -357,7 +363,8 @@ export default {
357 tolerance: data.tolerance || '', 363 tolerance: data.tolerance || '',
358 performance: data.performance || '', 364 performance: data.performance || '',
359 component: data.component || '', 365 component: data.component || '',
360 - packaging: data.packaging || '' 366 + packaging: data.packaging || '',
  367 + remarks: data.remarks || ''
361 } 368 }
362 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : [] 369 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : []
363 const init = lines.map(v => ({ 370 const init = lines.map(v => ({
@@ -550,6 +557,7 @@ export default { @@ -550,6 +557,7 @@ export default {
550 performance: this.qualityForm.performance, 557 performance: this.qualityForm.performance,
551 component: this.qualityForm.component, 558 component: this.qualityForm.component,
552 packaging: this.qualityForm.packaging, 559 packaging: this.qualityForm.packaging,
  560 + remarks: this.qualityForm.remarks,
553 contractDistributorLineList: selected 561 contractDistributorLineList: selected
554 } 562 }
555 563
@@ -65,7 +65,8 @@ @@ -65,7 +65,8 @@
65 <!-- 产品 --> 65 <!-- 产品 -->
66 <view class="section2"> 66 <view class="section2">
67 <Product mode="approve" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange" 67 <Product mode="approve" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange"
68 - :orderDate="form.orderDate" :canEditDeliveryAndAssessment="canEditQualityFields" /> 68 + :orderDate="form.orderDate" :canEditDeliveryAndAssessment="canEditQualityFields"
  69 + :contractType="form.contractType" />
69 </view> 70 </view>
70 71
71 <view class="section"> 72 <view class="section">
@@ -191,7 +192,8 @@ @@ -191,7 +192,8 @@
191 <!--是否试样订单可编辑 特例--> 192 <!--是否试样订单可编辑 特例-->
192 <!-- 产品 --> 193 <!-- 产品 -->
193 <view class="mgb10"> 194 <view class="mgb10">
194 - <Product mode="approve2" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange" /> 195 + <Product mode="approve2" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange"
  196 + :contractType="form.contractType" />
195 </view> 197 </view>
196 198
197 <view class="section"> 199 <view class="section">
@@ -34,7 +34,8 @@ @@ -34,7 +34,8 @@
34 34
35 <!-- 产品 --> 35 <!-- 产品 -->
36 <view class="mgb10"> 36 <view class="mgb10">
37 - <Product mode="view" :list="form.purchaseOrderLineList" :totalQuantity="form.totalQuantity || 0" /> 37 + <Product mode="view" :list="form.purchaseOrderLineList" :totalQuantity="form.totalQuantity || 0"
  38 + :contractType="form.contractType" />
38 </view> 39 </view>
39 40
40 <view class="section"> 41 <view class="section">
@@ -63,7 +63,9 @@ @@ -63,7 +63,9 @@
63 63
64 <!-- 产品 --> 64 <!-- 产品 -->
65 <view class="section2"> 65 <view class="section2">
66 - <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange" :pageType="'modify'" :orderDate="form.orderDate" :canEditDeliveryAndAssessment="canEditQualityFields" /> 66 + <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange"
  67 + :pageType="'modify'" :orderDate="form.orderDate" :canEditDeliveryAndAssessment="canEditQualityFields"
  68 + :contractType="form.contractType" />
67 </view> 69 </view>
68 70
69 <view class="section"> 71 <view class="section">
@@ -99,7 +99,7 @@ @@ -99,7 +99,7 @@
99 <uni-easyinput type="digit" v-model="item.quantity" placeholder="请输入数量" :inputBorder="false" :disabled="true" /> 99 <uni-easyinput type="digit" v-model="item.quantity" placeholder="请输入数量" :inputBorder="false" :disabled="true" />
100 </template> 100 </template>
101 </uni-list-item> 101 </uni-list-item>
102 - <uni-list-item title="销售价格" v-if="item.showSalesPrice"> 102 + <uni-list-item :title="salesPriceTitle" v-if="item.showSalesPrice">
103 <template v-slot:footer> 103 <template v-slot:footer>
104 <uni-easyinput type="digit" v-model="item.salesPrice" placeholder="请输入销售价格" :inputBorder="false" :disabled="true" /> 104 <uni-easyinput type="digit" v-model="item.salesPrice" placeholder="请输入销售价格" :inputBorder="false" :disabled="true" />
105 </template> 105 </template>
@@ -107,7 +107,7 @@ @@ -107,7 +107,7 @@
107 107
108 <uni-list-item class="amount-item"> 108 <uni-list-item class="amount-item">
109 <template v-slot:body> 109 <template v-slot:body>
110 - <view class="item-title"><text>包装费</text></view> 110 + <view class="item-title"><text>{{ packagingFeeTitle }}</text></view>
111 </template> 111 </template>
112 <template v-slot:footer> 112 <template v-slot:footer>
113 <view class="amount-row"> 113 <view class="amount-row">
@@ -116,7 +116,7 @@ @@ -116,7 +116,7 @@
116 :disabled="canEditDeliveryAndAssessment && !roleCodes.includes('bscnq')" 116 :disabled="canEditDeliveryAndAssessment && !roleCodes.includes('bscnq')"
117 @input="onNonNegativeNumberInput($event, item, idx, 'packagingFee')" 117 @input="onNonNegativeNumberInput($event, item, idx, 'packagingFee')"
118 @blur="onNonNegativeNumberBlur(item, idx, 'packagingFee')" /> 118 @blur="onNonNegativeNumberBlur(item, idx, 'packagingFee')" />
119 - <text class="unit">元</text> 119 + <text class="unit">{{ moneyUnit }}</text>
120 </view> 120 </view>
121 </template> 121 </template>
122 </uni-list-item> 122 </uni-list-item>
@@ -189,12 +189,11 @@ @@ -189,12 +189,11 @@
189 class="label">数量kg</text><text class="value">{{ item.quantity }}</text> 189 class="label">数量kg</text><text class="value">{{ item.quantity }}</text>
190 </view> 190 </view>
191 <view class="row" :class="{ 'noneStyle': item.showSalesPrice }" v-if="item.showSalesPrice"><text 191 <view class="row" :class="{ 'noneStyle': item.showSalesPrice }" v-if="item.showSalesPrice"><text
192 - class="label">销售价格</text><text class="value">{{  
193 - item.salesPrice }}</text></view> 192 + class="label">{{ salesPriceTitle }}</text><text class="value">{{ item.salesPrice }}</text></view>
194 <uni-list class="edit-list"> 193 <uni-list class="edit-list">
195 <uni-list-item class="amount-item"> 194 <uni-list-item class="amount-item">
196 <template v-slot:body> 195 <template v-slot:body>
197 - <view class="item-title"><text>包装费</text></view> 196 + <view class="item-title"><text>{{ packagingFeeTitle }}</text></view>
198 </template> 197 </template>
199 <template v-slot:footer> 198 <template v-slot:footer>
200 <view class="amount-row"> 199 <view class="amount-row">
@@ -202,7 +201,7 @@ @@ -202,7 +201,7 @@
202 :inputBorder="false" 201 :inputBorder="false"
203 @input="onNonNegativeNumberInput($event, item, idx, 'packagingFee')" 202 @input="onNonNegativeNumberInput($event, item, idx, 'packagingFee')"
204 @blur="onNonNegativeNumberBlur(item, idx, 'packagingFee')" :disabled="!roleCodes.includes('bscnq') && canEditDeliveryAndAssessment"/> 203 @blur="onNonNegativeNumberBlur(item, idx, 'packagingFee')" :disabled="!roleCodes.includes('bscnq') && canEditDeliveryAndAssessment"/>
205 - <text class="unit">元</text> 204 + <text class="unit">{{ moneyUnit }}</text>
206 </view> 205 </view>
207 </template> 206 </template>
208 </uni-list-item> 207 </uni-list-item>
@@ -275,9 +274,8 @@ @@ -275,9 +274,8 @@
275 class="label">数量kg</text><text class="value">{{ item.quantity }}</text> 274 class="label">数量kg</text><text class="value">{{ item.quantity }}</text>
276 </view> 275 </view>
277 <view class="row" v-if="item.showSalesPrice"><text 276 <view class="row" v-if="item.showSalesPrice"><text
278 - class="label">销售价格</text><text class="value">{{  
279 - item.salesPrice }}</text></view>  
280 - <view class="row"><text class="label">包装费(元)</text><text class="value">{{ item.packagingFee }}</text></view> 277 + class="label">{{ salesPriceTitle }}</text><text class="value">{{ item.salesPrice }}</text></view>
  278 + <view class="row"><text class="label">{{ packagingFeeTitle }}</text><text class="value">{{ item.packagingFee }}</text></view>
281 <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text></view> 279 <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text></view>
282 <view class="row"><text class="label">考核超协</text><text class="value">{{ item.assessmentExceedsAgreement }}</text></view> 280 <view class="row"><text class="label">考核超协</text><text class="value">{{ item.assessmentExceedsAgreement }}</text></view>
283 <uni-list class="edit-list2"> 281 <uni-list class="edit-list2">
@@ -334,9 +332,9 @@ @@ -334,9 +332,9 @@
334 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view> 332 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
335 <view class="row"><text class="label">数量kg</text><text class="value">{{ item.quantity }}</text></view> 333 <view class="row"><text class="label">数量kg</text><text class="value">{{ item.quantity }}</text></view>
336 <!-- showSalesPrice 判断是否显示 --> 334 <!-- showSalesPrice 判断是否显示 -->
337 - <view class="row" v-if="item.showSalesPrice"><text class="label">销售价格</text><text class="value">{{ 335 + <view class="row" v-if="item.showSalesPrice"><text class="label">{{ salesPriceTitle }}</text><text class="value">{{
338 item.salesPrice }}</text></view> 336 item.salesPrice }}</text></view>
339 - <view class="row"><text class="label">包装费</text><text class="value">{{ 337 + <view class="row"><text class="label">{{ packagingFeeTitle }}</text><text class="value">{{
340 item.packagingFee }}</text></view> 338 item.packagingFee }}</text></view>
341 <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text> 339 <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text>
342 </view> 340 </view>
@@ -371,6 +369,7 @@ export default { @@ -371,6 +369,7 @@ export default {
371 totalQuantity: { type: Number, default: 0 }, 369 totalQuantity: { type: Number, default: 0 },
372 pageType: { type: String, default: '' }, 370 pageType: { type: String, default: '' },
373 orderDate: { type: String, default: '' }, 371 orderDate: { type: String, default: '' },
  372 + contractType: { type: String, default: '' },
374 canEditDeliveryAndAssessment: { type: Boolean, default: false }, 373 canEditDeliveryAndAssessment: { type: Boolean, default: false },
375 // onlyEditDeliveryAndAssessment: { type: Boolean, default: false } 374 // onlyEditDeliveryAndAssessment: { type: Boolean, default: false }
376 }, 375 },
@@ -397,6 +396,18 @@ export default { @@ -397,6 +396,18 @@ export default {
397 const dd = String(dt.getDate()).padStart(2, '0') 396 const dd = String(dt.getDate()).padStart(2, '0')
398 return `${yy}/${mm}/${dd}` 397 return `${yy}/${mm}/${dd}`
399 }, 398 },
  399 + isIntlContract() {
  400 + return ['INTL_STD_CONTRACT', 'INTL_INVENTORY_AGMT', 'INTL_OPEN_SPEC_AGMT'].includes(String(this.contractType || ''))
  401 + },
  402 + moneyUnit() {
  403 + return this.isIntlContract ? '美元' : '元'
  404 + },
  405 + salesPriceTitle() {
  406 + return `单价(${this.moneyUnit}/kg)`
  407 + },
  408 + packagingFeeTitle() {
  409 + return `包装费(${this.moneyUnit}/kg)`
  410 + },
400 roleCodes() { 411 roleCodes() {
401 const g = this.$store && this.$store.getters 412 const g = this.$store && this.$store.getters
402 return (g && g.roleCodes) || [] 413 return (g && g.roleCodes) || []
@@ -21,7 +21,8 @@ @@ -21,7 +21,8 @@
21 21
22 <!-- 产品 --> 22 <!-- 产品 -->
23 <view class="mgb10"> 23 <view class="mgb10">
24 - <Product mode="view" :list="form.purchaseOrderLineList" :totalQuantity="form.totalQuantity || 0" /> 24 + <Product mode="view" :list="form.purchaseOrderLineList" :totalQuantity="form.totalQuantity || 0"
  25 + :contractType="form.contractType" />
25 </view> 26 </view>
26 27
27 <view class="section"> 28 <view class="section">
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 <!-- 产品 --> 44 <!-- 产品 -->
45 <view class="section2"> 45 <view class="section2">
46 <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange" 46 <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange"
47 - :orderDate="form.orderDate" /> 47 + :orderDate="form.orderDate" :contractType="form.contractType" />
48 </view> 48 </view>
49 <view class="footer"> 49 <view class="footer">
50 <view class="view-total"> 50 <view class="view-total">
@@ -20,7 +20,8 @@ @@ -20,7 +20,8 @@
20 <!-- 产品 --> 20 <!-- 产品 -->
21 <view class="section2"> 21 <view class="section2">
22 <Product mode="approve" :list="initPurchaseOrderLineList" 22 <Product mode="approve" :list="initPurchaseOrderLineList"
23 - :canEditSupplementary="canEditSupplementary" @change="purchaseOrderLineListChange" /> 23 + :canEditSupplementary="canEditSupplementary" @change="purchaseOrderLineListChange"
  24 + :contractType="form.contractType" />
24 </view> 25 </view>
25 <view class="section3"> 26 <view class="section3">
26 <view class="view-total"> 27 <view class="view-total">
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
20 :totalQuantity="form.totalQuantity" 20 :totalQuantity="form.totalQuantity"
21 :totalShippedQuantity="form.totalShippedQuantity" 21 :totalShippedQuantity="form.totalShippedQuantity"
22 :totalSupplementaryQuantity="form.totalSupplementaryQuantity" 22 :totalSupplementaryQuantity="form.totalSupplementaryQuantity"
  23 + :contractType="form.contractType"
23 /> 24 />
24 </view> 25 </view>
25 </view> 26 </view>
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 <view class="section2"> 45 <view class="section2">
46 <!-- mode="fill" 允许个别字段编辑 --> 46 <!-- mode="fill" 允许个别字段编辑 -->
47 <Product mode="fill" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange" 47 <Product mode="fill" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange"
48 - :orderDate="form.orderDate" /> 48 + :orderDate="form.orderDate" :contractType="form.contractType" />
49 </view> 49 </view>
50 50
51 <view class="footer"> 51 <view class="footer">
@@ -469,4 +469,4 @@ export default { @@ -469,4 +469,4 @@ export default {
469 } 469 }
470 } 470 }
471 } 471 }
472 -</style>  
  472 +</style>
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 <view class="section2"> 45 <view class="section2">
46 <!-- mode="add" 允许编辑 --> 46 <!-- mode="add" 允许编辑 -->
47 <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange" 47 <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange"
48 - :orderDate="form.orderDate" /> 48 + :orderDate="form.orderDate" :contractType="form.contractType" />
49 </view> 49 </view>
50 <view class="footer"> 50 <view class="footer">
51 <view class="view-total"> 51 <view class="view-total">
@@ -496,4 +496,4 @@ export default { @@ -496,4 +496,4 @@ export default {
496 } 496 }
497 } 497 }
498 } 498 }
499 -</style>  
  499 +</style>
@@ -129,7 +129,7 @@ @@ -129,7 +129,7 @@
129 :inputBorder="false" 129 :inputBorder="false"
130 @input="onNonNegativeNumberInput($event, item, idx, 'salesPrice')" 130 @input="onNonNegativeNumberInput($event, item, idx, 'salesPrice')"
131 @blur="onNonNegativeNumberBlur(item, idx, 'salesPrice')" /> 131 @blur="onNonNegativeNumberBlur(item, idx, 'salesPrice')" />
132 - <text class="unit">元</text> 132 + <text class="unit">{{ moneyUnit }}</text>
133 </view> 133 </view>
134 </template> 134 </template>
135 </uni-list-item> 135 </uni-list-item>
@@ -143,7 +143,7 @@ @@ -143,7 +143,7 @@
143 :inputBorder="false" 143 :inputBorder="false"
144 @input="onNonNegativeNumberInput($event, item, idx, 'packagingFee')" 144 @input="onNonNegativeNumberInput($event, item, idx, 'packagingFee')"
145 @blur="onNonNegativeNumberBlur(item, idx, 'packagingFee')" /> 145 @blur="onNonNegativeNumberBlur(item, idx, 'packagingFee')" />
146 - <text class="unit">元</text> 146 + <text class="unit">{{ moneyUnit }}</text>
147 </view> 147 </view>
148 </template> 148 </template>
149 </uni-list-item> 149 </uni-list-item>
@@ -247,12 +247,12 @@ @@ -247,12 +247,12 @@
247 <text class="value">{{ item.supplementaryQuantity }}</text> 247 <text class="value">{{ item.supplementaryQuantity }}</text>
248 </template> 248 </template>
249 </uni-list-item> 249 </uni-list-item>
250 - <uni-list-item class="amount-item" title="单价(元/kg)"> 250 + <uni-list-item class="amount-item" :title="salesPriceTitle">
251 <template v-slot:footer> 251 <template v-slot:footer>
252 <text class="value">{{ item.salesPrice }}</text> 252 <text class="value">{{ item.salesPrice }}</text>
253 </template> 253 </template>
254 </uni-list-item> 254 </uni-list-item>
255 - <uni-list-item class="amount-item" title="包装费(元/kg)"> 255 + <uni-list-item class="amount-item" :title="packagingFeeTitle">
256 <template v-slot:footer> 256 <template v-slot:footer>
257 <text class="value">{{ item.packagingFee }}</text> 257 <text class="value">{{ item.packagingFee }}</text>
258 </template> 258 </template>
@@ -359,12 +359,12 @@ @@ -359,12 +359,12 @@
359 <text v-else class="value">{{ item.supplementaryQuantity }}</text> 359 <text v-else class="value">{{ item.supplementaryQuantity }}</text>
360 </template> 360 </template>
361 </uni-list-item> 361 </uni-list-item>
362 - <uni-list-item class="amount-item" title="单价(元/kg)"> 362 + <uni-list-item class="amount-item" :title="salesPriceTitle">
363 <template v-slot:footer> 363 <template v-slot:footer>
364 <text class="value">{{ item.salesPrice }}</text> 364 <text class="value">{{ item.salesPrice }}</text>
365 </template> 365 </template>
366 </uni-list-item> 366 </uni-list-item>
367 - <uni-list-item class="amount-item" title="包装费(元/kg)"> 367 + <uni-list-item class="amount-item" :title="packagingFeeTitle">
368 <template v-slot:footer> 368 <template v-slot:footer>
369 <text class="value">{{ item.packagingFee }}</text> 369 <text class="value">{{ item.packagingFee }}</text>
370 </template> 370 </template>
@@ -439,9 +439,9 @@ @@ -439,9 +439,9 @@
439 </view> 439 </view>
440 <view class="row"><text class="label">需求补货数量(kg)</text><text class="value">{{ item.supplementaryQuantity 440 <view class="row"><text class="label">需求补货数量(kg)</text><text class="value">{{ item.supplementaryQuantity
441 }}</text></view> 441 }}</text></view>
442 - <view class="row"><text class="label">单价(元/kg)</text><text class="value">{{ item.salesPrice }}</text> 442 + <view class="row"><text class="label">{{ salesPriceTitle }}</text><text class="value">{{ item.salesPrice }}</text>
443 </view> 443 </view>
444 - <view class="row"><text class="label">包装费(元/kg)</text><text class="value">{{ 444 + <view class="row"><text class="label">{{ packagingFeeTitle }}</text><text class="value">{{
445 item.packagingFee }}</text></view> 445 item.packagingFee }}</text></view>
446 <view class="row"><text class="label">生产科（车间）确认交付时间</text><text class="value">{{ 446 <view class="row"><text class="label">生产科（车间）确认交付时间</text><text class="value">{{
447 item.confirmedDeliveryDate 447 item.confirmedDeliveryDate
@@ -478,7 +478,8 @@ export default { @@ -478,7 +478,8 @@ export default {
478 totalShippedQuantity: { type: Number, default: 0 }, 478 totalShippedQuantity: { type: Number, default: 0 },
479 totalSupplementaryQuantity: { type: Number, default: 0 }, 479 totalSupplementaryQuantity: { type: Number, default: 0 },
480 orderDate: { type: String, default: '' }, 480 orderDate: { type: String, default: '' },
481 - canEditSupplementary: { type: Boolean, default: false } 481 + canEditSupplementary: { type: Boolean, default: false },
  482 + contractType: { type: String, default: '' }
482 }, 483 },
483 data() { 484 data() {
484 return { 485 return {
@@ -503,6 +504,18 @@ export default { @@ -503,6 +504,18 @@ export default {
503 const dd = String(dt.getDate()).padStart(2, '0') 504 const dd = String(dt.getDate()).padStart(2, '0')
504 return `${yy}/${mm}/${dd}` 505 return `${yy}/${mm}/${dd}`
505 }, 506 },
  507 + isIntlContract() {
  508 + return ['INTL_STD_CONTRACT', 'INTL_INVENTORY_AGMT', 'INTL_OPEN_SPEC_AGMT'].includes(String(this.contractType || ''))
  509 + },
  510 + moneyUnit() {
  511 + return this.isIntlContract ? '美元' : '元'
  512 + },
  513 + salesPriceTitle() {
  514 + return `单价(${this.moneyUnit}/kg)`
  515 + },
  516 + packagingFeeTitle() {
  517 + return `包装费(${this.moneyUnit}/kg)`
  518 + },
506 // roleCodes() { 519 // roleCodes() {
507 // const g = this.$store && this.$store.getters 520 // const g = this.$store && this.$store.getters
508 // return (g && g.roleCodes) || []; 521 // return (g && g.roleCodes) || [];
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
19 :totalQuantity="form.totalQuantity" 19 :totalQuantity="form.totalQuantity"
20 :totalShippedQuantity="form.totalShippedQuantity" 20 :totalShippedQuantity="form.totalShippedQuantity"
21 :totalSupplementaryQuantity="form.totalSupplementaryQuantity" 21 :totalSupplementaryQuantity="form.totalSupplementaryQuantity"
  22 + :contractType="form.contractType"
22 /> 23 />
23 </view> 24 </view>
24 </view> 25 </view>
@@ -33,7 +33,8 @@ @@ -33,7 +33,8 @@
33 33
34 <!-- 产品 --> 34 <!-- 产品 -->
35 <view class="section2"> 35 <view class="section2">
36 - <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange" /> 36 + <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange"
  37 + :contractType="form.contractType" />
37 </view> 38 </view>
38 39
39 <view class="section"> 40 <view class="section">
@@ -14,7 +14,8 @@ @@ -14,7 +14,8 @@
14 14
15 <!-- 产品 --> 15 <!-- 产品 -->
16 <view class="mgb10"> 16 <view class="mgb10">
17 - <Product mode="view" :list="form.purchaseOrderRevokeLineList" :totalQuantity="form.totalQuantity || 0" :totalRevokeQuantity="form.totalRevokeQuantity || 0"/> 17 + <Product mode="view" :list="form.purchaseOrderRevokeLineList" :totalQuantity="form.totalQuantity || 0"
  18 + :totalRevokeQuantity="form.totalRevokeQuantity || 0" :contractType="form.contractType" />
18 </view> 19 </view>
19 20
20 <view class="section"> 21 <view class="section">
@@ -32,7 +32,8 @@ @@ -32,7 +32,8 @@
32 32
33 <!-- 产品 --> 33 <!-- 产品 -->
34 <view class="section2"> 34 <view class="section2">
35 - <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange" /> 35 + <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange"
  36 + :contractType="form.contractType" />
36 </view> 37 </view>
37 38
38 <view class="section"> 39 <view class="section">
@@ -53,9 +53,10 @@ @@ -53,9 +53,10 @@
53 <view class="row" :class="{ 'noneStyle': !item.showSalesPrice }"><text 53 <view class="row" :class="{ 'noneStyle': !item.showSalesPrice }"><text
54 class="label">原数量kg</text><text class="value">{{ item.quantity }}</text> 54 class="label">原数量kg</text><text class="value">{{ item.quantity }}</text>
55 </view> 55 </view>
56 - <view class="row" :class="{ 'noneStyle': item.showSalesPrice }"><text class="label">销售价格</text><text  
57 - class="value">{{  
58 - item.salesPrice }}</text></view> 56 + <view class="row" :class="{ 'noneStyle': item.showSalesPrice }"><text class="label">{{ salesPriceTitle }}</text><text
  57 + class="value">{{ item.salesPrice }}</text></view>
  58 + <view class="row" :class="{ 'noneStyle': item.showSalesPrice }"><text class="label">{{ packagingFeeTitle }}</text><text
  59 + class="value">{{ item.packagingFee }}</text></view>
59 60
60 <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text> 61 <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text>
61 </view> 62 </view>
@@ -117,7 +118,8 @@ @@ -117,7 +118,8 @@
117 </view> 118 </view>
118 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view> 119 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
119 <view class="row"><text class="label">原数量kg</text><text class="value">{{ item.quantity }}</text></view> 120 <view class="row"><text class="label">原数量kg</text><text class="value">{{ item.quantity }}</text></view>
120 - <view class="row"><text class="label">销售价格</text><text class="value">{{ item.salesPrice }}</text></view> 121 + <view class="row"><text class="label">{{ salesPriceTitle }}</text><text class="value">{{ item.salesPrice }}</text></view>
  122 + <view class="row"><text class="label">{{ packagingFeeTitle }}</text><text class="value">{{ item.packagingFee }}</text></view>
121 <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text> 123 <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text>
122 </view> 124 </view>
123 <view class="row"><text class="label">撤销数量kg</text><text class="value">{{ item.revokeQuantity 125 <view class="row"><text class="label">撤销数量kg</text><text class="value">{{ item.revokeQuantity
@@ -144,7 +146,8 @@ export default { @@ -144,7 +146,8 @@ export default {
144 mode: { type: String, default: 'add' }, 146 mode: { type: String, default: 'add' },
145 list: { type: Array, default: () => [] }, 147 list: { type: Array, default: () => [] },
146 totalQuantity: { type: Number, default: 0 }, 148 totalQuantity: { type: Number, default: 0 },
147 - totalRevokeQuantity: { type: Number, default: 0 } 149 + totalRevokeQuantity: { type: Number, default: 0 },
  150 + contractType: { type: String, default: '' }
148 }, 151 },
149 data() { 152 data() {
150 return { 153 return {
@@ -153,6 +156,18 @@ export default { @@ -153,6 +156,18 @@ export default {
153 } 156 }
154 }, 157 },
155 computed: { 158 computed: {
  159 + isIntlContract() {
  160 + return ['INTL_STD_CONTRACT', 'INTL_INVENTORY_AGMT', 'INTL_OPEN_SPEC_AGMT'].includes(String(this.contractType || ''))
  161 + },
  162 + moneyUnit() {
  163 + return this.isIntlContract ? '美元' : '元'
  164 + },
  165 + salesPriceTitle() {
  166 + return `单价(${this.moneyUnit}/kg)`
  167 + },
  168 + packagingFeeTitle() {
  169 + return `包装费(${this.moneyUnit}/kg)`
  170 + },
156 }, 171 },
157 watch: { 172 watch: {
158 items: { 173 items: {
@@ -12,7 +12,8 @@ @@ -12,7 +12,8 @@
12 12
13 <view class="mgb10"> 13 <view class="mgb10">
14 <Product mode="view" :list="form.purchaseOrderRevokeLineList" 14 <Product mode="view" :list="form.purchaseOrderRevokeLineList"
15 - :totalQuantity="form.totalQuantity || 0" :totalRevokeQuantity="form.totalRevokeQuantity || 0" /> 15 + :totalQuantity="form.totalQuantity || 0" :totalRevokeQuantity="form.totalRevokeQuantity || 0"
  16 + :contractType="form.contractType" />
16 </view> 17 </view>
17 18
18 <view class="section"> 19 <view class="section">