Merge branch 'cjerp-contract' of http://gitlab.qgutech.com/zhuyuanliang/erp-mobile into test_cjerp

@@ -44,7 +44,7 @@
 					<uni-list class="customer-info-list">
 					<uni-list class="customer-info-list">
 						<uni-list-item title="年度总销量">
 						<uni-list-item title="年度总销量">
 							<template v-slot:footer>
 							<template v-slot:footer>
-								<uni-easyinput type="number" v-model="customerInfo.annualTotalSales" placeholder="请输入年度总销量"
+								<uni-easyinput v-model="customerInfo.annualTotalSales" placeholder="请输入年度总销量"
 									:inputBorder="false" />
 									:inputBorder="false" />
 							</template>
 							</template>
 						</uni-list-item>
 						</uni-list-item>
@@ -374,6 +374,7 @@ export default {
 					})).filter(it => it.id)
 					})).filter(it => it.id)
 				}
 				}
 				const vals = this.getPayload() || {}
 				const vals = this.getPayload() || {}
+				console.log(vals,'12312321')
 				if (this.customerInfo.annualTotalSales === '' && vals.annualTotalSales !== undefined && vals.annualTotalSales !== null) {
 				if (this.customerInfo.annualTotalSales === '' && vals.annualTotalSales !== undefined && vals.annualTotalSales !== null) {
 					this.customerInfo.annualTotalSales = vals.annualTotalSales
 					this.customerInfo.annualTotalSales = vals.annualTotalSales
 				}
 				}