更新

config/index.js

@@ -1,11 +1,11 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
 	// baseUrl: 'http://localhost:8080/',
-	baseUrlNew: 'http://192.168.1.118:8090/',
+	// baseUrlNew: 'http://192.168.1.118:8090/',
 	// baseUrlNew: 'http://192.168.1.114:8090/',
 	// baseUrlNew: 'http://192.168.1.122:8090/',
 	// baseUrlNew: 'http://192.168.1.119:9100/',
-	// baseUrlNew: 'http://api1.eliangeyun.com/',
+	baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "1.1.74",
-    "versionCode" : 1174,
+    "versionName" : "1.1.77",
+    "versionCode" : 1177,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

pages/erp/index.vue

@@ -139,79 +139,79 @@
 									// }
 								],
 				gridList: [
-					// {
+					{
 
-					// 	num: 0,
-					// 	name: '入库',
-					// 	// icon: 'cuIcon-apps',
-					// 	src: '../../static/img/erp/yaoqingyonghu@3x.png',
-					// 	tips: 0,
-					// 	url: '/pages/erp/warehousing/warehousing',
-					// 	show: true
-					// },
-					// {
-					// 	num: 1,
-					// 	name: '待完善入库',
-					// 	// icon: 'cuIcon-calendar',
-					// 	src: '../../static/img/erp/shougouzhijian@3x.png',
-					// 	tips: 0,
-					// 	url: '/pages/erp/improvedWrehousing/improvedWrehousing',
-					// 	show: true
-					// },
-					// {
-					// 	num: 2,
-					// 	name: '出库',
-					// 	// icon: 'cuIcon-copy',
-					// 	src: '../../static/img/erp/shougoujianjin@3x.png',
-					// 	tips: 0,
-					// 	url: '/pages/erp/exWarehousing/exWarehousing',
-					// 	show: true
-					// },
-					// {
-					// 	num: 3,
-					// 	name: '待完善出库',
-					// 	// icon: 'cuIcon-edit',
-					// 	src: '../../static/img/erp/shougouzhijian@3x.png',
-					// 	tips: 0,
-					// 	url: `/pages/erp/improvedExWaehousing/improvedExWaehousing`,
-					// 	show: true
-					// }
+						num: 0,
+						name: '入库',
+						// icon: 'cuIcon-apps',
+						src: '../../static/img/erp/yaoqingyonghu@3x.png',
+						tips: 0,
+						url: '/pages/erp/warehousing/warehousing',
+						show: true
+					},
 					{
-							num: 0,
-							name: '入库质检',
-							// icon: 'cuIcon-apps',
-							src: '../../static/img/erp/yaoqingyonghu@3x.png',
-							tips: 0,
-							url: '/pages/erpbusiness/quality_testing?managementType=1',
-							show: true
-						},
-						{
-							num: 1,
-							name: '入库检斤',
-							// icon: 'cuIcon-calendar',
-							src: '../../static/img/erp/shougouzhijian@3x.png',
-							tips: 0,
-							url: '/pages/erpbusiness/acquisitionInspection/acquisitionInspection',
-							show: true
-						},
-						{
-							num: 2,
-							name: '出库检斤',
-							// icon: 'cuIcon-copy',
-							src: '../../static/img/erp/shougoujianjin@3x.png',
-							tips: 0,
-							url: '/pages/erpbusiness/acquisitionInspection/warehouseWeighing',
-							show: true
-						},
-						{
-							num: 3,
-							name: '出库质检',
-							// icon: 'cuIcon-edit',
-							src: '../../static/img/erp/shougouzhijian@3x.png',
-							tips: 0,
-							url: `/pages/erpbusiness/outbound_quality_testing?managementType=3`,
-							show: true
-						}
+						num: 1,
+						name: '待完善入库',
+						// icon: 'cuIcon-calendar',
+						src: '../../static/img/erp/shougouzhijian@3x.png',
+						tips: 0,
+						url: '/pages/erp/improvedWrehousing/improvedWrehousing',
+						show: true
+					},
+					{
+						num: 2,
+						name: '出库',
+						// icon: 'cuIcon-copy',
+						src: '../../static/img/erp/shougoujianjin@3x.png',
+						tips: 0,
+						url: '/pages/erp/exWarehousing/exWarehousing',
+						show: true
+					},
+					{
+						num: 3,
+						name: '待完善出库',
+						// icon: 'cuIcon-edit',
+						src: '../../static/img/erp/shougouzhijian@3x.png',
+						tips: 0,
+						url: `/pages/erp/improvedExWaehousing/improvedExWaehousing`,
+						show: true
+					}
+					// {
+					// 		num: 0,
+					// 		name: '入库质检',
+					// 		// icon: 'cuIcon-apps',
+					// 		src: '../../static/img/erp/yaoqingyonghu@3x.png',
+					// 		tips: 0,
+					// 		url: '/pages/erpbusiness/quality_testing?managementType=1',
+					// 		show: true
+					// 	},
+					// 	{
+					// 		num: 1,
+					// 		name: '入库检斤',
+					// 		// icon: 'cuIcon-calendar',
+					// 		src: '../../static/img/erp/shougouzhijian@3x.png',
+					// 		tips: 0,
+					// 		url: '/pages/erpbusiness/acquisitionInspection/acquisitionInspection',
+					// 		show: true
+					// 	},
+					// 	{
+					// 		num: 2,
+					// 		name: '出库检斤',
+					// 		// icon: 'cuIcon-copy',
+					// 		src: '../../static/img/erp/shougoujianjin@3x.png',
+					// 		tips: 0,
+					// 		url: '/pages/erpbusiness/acquisitionInspection/warehouseWeighing',
+					// 		show: true
+					// 	},
+					// 	{
+					// 		num: 3,
+					// 		name: '出库质检',
+					// 		// icon: 'cuIcon-edit',
+					// 		src: '../../static/img/erp/shougouzhijian@3x.png',
+					// 		tips: 0,
+					// 		url: `/pages/erpbusiness/outbound_quality_testing?managementType=3`,
+					// 		show: true
+					// 	}
 
 					// {
 					// 	num: 4,

pages/erpbusiness/add_quality_testing.vue

@@ -95,7 +95,7 @@
 				<view class="con-list">
 					<view @click='show6=true'>{{gridList.fleet?ridList.fleet:'非车队车辆'}}</view>
 					<u-picker @confirm='fleetpicker($event)' :range="fleetNameList" range-key="fleetName"
-						v-model="show5" mode="selector">
+						v-model="show6" mode="selector">
 					</u-picker>
 				</view>
 			</view>
@@ -204,9 +204,10 @@
 				<view class="title">仓位号</view>
 				<view class="con-list">
 					<view @click='show=true'>{{gridList.binNumber?gridList.binNumber:'请选择仓位号'}}</view>
-					<u-picker :range="warehouseList" range-key="binNumber" @confirm='binNumberpicker($event)'
+					
+					<!-- <u-picker :range="warehouseList" range-key="binNumber" 
 						v-model="show" mode="selector">
-					</u-picker>
+					</u-picker> -->
 				</view>
 			</view>
 			<view class="c-row ">
@@ -353,6 +354,7 @@
 			</view>
 			<u-button type="success" style="width: 50%;margin-bottom: 10px;" @click="good">确定</u-button>
 		</u-popup>
+		<u-picker mode="selector" v-model="show" :default-selector="[0]" :range="warehouseList" range-key="binNumber" @confirm='binNumberpicker($event)'></u-picker>
 	</view>
 </template>
 

pages/erpbusiness/edit_quality_testing.vue

@@ -126,9 +126,6 @@
 			<view class="c-row ">
 				<view class="title">仓位号</view>
 				<view class="con-list">
-					<u-picker :range="warehouseList" range-key="binNumber" @confirm='binNumberpicker($event)'
-						v-model="show" mode="selector">
-					</u-picker>
 					<view v-if='flag!=1' @click='show=true'>{{gridList.binNumber}}</view>
 					<view v-else>{{gridList.binNumber}}</view>
 				</view>
@@ -358,6 +355,9 @@
 				<view class="but_css" @click="close">返回</view>
 			</view>
 		</u-popup>
+		<u-picker :range="warehouseList" range-key="binNumber" @confirm='binNumberpicker($event)'
+			v-model="show" mode="selector">
+		</u-picker>
 	</view>
 </template>
 

pages/user/user.vue

@@ -175,16 +175,16 @@
 						url: `/pages/erp/index`,
 						show: true
 					},
-					// {
-					// 	num: 1,
-					// 	name: '入库管理',
-					// 	// name: '收购业务',
-					// 	// icon: 'cuIcon-copy',
-					// 	src: '../../static/img/myimg/sg.png',
-					// 	tips: 0,
-					// 	url: `/pages/erpbusiness/index`,
-					// 	show: true
-					// },
+					{
+						num: 1,
+						name: '入库管理',
+						// name: '收购业务',
+						// icon: 'cuIcon-copy',
+						src: '../../static/img/myimg/sg.png',
+						tips: 0,
+						url: `/pages/erpbusiness/index`,
+						show: true
+					},
 					// {
 					// 	num: 2,
 					// 	name: '我的票据',