Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pages/task/audit/purchasecontract.vue

@@ -68,7 +68,7 @@
 			<u-form-item label-width='260' label="签订日期">
 				<u-input v-model="list.signingDate" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item label-width='300' label="最终实际交易量 (吨)">
+			<u-form-item label-width='300' label="最终实际交易量（吨）">
 				<u-input v-model="list.finalTradingVolume" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item v-if='list.deliverType == 1' label-width='260' label="临时仓库负责人">
@@ -86,7 +86,7 @@
 			<u-form-item label-width='260' label="杂质（%）<=">
 				<u-input v-model="list.contractGoodsInfo.impurity" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="容重(克/升)>=">
+			<u-form-item label-width='260' label="容重（克/升）>=">
 				<u-input v-model="list.contractGoodsInfo.bulkDensity" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="霉变粒（%）<=">

pages/task/audit/salecontract.vue

@@ -68,7 +68,7 @@
 			<u-form-item label-width='260' label="签订日期">
 				<u-input v-model="list.signingDate" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item label-width='300' label="最终实际交易量 (吨)">
+			<u-form-item label-width='300' label="最终实际交易量（吨）">
 				<u-input v-model="list.finalTradingVolume" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="货名">

pages/task/procurement_details.vue

@@ -11,37 +11,37 @@
 			<u-form-item label-width='260' label="客户">
 				{{list.seller}}
 			</u-form-item>
-			<u-form-item v-if='list.procurementPlanType=="现货"' label-width='260' label="单价(元/吨)">
+			<u-form-item v-if='list.procurementPlanType=="现货"' label-width='260' label="单价（元/吨）">
 				<u-input v-model="list.unitPrice" />
 			</u-form-item>
-			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="基差(元/吨)">
+			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="基差（元/吨）">
 				{{list.basis}}
 			</u-form-item>
-			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="冻结定金(元)">
+			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="冻结定金（元）">
 				{{list.freezingDeposit}}
 			</u-form-item>
-			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="拖欠定金(元)">
+			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="拖欠定金（元）">
 				{{list.defaultDeposit}}
 			</u-form-item>
-			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="卸车费(元/吨)">
+			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="卸车费（元/吨）">
 				{{list.unloadingCharge}}
 			</u-form-item>
-			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="发票费(元/吨)">
+			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="发票费（元/吨）">
 				{{list.invoiceFee}}
 			</u-form-item>
-			<u-form-item label-width='260' label="合同重量(吨)">
+			<u-form-item label-width='260' label="合同重量（吨）">
 				{{list.transactionsNumber}}
 			</u-form-item>
-			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="已入库量(吨)">
+			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="已入库量（吨）">
 				{{list.stockInQuantity}}
 			</u-form-item>
-			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="可平仓量(吨)">
+			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="可平仓量（吨）">
 				{{list.openPosition}}
 			</u-form-item>
-			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="已平仓量(吨)">
+			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="已平仓量（吨）">
 				{{list.closedPosition}}
 			</u-form-item>
-			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="已成交量(吨)">
+			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="已成交量（吨）">
 				{{list.cumulativeTurnover}}
 			</u-form-item>
 			<u-form-item  label-width='260' label="发票类型">

pages/task/sale_details.vue

@@ -11,37 +11,37 @@
 			<u-form-item label-width='260' label="客户">
 				{{list.buyer}}
 			</u-form-item>
-			<u-form-item v-if='list.salePlanType=="现货"' label-width='260' label="单价(元/吨)">
+			<u-form-item v-if='list.salePlanType=="现货"' label-width='260' label="单价（元/吨）">
 				<u-input v-model="list.unitPrice" />
 			</u-form-item>
-			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="基差(元/吨)">
+			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="基差（元/吨）">
 				{{list.basis}}
 			</u-form-item>
-			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="冻结定金(元)">
+			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="冻结定金（元）">
 				{{list.freezingDeposit}}
 			</u-form-item>
-			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="拖欠定金(元)">
+			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="拖欠定金（元）">
 				{{list.defaultDeposit}}
 			</u-form-item>
-			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="卸车费(元/吨)">
+			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="卸车费（元/吨）">
 				{{list.unloadingCharge}}
 			</u-form-item>
-			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="发票费(元/吨)">
+			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="发票费（元/吨）">
 				{{list.invoiceFee}}
 			</u-form-item>
-			<u-form-item label-width='260' label="合同重量(吨)">
+			<u-form-item label-width='260' label="合同重量（吨）">
 				{{list.transactionsNumber}}
 			</u-form-item>
-			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="已出库量(吨)">
+			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="已出库量（吨）">
 				{{list.stockOutQuantity}}
 			</u-form-item>
-			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="可平仓量(吨)">
+			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="可平仓量（吨）">
 				{{list.openPosition}}
 			</u-form-item>
-			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="已平仓量(吨)">
+			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="已平仓量（吨）">
 				{{list.closedPosition}}
 			</u-form-item>
-			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="已成交量(吨)">
+			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="已成交量（吨）">
 				{{list.cumulativeTurnover}}
 			</u-form-item>
 			<u-form-item  label-width='260' label="发票类型">