Commit d82b71246dd447bba51af568416c8927dd5c7b47
Merge branch 'cjerp-contract' of http://gitlab.qgutech.com/zhuyuanliang/erp-mobile into test_cjerp
Showing
1 changed file
with
34 additions
and
2 deletions
| @@ -41,6 +41,25 @@ | @@ -41,6 +41,25 @@ | ||
| 41 | <view class="dialog_close" @click="closeCustomerInfo"></view> | 41 | <view class="dialog_close" @click="closeCustomerInfo"></view> |
| 42 | </view> | 42 | </view> |
| 43 | <view class="dialog_body"> | 43 | <view class="dialog_body"> |
| 44 | + <uni-list class="customer-info-list"> | ||
| 45 | + <uni-list-item title="年度总销量"> | ||
| 46 | + <template v-slot:footer> | ||
| 47 | + <uni-easyinput type="number" v-model="customerInfo.annualTotalSales" placeholder="请输入年度总销量" | ||
| 48 | + :inputBorder="false" /> | ||
| 49 | + </template> | ||
| 50 | + </uni-list-item> | ||
| 51 | + <uni-list-item title="主要行业"> | ||
| 52 | + <template v-slot:footer> | ||
| 53 | + <uni-easyinput v-model="customerInfo.mainIndustry" placeholder="请输入主要行业" :inputBorder="false" /> | ||
| 54 | + </template> | ||
| 55 | + </uni-list-item> | ||
| 56 | + <uni-list-item title="年度款料概况"> | ||
| 57 | + <template v-slot:footer> | ||
| 58 | + <uni-easyinput v-model="customerInfo.annualMaterialOverview" placeholder="请输入年度款料概况" | ||
| 59 | + :inputBorder="false" /> | ||
| 60 | + </template> | ||
| 61 | + </uni-list-item> | ||
| 62 | + </uni-list> | ||
| 44 | <view class="dialog_row"> | 63 | <view class="dialog_row"> |
| 45 | <text class="dialog_label">上传工商信息</text> | 64 | <text class="dialog_label">上传工商信息</text> |
| 46 | <FileUpload v-model="businessFileList" :limit="9" /> | 65 | <FileUpload v-model="businessFileList" :limit="9" /> |
| @@ -139,7 +158,7 @@ export default { | @@ -139,7 +158,7 @@ export default { | ||
| 139 | companyReviewVisible: false, | 158 | companyReviewVisible: false, |
| 140 | businessFileList: [], | 159 | businessFileList: [], |
| 141 | shareholderFileList: [], | 160 | shareholderFileList: [], |
| 142 | - customerInfo: { businessFileList: [], shareholderFileList: [] }, | 161 | + customerInfo: { businessFileList: [], shareholderFileList: [], annualTotalSales: '', mainIndustry: '', annualMaterialOverview: '' }, |
| 143 | companyReview: { companySettlementPeriod: '', companyMaterialSupplyPlan: '', companySuggestedCategory: '', companySuggestedCategoryName: '', companyCreditLimit: '' }, | 162 | companyReview: { companySettlementPeriod: '', companyMaterialSupplyPlan: '', companySuggestedCategory: '', companySuggestedCategoryName: '', companyCreditLimit: '' }, |
| 144 | categoryOptions: [], | 163 | categoryOptions: [], |
| 145 | sheet: { visible: false, title: '请选择', options: [], value: '', field: '' }, | 164 | sheet: { visible: false, title: '请选择', options: [], value: '', field: '' }, |
| @@ -355,6 +374,15 @@ export default { | @@ -355,6 +374,15 @@ export default { | ||
| 355 | })).filter(it => it.id) | 374 | })).filter(it => it.id) |
| 356 | } | 375 | } |
| 357 | const vals = this.getPayload() || {} | 376 | const vals = this.getPayload() || {} |
| 377 | + if (this.customerInfo.annualTotalSales === '' && vals.annualTotalSales !== undefined && vals.annualTotalSales !== null) { | ||
| 378 | + this.customerInfo.annualTotalSales = vals.annualTotalSales | ||
| 379 | + } | ||
| 380 | + if (this.customerInfo.mainIndustry === '' && vals.mainIndustry !== undefined && vals.mainIndustry !== null) { | ||
| 381 | + this.customerInfo.mainIndustry = vals.mainIndustry | ||
| 382 | + } | ||
| 383 | + if (this.customerInfo.annualMaterialOverview === '' && vals.annualMaterialOverview !== undefined && vals.annualMaterialOverview !== null) { | ||
| 384 | + this.customerInfo.annualMaterialOverview = vals.annualMaterialOverview | ||
| 385 | + } | ||
| 358 | const b = (this.customerInfo && this.customerInfo.businessFileList && this.customerInfo.businessFileList.length > 0) | 386 | const b = (this.customerInfo && this.customerInfo.businessFileList && this.customerInfo.businessFileList.length > 0) |
| 359 | ? this.customerInfo.businessFileList | 387 | ? this.customerInfo.businessFileList |
| 360 | : (vals.businessFileList || []) | 388 | : (vals.businessFileList || []) |
| @@ -395,7 +423,7 @@ export default { | @@ -395,7 +423,7 @@ export default { | ||
| 395 | closeCompanyReview() { | 423 | closeCompanyReview() { |
| 396 | this.$refs.companyReviewPopup && this.$refs.companyReviewPopup.close() | 424 | this.$refs.companyReviewPopup && this.$refs.companyReviewPopup.close() |
| 397 | }, | 425 | }, |
| 398 | - onSheetConfirm({ value, label }) { | 426 | + onSheetConfirm({ value, label }) { |
| 399 | const field = this.sheet.field | 427 | const field = this.sheet.field |
| 400 | if (!field) return | 428 | if (!field) return |
| 401 | if (field === 'companySuggestedCategory') { | 429 | if (field === 'companySuggestedCategory') { |
| @@ -705,6 +733,10 @@ export default { | @@ -705,6 +733,10 @@ export default { | ||
| 705 | color: rgba(0, 0, 0, 0.9); | 733 | color: rgba(0, 0, 0, 0.9); |
| 706 | } | 734 | } |
| 707 | 735 | ||
| 736 | +.customer-info-list { | ||
| 737 | + margin-bottom: 24rpx; | ||
| 738 | +} | ||
| 739 | + | ||
| 708 | .upload-show { | 740 | .upload-show { |
| 709 | margin-top: 8rpx; | 741 | margin-top: 8rpx; |
| 710 | font-size: 26rpx; | 742 | font-size: 26rpx; |