Browse Source

前端gjy

gjy 3 years ago
parent
commit
9148eb4140

+ 1 - 1
components/uview-ui/libs/util/province.js

@@ -1 +1 @@
-var provinceData=[{"label":"北京市","value":"11"},{"label":"天津市","value":"12"},{"label":"河北省","value":"13"},{"label":"山西省","value":"14"},{"label":"内蒙古自治区","value":"15"},{"label":"辽宁省","value":"21"},{"label":"吉林省","value":"22"},{"label":"黑龙江省","value":"23"},{"label":"上海市","value":"31"},{"label":"江苏省","value":"32"},{"label":"浙江省","value":"33"},{"label":"安徽省","value":"34"},{"label":"福建省","value":"35"},{"label":"江西省","value":"36"},{"label":"山东省","value":"37"},{"label":"河南省","value":"41"},{"label":"湖北省","value":"42"},{"label":"湖南省","value":"43"},{"label":"广东省","value":"44"},{"label":"广西壮族自治区","value":"45"},{"label":"海南省","value":"46"},{"label":"重庆市","value":"50"},{"label":"四川省","value":"51"},{"label":"贵州省","value":"52"},{"label":"云南省","value":"53"},{"label":"西藏自治区","value":"54"},{"label":"陕西省","value":"61"},{"label":"甘肃省","value":"62"},{"label":"青海省","value":"63"},{"label":"宁夏回族自治区","value":"64"},{"label":"新疆维吾尔自治区","value":"65"},{"label":"台湾","value":"66"},{"label":"香港","value":"67"},{"label":"澳门","value":"68"}];export default provinceData;
+var provinceData=[{"label":"北京市","value":"110000"},{"label":"天津市","value":"120000"},{"label":"河北省","value":"130000"},{"label":"山西省","value":"140000"},{"label":"内蒙古自治区","value":"150000"},{"label":"辽宁省","value":"210000"},{"label":"吉林省","value":"220000"},{"label":"黑龙江省","value":"230000"},{"label":"上海市","value":"310000"},{"label":"江苏省","value":"320000"},{"label":"浙江省","value":"330000"},{"label":"安徽省","value":"340000"},{"label":"福建省","value":"350000"},{"label":"江西省","value":"360000"},{"label":"山东省","value":"370000"},{"label":"河南省","value":"410000"},{"label":"湖北省","value":"420000"},{"label":"湖南省","value":"430000"},{"label":"广东省","value":"440000"},{"label":"广西壮族自治区","value":"450000"},{"label":"海南省","value":"460000"},{"label":"重庆市","value":"500000"},{"label":"四川省","value":"510000"},{"label":"贵州省","value":"520000"},{"label":"云南省","value":"530000"},{"label":"西藏自治区","value":"540000"},{"label":"陕西省","value":"610000"},{"label":"甘肃省","value":"620000"},{"label":"青海省","value":"630000"},{"label":"宁夏回族自治区","value":"640000"},{"label":"新疆维吾尔自治区","value":"650000"},{"label":"台湾省","value":"710000"},{"label":"香港特别行政区","value":"810000"},{"label":"澳门特别行政区","value":"820000"}];export default provinceData;

+ 3 - 1
pageA/product/trade.vue

@@ -44,7 +44,7 @@
 						<view class="title">{{minimumVolume}}</view>
 						<view class="title">{{minimumVolume}}</view>
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="c-row">
+				<view v-if='' class="c-row">
 					<text class="tit">今日基差(元/吨)</text>
 					<text class="tit">今日基差(元/吨)</text>
 					<view class="con-list">
 					<view class="con-list">
 						<view class="title">{{basisPrice}}</view>
 						<view class="title">{{basisPrice}}</view>
@@ -136,6 +136,7 @@
 					receivePrivate:'',
 					receivePrivate:'',
 					receiveCity:'',
 					receiveCity:'',
 					receiveArea:'',
 					receiveArea:'',
+					procurementPlanType:'',
 					minimumVolume:0,
 					minimumVolume:0,
 					basisPrice:0,
 					basisPrice:0,
 					pcFlag:0,
 					pcFlag:0,
@@ -194,6 +195,7 @@
 				};
 				};
 			},
 			},
 			onLoad(options) {
 			onLoad(options) {
+				this.procurementPlanType = options.procurementPlanType
 				this.receiveWarehouse=options.receiveWarehouse
 				this.receiveWarehouse=options.receiveWarehouse
 				this.receivePrivate=options.receivePrivate
 				this.receivePrivate=options.receivePrivate
 				this.receiveCity=options.receiveCity
 				this.receiveCity=options.receiveCity

+ 1 - 0
pageD/warehousings/warehousings.vue

@@ -55,6 +55,7 @@
 					<text class="tit">仓库</text>
 					<text class="tit">仓库</text>
 					<view style="color: #ff0000; padding-left: 10rpx;">*</view>
 					<view style="color: #ff0000; padding-left: 10rpx;">*</view>
 					<view class="con-list">
 					<view class="con-list">
+						
 						<picker @change="warehouseChange" :value="warehouseIndex" :range="warehouse" class="con-list">
 						<picker @change="warehouseChange" :value="warehouseIndex" :range="warehouse" class="con-list">
 							<view >
 							<view >
 								{{warehouseIndex>-1?warehouse[warehouseIndex]:'请选择仓库'}}
 								{{warehouseIndex>-1?warehouse[warehouseIndex]:'请选择仓库'}}