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

config/index.js

@@ -1,7 +1,7 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
-	baseUrlNew: 'http://192.168.1.117:8090/',
+	baseUrlNew: 'http://192.168.1.121:8090/',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

demo.vue

@@ -53,9 +53,15 @@
 				mask:true
 			})
 			uni.hideLoading()
+			this.$forceUpdate()//刷新data数据
 			that.$api.msg('添加成功')
 			uni.setStorageSync("depotAcquisition_warehouseName",this.warehouseName)
 			uni.getStorageSync("depotAcquisition_warehouseName")
+			// 公司id
+			compId:  uni.getStorageSync('pcUserInfo').compId,
+			uni.getStorageSync("userInfo").id//用戶id
+			// 调用公用方法
+			 this.utils.getDistance(lat1,lng1,lat2,lng2)
 			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
 				console.log("checkSession", res)
 				if (res.data.data == "INVALID") {

main.js

@@ -311,6 +311,22 @@ const prePage = () => {
 }
 
 const globalData = {}
+Date.prototype.format = function (fmt) {
+    var o = {
+        "M+": this.getMonth() + 1, //月份
+        "d+": this.getDate(), //日
+        "h+": this.getHours(), //小时
+        "m+": this.getMinutes(), //分
+        "s+": this.getSeconds(), //秒
+        "q+": Math.floor((this.getMonth() + 3) / 3), //季度
+        "S": this.getMilliseconds() //毫秒
+    };
+    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+    for (var k in o)
+        if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+    return fmt;
+}
+
 
 Vue.config.productionTip = false
 Vue.prototype.$fire = new Vue();

manifest.json

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

pages.json

@@ -48,7 +48,7 @@
 				"navigationBarTitleText": "易粮易运"
 				// "navigationStyle": "custom"
 			}
-		},{
+		}, {
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "启动页",
@@ -264,7 +264,7 @@
 			"style": {
 				"navigationBarTitleText": "粮脉",
 				"enablePullDownRefresh": true
-				
+
 			}
 			// "style": {
 			// 	"navigationBarTitleText": "粮脉",
@@ -700,22 +700,20 @@
 				"enablePullDownRefresh": false
 			}
 
-		},{
-            "path" : "pages/user/fankui",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
+		}, {
+			"path": "pages/user/fankui",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}
 
-	    ,{
-            "path" : "pages/grain_pulse/distribution/distribution",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "分布",
-                "enablePullDownRefresh": false
+		, {
+			"path": "pages/grain_pulse/distribution/distribution",
+			"style": {
+				"navigationBarTitleText": "分布",
+				"enablePullDownRefresh": false
 				// "app-plus": {  
 				//                 "subNVues":[{  
 				//                     "id": "popup", 
@@ -730,498 +728,433 @@
 				//                     }  
 				//                 }]  
 				//             } 
-    //             "enablePullDownRefresh": false
-            }
-        }
-        ,{
-            "path" : "pages/grain_pulse/position/position",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "定位",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/grain_pulse/selectCity/selectCity",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "城市",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/grain_pulse/localtion/localtion",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "位置",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-		,{
-		    "path" : "pages/grain_pulse/localtion/coordinate",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "坐标",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-        ,{
-            "path" : "pages/grain_pulse/distribution/distribution",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "分布",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/erpbusiness/sm/sm",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "客户邀请",
-                "enablePullDownRefresh": false,
+				//             "enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/grain_pulse/position/position",
+			"style": {
+				"navigationBarTitleText": "定位",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/grain_pulse/selectCity/selectCity",
+			"style": {
+				"navigationBarTitleText": "城市",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/grain_pulse/localtion/localtion",
+			"style": {
+				"navigationBarTitleText": "位置",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/grain_pulse/localtion/coordinate",
+			"style": {
+				"navigationBarTitleText": "坐标",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/grain_pulse/distribution/distribution",
+			"style": {
+				"navigationBarTitleText": "分布",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/erpbusiness/sm/sm",
+			"style": {
+				"navigationBarTitleText": "客户邀请",
+				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/erpbusiness/QRCode/QRCode",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "二维码",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/erpbusiness/acquisitionInspection/acquisitionInspection",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "收购检斤",
-                "enablePullDownRefresh": true
-            }
-            
-        },
-		{
-		    "path" : "pages/erpbusiness/acquisitionInspection/warehouseWeighing",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "出库检斤",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		},
-		{
-		    "path" : "pages/erpbusiness/acquisitionInspection/grossWeightDetail",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "毛重检斤",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		},
-		{
-		    "path" : "pages/erpbusiness/acquisitionInspection/grossWeightDetail1",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "毛重检斤",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		},
-		{
-		    "path" : "pages/erpbusiness/acquisitionInspection/tareDetail",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "皮重检斤",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		},
-		{
-		    "path" : "pages/erpbusiness/acquisitionInspection/tareDetail1",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "皮重检斤",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		},
-		{
-		    "path" : "pages/erpbusiness/acquisitionInspection/tareDetail2",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "检斤详情",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		},
-		{
-		    "path" : "pages/erpbusiness/acquisitionInspection/add_check_the_weight",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "皮重检斤",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		},
-		{
-		    "path" : "pages/erpbusiness/acquisitionInspection/selectContractNo",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "选择合同",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-		,{
-		    "path" : "pages/erp/index",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "ERP业务",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-        ,{
-            "path" : "pages/erp/warehousing/warehousing",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "入库",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-		,{
-		    "path" : "pages/erp/warehousing/selectContractNo",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "选择合同",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		},
-		{
-		    "path" : "pages/erp/exWarehousing/selectContractNo",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "选择合同",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-		,{
-		    "path" : "pages/erp/warehousing/selectCarNo",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "选择车牌号",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		},
-		{
-		    "path" : "pages/erp/exWarehousing/selectCarNo",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "选择车牌号",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-        ,{
-            "path" : "pages/erp/improvedWrehousing/improvedWrehousing",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "待完善入库",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/erp/exWarehousing/exWarehousing",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "出库",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/erp/improvedExWaehousing/improvedExWaehousing",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "待完善出库",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-		,{
-		    "path" : "pages/erp/improvedExWaehousing/improvedExWaehousing",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "待完善出库",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-        ,{
-            "path" : "pages/erp/improvedWrehousing/improvedWrehousingDetail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "完善入库",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/erp/improvedExWaehousing/improvedExWaehousingDetail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "完善出库",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-		,{
-		    "path" : "pages/erp/deliveryfeedback/list",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "发货反馈",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-		,{
-		    "path" : "pages/erp/receivingfeedback/list",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "收货反馈",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		},
-		{
-		    "path" : "pages/erp/deliveryfeedback/details",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "发货反馈详情",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-		,{
-		    "path" : "pages/erp/receivingfeedback/details",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "收货反馈详情",
-		        "enablePullDownRefresh": false
-		    }
-		    
+			}
+
+		}, {
+			"path": "pages/erpbusiness/QRCode/QRCode",
+			"style": {
+				"navigationBarTitleText": "二维码",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/erpbusiness/acquisitionInspection/acquisitionInspection",
+			"style": {
+				"navigationBarTitleText": "收购检斤",
+				"enablePullDownRefresh": true
+			}
+
+		},
+		{
+			"path": "pages/erpbusiness/acquisitionInspection/warehouseWeighing",
+			"style": {
+				"navigationBarTitleText": "出库检斤",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/erpbusiness/acquisitionInspection/grossWeightDetail",
+			"style": {
+				"navigationBarTitleText": "毛重检斤",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/erpbusiness/acquisitionInspection/grossWeightDetail1",
+			"style": {
+				"navigationBarTitleText": "毛重检斤",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/erpbusiness/acquisitionInspection/tareDetail",
+			"style": {
+				"navigationBarTitleText": "皮重检斤",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/erpbusiness/acquisitionInspection/tareDetail1",
+			"style": {
+				"navigationBarTitleText": "皮重检斤",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/erpbusiness/acquisitionInspection/tareDetail2",
+			"style": {
+				"navigationBarTitleText": "检斤详情",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/erpbusiness/acquisitionInspection/add_check_the_weight",
+			"style": {
+				"navigationBarTitleText": "皮重检斤",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/erpbusiness/acquisitionInspection/selectContractNo",
+			"style": {
+				"navigationBarTitleText": "选择合同",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/erp/index",
+			"style": {
+				"navigationBarTitleText": "ERP业务",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/erp/warehousing/warehousing",
+			"style": {
+				"navigationBarTitleText": "入库",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/erp/warehousing/selectContractNo",
+			"style": {
+				"navigationBarTitleText": "选择合同",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/erp/exWarehousing/selectContractNo",
+			"style": {
+				"navigationBarTitleText": "选择合同",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/erp/warehousing/selectCarNo",
+			"style": {
+				"navigationBarTitleText": "选择车牌号",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/erp/exWarehousing/selectCarNo",
+			"style": {
+				"navigationBarTitleText": "选择车牌号",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/erp/improvedWrehousing/improvedWrehousing",
+			"style": {
+				"navigationBarTitleText": "待完善入库",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/erp/exWarehousing/exWarehousing",
+			"style": {
+				"navigationBarTitleText": "出库",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/erp/improvedExWaehousing/improvedExWaehousing",
+			"style": {
+				"navigationBarTitleText": "待完善出库",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/erp/improvedExWaehousing/improvedExWaehousing",
+			"style": {
+				"navigationBarTitleText": "待完善出库",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/erp/improvedWrehousing/improvedWrehousingDetail",
+			"style": {
+				"navigationBarTitleText": "完善入库",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/erp/improvedExWaehousing/improvedExWaehousingDetail",
+			"style": {
+				"navigationBarTitleText": "完善出库",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/erp/deliveryfeedback/list",
+			"style": {
+				"navigationBarTitleText": "发货反馈",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/erp/receivingfeedback/list",
+			"style": {
+				"navigationBarTitleText": "收货反馈",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/erp/deliveryfeedback/details",
+			"style": {
+				"navigationBarTitleText": "发货反馈详情",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/erp/receivingfeedback/details",
+			"style": {
+				"navigationBarTitleText": "收货反馈详情",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/erp/openService/openService",
+			"style": {
+				"navigationBarTitleText": "开通服务",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/erp/contactCustomerService/contactCustomerService",
+			"style": {
+				"navigationBarTitleText": "联系客服",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/task/audit/warehouse_approval",
+			"style": {
+				"navigationBarTitleText": "仓库设置审核",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/task/audit/warehouse_details",
+			"style": {
+				"navigationBarTitleText": "仓库设置详情",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/task/audit/freight_setting_approval",
+			"style": {
+				"navigationBarTitleText": "运费设置审核",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/task/audit/freight_setting_details",
+			"style": {
+				"navigationBarTitleText": "运费设置详情",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/task/audit/freight_settlement_approval",
+			"style": {
+				"navigationBarTitleText": "运费结算审核",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/task/audit/freight_settlement_details",
+			"style": {
+				"navigationBarTitleText": "运费结算详情",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/task/audit/acquisition_settlement_approval",
+			"style": {
+				"navigationBarTitleText": "收购结算审核",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/task/audit/acquisition_settlement_details",
+			"style": {
+				"navigationBarTitleText": "收购结算详情",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/task/audit/purchase_settlement_approval",
+			"style": {
+				"navigationBarTitleText": "采购结算审核",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/task/audit/purchase_settlement_details",
+			"style": {
+				"navigationBarTitleText": "采购结算详情",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/task/audit/Issueandreceipt_task_approval",
+			"style": {
+				"navigationBarTitleText": "出入库任务审核",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/task/audit/Issueandreceipt_task_details",
+			"style": {
+				"navigationBarTitleText": "出入库任务详情",
+				"enablePullDownRefresh": false
+			}
+
 		}
-        ,{
-            "path" : "pages/erp/openService/openService",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "开通服务",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/erp/contactCustomerService/contactCustomerService",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "联系客服",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/task/audit/warehouse_approval",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "仓库设置审核",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/task/audit/warehouse_details",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "仓库设置详情",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/task/audit/freight_setting_approval",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "运费设置审核",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/task/audit/freight_setting_details",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "运费设置详情",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/task/audit/freight_settlement_approval",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "运费结算审核",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/task/audit/freight_settlement_details",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "运费结算详情",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/task/audit/acquisition_settlement_approval",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "收购结算审核",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/task/audit/acquisition_settlement_details",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "收购结算详情",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/task/audit/purchase_settlement_approval",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "采购结算审核",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-		,{
-		    "path" : "pages/task/audit/purchase_settlement_details",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "采购结算详情",
-		        "enablePullDownRefresh": false
-		    }
-		    
+
+		, {
+			"path": "pages/user/depotMonitoring",
+			"style": {
+				"navigationBarTitleText": "库点监控",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/task/audit/acquisition_information_approval",
+			"style": {
+				"navigationBarTitleText": "收购信息审核",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/task/audit/acquisition_information_details",
+			"style": {
+				"navigationBarTitleText": "收购信息详情",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/erpbusiness/acquisitionInformation",
+			"style": {
+				"navigationBarTitleText": "收购信息",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/user/depotAcquisition/depotAcquisition",
+			"style": {
+				"navigationBarTitleText": "库点收购",
+				"enablePullDownRefresh": true,
+				"app-plus": {
+					"softinputNavBar": "none",
+					"scrollIndicator": "none",
+					"softinputMode": "adjustPan",
+					"titleNView": {
+						"autoBackButton": false,
+						"backgroundColor": "#fff",
+						"buttons": [{
+							"fontSrc": "/pageC/static/car/iconfont.ttf",
+							"float": "right",
+							"text": "\ue639",
+							"fontSize": "18px"
+						}
+						,
+						{
+							"fontSrc": "pageC/static/iconfont/iconfont.ttf",
+							"float": "left",
+							"text": "\ue6f2",
+							"fontSize": "20px"
+						}
+						]
+					}
+				}
+			}
+
+		}, {
+			"path": "pages/user/depotAcquisition/grainDeliveryRegistration",
+			"style": {
+				"navigationBarTitleText": "送粮登记",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/user/depotAcquisition/grainDeliveryRecord",
+			"style": {
+				"navigationBarTitleText": "送粮记录",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/user/depotAcquisition/grainDeliveryRecord",
+			"style": {
+				"navigationBarTitleText": "送粮记录",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/user/depotAcquisition/selectCity",
+			"style": {
+				"navigationBarTitleText": "选择城市",
+				"enablePullDownRefresh": false
+			}
+
 		}
-        ,{
-            "path" : "pages/task/audit/Issueandreceipt_task_approval",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "出入库任务审核",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/task/audit/Issueandreceipt_task_details",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "出入库任务详情",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        
-        ,{
-            "path" : "pages/user/depotMonitoring",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "库点监控",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/task/audit/acquisition_information_approval",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "收购信息审核",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/task/audit/acquisition_information_details",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "收购信息详情",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/erpbusiness/acquisitionInformation",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "收购信息",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/user/depotAcquisition/depotAcquisition",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "库点收购",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/user/depotAcquisition/grainDeliveryRegistration",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "送粮登记",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/user/depotAcquisition/grainDeliveryRecord",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "送粮记录",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/user/depotAcquisition/grainDeliveryRecord",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ],
+	],
 	"subpackages": [{
 			"root": "pageA",
 			"pages": [{
@@ -1236,7 +1169,7 @@
 						"navigationBarTitleText": "货运收发",
 						"enablePullDownRefresh": true
 					}
-				
+
 				},
 				{
 					"path": "freightTransport/addsendgoods",
@@ -1910,7 +1843,7 @@
 						"navigationBarTitleText": "卖粮",
 						"enablePullDownRefresh": false
 					}
-				
+
 				},
 				{
 					"path": "myRelease/buyGrain",

pages/erpbusiness/acquisitionInformation.vue

@@ -200,12 +200,13 @@
 				} else {
 					_flag = 0
 				}
-
+				debugger
 				let _obj = {
 					warehouseName: this.warehouseName,
 					acquisitionInformation: this.textareaValue,
 					checkFlag: _flag,
 					followFlag: "0",
+					commonId:uni.getStorageSync("userInfo").id
 
 				}
 				if (this.isEdit) {

pages/erpbusiness/index.vue

@@ -11,6 +11,9 @@
 					<text>{{item.name}}</text>
 				</view>
 			</view>
+			<!-- 检斤员权限 -->
+			<!-- isShowAcquisitionInfo -->
+			<!-- 获取当前用户负责的仓库，如果无仓库隐藏收购信息 -->
 			<view class="content2">
 				<view>收购信息</view>
 				<view @click="navTo('/pages/erpbusiness/acquisitionInformation?status='+status+'&id='+sgId)">{{status}}></view>
@@ -188,6 +191,8 @@
 			uni.hideKeyboard()
 			uni.showTabBar()
 			this.loadData()
+			debugger
+			this.isShowAcquisitionInfo=this.utils.getRoles('acquisitionInfor.view')
 			this.getStatus()
 			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
 				console.log("checkSession", res)
@@ -262,8 +267,12 @@
 				}
 				this.$api.doRequest('get', '/acquisitionInfo/getInfo',_obj ).then(res => {
 					if (res.data.code == 200) {
-						this.status = res.data.data.status
-						this.sgId = res.data.data.commonId
+						if(res.data.data){
+							this.status = res.data.data.status
+							this.sgId = res.data.data.commonId
+						}else{
+							this.status = '已隐藏'
+						}
 					}
 				})
 			},

pages/user/depotAcquisition/depotAcquisition.vue

@@ -1,40 +1,45 @@
 <template>
-	<view class="wrap">
+	<view class="">
 		<view class="header">
-			<view class='locationwrap' @click='naviageToPage("/pages/grain_pulse/position/position")'>
-				<image class='location' src="../../../static/img/liangmai/icon_ditu@2x.png" mode=""></image>
-				{{position.name}}
+			<view class='locationwrap' @click='naviageToPage("/pages/user/depotAcquisition/selectCity")'>
+				{{currentCityName}}
+				<u-icon name="arrow-down" size="28" class="icon-jt"></u-icon>
 			</view>
-			<view
-				@click='naviageToPage("/pages/user/depotAcquisition/grainDeliveryRecord")'
+			<u-search class="search" bg-color="#F5F6F9" placeholder="请输入仓库名" v-model="searchKeyWord"
+				:show-action="false" @change="searchChange"></u-search>
+			<!-- <view @click='naviageToPage("/pages/user/depotAcquisition/grainDeliveryRecord")'
 				class='Regular flex align-item-center distribution justify-center'>
 				<image class='cangku' src="../../../static/img/liangmai/cangku.png" mode=""></image>
-			</view>
+			</view> -->
 		</view>
-		<u-search class="search" placeholder="日照香炉生紫烟" v-model="keyword" :show-action="false" @change="searchChange"></u-search>
-		<view class="content1">
+
+		<view class="content1" v-for="(item,index) in dataList" :key="index">
 			<view class="row row1">
-				<view>鲅鱼圈1号库</view>
-				<view class='follow'>已关注</view>
+				<view class="title">{{item.warehouseName}}</view>
+				<view class='follow' @click="followClick(item)">{{item.followFlag=='0'?'+关注':'已关注'}}</view>
 			</view>
 			<view class="row2">
-				<view class='locationwrap' @click='naviageToPage("/pages/grain_pulse/position/position")'>
-					<image class='location' src="../../../static/img/liangmai/icon_ditu@2x.png" mode=""></image>
-					{{position.name}}
-				</view>
+				<view class="time">{{item.createDate}}</view>
 			</view>
 			<view class="row3">
-				<view class="row3-item" v-for="(item,index) in listData" :key='index'>
-					<u-read-more color='#22C572' show-height="140" :index="index" :shadow-style="shadowStyle" :toggle="true" close-text="展开阅读更多内容" @open='open' @close='close'>
-						<rich-text :nodes="item.content" class="rich-item"></rich-text>
+				<view class="row3-item">
+					<u-read-more color='#22C572' show-height="140" :index="index" :shadow-style="shadowStyle"
+						:toggle="true" close-text="展开阅读更多内容" @open='open' @close='close'>
+						<rich-text :nodes="item.acquisitionInformation" class="rich-item"></rich-text>
 						<!-- @load="parseLoaded" -->
 						<!-- <u-parse :html="item.content" ></u-parse> -->
 					</u-read-more>
 				</view>
 			</view>
 			<view class="row4">
-				<u-button @click='naviageToPage("/pages/user/depotAcquisition/grainDeliveryRegistration")'>我要送粮</u-button>
-				<view>2021-11-23</view>
+				<view class='' @click='naviageToPage("/pages/grain_pulse/position/position")'>
+					<!-- <image class='location' src="../../../static/img/liangmai/icon_ditu@2x.png" mode=""></image> -->
+					{{item.warehousePrivate}}{{item.warehouseCity}}{{item.warehouseArea}}{{item.detailedAddress}}
+				</view>
+				<u-button
+					@click='naviageToPage("/pages/user/depotAcquisition/grainDeliveryRegistration?itemValue="+JSON.stringify(item))'>
+					我要送粮
+				</u-button>
 			</view>
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
@@ -55,25 +60,18 @@
 			return {
 				isShowAlert: false,
 				content: '当前登入信息验证失败，是否重新登录？',
-				position: {
-					name: '全国'
+				currentCityName: '',
+				searchKeyWord: '',
+				shadowStyle: {
+					backgroundImage: "none",
+					paddingTop: "0",
+					marginTop: "20rpx",
 				},
-					keyword: '遥看瀑布挂前川',
-					shadowStyle: {
-						backgroundImage: "none",
-						paddingTop: "0",
-						marginTop: "20rpx",
-					},
-					listData:[
-						{
-							content:'1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111我按水分地方地方萨芬撒初学者从行政村自行车在X初学者从行政村'
-						},{
-							content:'222222'
-						},
-						{
-							content:'33333'
-						}
-					]
+				dataList: [],
+				currentPage: 1,
+				pageSize: 10,
+				loadStatus: 'loading',
+				isLoadMore: false,
 			}
 		},
 
@@ -81,57 +79,90 @@
 
 		},
 		// #ifndef MP
-		onNavigationBarButtonTap(e) {
+		onNavigationBarButtonTap(e) {debugger
 			const index = e.index;
-			if (index === 0) {
-				this.navTo('/pages/set/set');
-			} else if (index === 1) {
-				// #ifdef APP-PLUS
-				const pages = getCurrentPages();
-				const page = pages[pages.length - 1];
-				const currentWebview = page.$getAppWebview();
-				currentWebview.hideTitleNViewButtonRedDot({
-					index
-				});
-				// #endif
-				uni.navigateTo({
-					url: '/pages/notice/notice'
-				})
+			if(index==1){
+				uni.navigateBack()
+			}else{
+				
+				this.naviageToPage("/pages/user/depotAcquisition/grainDeliveryRecord")
 			}
 		},
 		// #endif
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),
 		},
+		onReachBottom() { //上拉触底函数
+			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+				this.isLoadMore = true
+				this.currentPage += 1
+				this.getListData()
+			}
+		},
+		onPullDownRefresh() {
+			this.currentPage = 1
+			this.isLoadMore = false
+			this.loadStatus = 'loading'
+			this.dataList = []
+			this.getListData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
 		onShow() {
+			let _city = uni.getStorageSync("depotAcquisition_selectCity")
+			this.currentCityName = _city ? _city.positionName.cityName : ''
 			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
 				console.log("checkSession", res)
 				if (res.data.data == "INVALID") {
 					this.isShowAlert = true;
-					// uni.showModal({
-					// 	title: '登录提示',
-					// 	content: '当前登入信息验证失败，是否重新登录？',
-					// 	showCancel: true,
-					// 	confirmText: '登录',
-					// 	success: (e) => {
-					// 		if (e.confirm) {
-					// 			uni.navigateTo({
-					// 				url: '/pages/public/login'
-					// 			})
-					// 		}
-					// 	},
-					// 	fail: () => {},
-					// 	complete: () => {}
-					// })
 				}
+				this.currentPage = 1
+				this.isLoadMore = false
+				this.loadStatus = 'more'
+				this.getListData()
 			})
 			console.log("hasLogin", this.hasLogin)
 		},
 		methods: {
-			open(e){
+			getListData() {
+				if (this.currentCityName == '全国') this.currentCityName = ''
+				this.$api.doRequest('get', '/acquisitionInfo/selectAcquisitionPage', {
+					searchKeyWord: this.searchKeyWord,
+					city: this.currentCityName,
+					compId: uni.getStorageSync('pcUserInfo').compId,
+					pageSize: this.pageSize,
+					currentPage: this.currentPage
+				}).then(res => {
+					if (res.data.code == "200") {
+						if (this.currentCityName == '') this.currentCityName = '全国'
+						this.dataList = res.data.data.records
+						this.isLoadMore = true
+						this.loadStatus = 'nomore'
+					}
+				})
+			},
+			followClick(val) {
+				this.$api.doRequest('post', '/acquisitionInfo/api/editFollowFlag', {
+					id: val.id
+				}).then(res => {
+					if (res.data.code == "200") {
+						if (res.data.data == '1') {
+							val.followFlag = '1'
+							this.$api.msg('关注成功')
+						} else {
+							val.followFlag = '0'
+							this.$api.msg('取消关注成功')
+						}
+						this.$forceUpdate()
+					}
+				})
+
+			},
+			open(e) {
 				console.log(e)
 			},
-			close(e){
+			close(e) {
 				console.log(e)
 			},
 			/**
@@ -154,7 +185,7 @@
 			cancelClick() {
 				this.isShowAlert = false
 			},
-			searchChange(e){
+			searchChange(e) {
 				console.log(e)
 			}
 		}
@@ -170,15 +201,22 @@
 		margin: 10px;
 		border-radius: 10px;
 		padding: 10px;
+		/* position: relative; */
+		top: 20rpx;
 	}
 
 	.header {
-		padding: 0 25rpx;
+		padding: 25rpx;
 		background: #fff;
 		border-radius: 0 0 10px 10px;
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
+		position: relative;
+		
+		/deep/.u-content {
+			padding-left: 180rpx;
+		}
 	}
 
 	.location {
@@ -191,6 +229,12 @@
 		font-size: 16px;
 		display: flex;
 		align-items: center;
+		position: absolute;
+		top: 0;
+		bottom: 0;
+		margin: auto;
+		/* height: 100%; */
+		left: 60rpx
 	}
 
 	.cangku {
@@ -198,17 +242,51 @@
 		height: 16.5px;
 		margin-right: 5px;
 	}
-	.search{
-		margin-top: 20rpx!important;
-	}
-	.rich-item{
-		line-height: 44rpx;
+
+	.search {}
+
+
+
+	.rich-item {
+		line-height: 46rpx;
 	}
-	.row1{
+
+	.row1 {
 		display: flex;
 		justify-content: space-between;
 	}
-	.row4{
+
+	.row4 {
 		display: flex;
 	}
+	.icon-jt{
+		margin-left: 20rpx;
+	}
+	.content1{
+		background: white;
+		margin: 20rpx;
+		padding: 30rpx;
+		border-radius: 20rpx;
+		.row1{
+			.title{
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #333333;
+			}
+			.follow{
+				border: 1px solid #EEEEEE;
+				font-weight: 400;
+				color: #878C9C;
+				padding: 9rpx 28rpx;
+				border-radius: 40rpx;
+			}
+		}
+		.row2{
+			.time{
+color: #878C9C;
+				margin: 20rpx 0;
+			}
+			
+		}
+	}
 </style>

pages/user/depotAcquisition/grainDeliveryRecord.vue

@@ -4,12 +4,12 @@
 		<view class="content content1" v-for="(item,index) in dataList" :key="index">
 			<view class="top">
 				<view>{{item.warehouseName}}</view>
-				<view>25日0时前有效</view>
+				<view>{{item.validityDate}}前有效</view>
 			</view>
-			<view>{{item.name}}</view>
+			<view>{{item.shipperName}}({{item.carList.length}}车)</view>
 			<view class="car-list">
 				<view v-for="(item1,index) in item.carList">
-					{{item1.carNumber}}
+					{{item1}}
 				</view>
 			</view>
 			<u-button @click='del(item)'>删除</u-button>
@@ -39,22 +39,7 @@
 				isShowAlert1:false,
 				content: '当前登入信息验证失败，是否重新登录？',
 					content1: '确定删除送粮记录？',
-				dataList:[
-					{
-						warehouseName:"鲅鱼圈1号库",
-						id:1,
-						name:'张三',
-						carList:[{carNumber:'123123'},{carNumber:'123123'},{carNumber:'123123'}
-						]
-					},
-					{
-						warehouseName:"鲅鱼圈2号库",
-						id:2,
-						name:'张三1',
-						carList:[{carNumber:'123123'},{carNumber:'123123'},{carNumber:'123123'}
-						]
-					}
-				]
+				dataList:[]
 			}
 		},
 
@@ -92,13 +77,27 @@
 				}
 				let _obj = {
 					commonId:uni.getStorageSync("userInfo").id,
-					pageSize:1,
-					currentPage:10
+					pageSize:10,
+					currentPage:1
 					
 				}
 			this.$api.doRequest('get', '/grainDeliveryRegistration/selectGrainDeliveryRegistration',_obj ).then(res => {
 				if (res.data.code == 200) {
-			
+					this.dataList = []
+					debugger
+					for(let i = 0;i<res.data.data.records.length;i++){
+						let _data = res.data.data.records[i];
+						let _carNumberList = _data.carNo.split(',')
+						let __obj = {
+								warehouseName:_data.warehouseName,
+								id:_data.id,
+								shipperName:_data.shipperName,
+								carList:_carNumberList,
+								validityDate:_data.validityDate
+							
+						}
+						this.dataList.push(__obj)
+					}
 				}
 			})
 				
@@ -124,7 +123,7 @@
 				})
 			},
 			alertBtn() {debugger
-				this.$api.doRequest('post', '//grainDeliveryRegistration/api/deleteInfo',{
+				this.$api.doRequest('post', '/grainDeliveryRegistration/api/deleteInfo',{
 					id:this.id
 				}).then(res => {
 					if (res.data.code == 200) {

pages/user/depotAcquisition/grainDeliveryRegistration.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="wrap">
+	<view class="">
 		<view class="content1">
 			<view>{{dataList.warehouseName}}</view>
 			<view class="row2">
@@ -17,14 +17,14 @@
 			<view class="wrap wrap1" v-for="(item,index) in dataList.shippingInformationList" :key='index'>
 				<view class="row1">
 					<view class="left">
-						<view>货主{{index+1}}-{{item.shipperName}}</view>
+						<view>货主{{index+1}}-{{item.customerName}}</view>
 						<view @click="reduceBtn(index)">--</view>
 					</view>
-					<view class="right" @click='show=true'>
-						<view>{{shipperName}}</view>
+					<view class="right" @click='showCustomerName(item)'>
+						<view>{{item.customerName}}</view>
 						<u-icon name="arrow-right" color=""></u-icon>
-						<u-picker @confirm="nameConfirm" range-key='name' mode="selector" v-model="show"
-							:range="nameList"></u-picker>
+						<u-picker @confirm="nameConfirm" range-key='customerName' mode="selector"
+							v-model="item.showCustomerName" :range="nameList"></u-picker>
 					</view>
 				</view>
 				<view class="row2">
@@ -73,30 +73,24 @@
 				isShowAlert1: false,
 				content: '当前登入信息验证失败，是否重新登录？',
 				content1: '确定提交送粮信息？',
-				show: false,
+				// show: false,
 				show1: false,
 				cargoOwner: [{
 					name: '123'
 				}],
-				shipperName: "王五",
-				nameList: [{
-						name: '1'
-					},
-					{
-						name: '2'
-					}
-				],
-				warehouseNameAddress: '辽宁省营口市龙港花园',
-				startDate: "2021-11-20",
+				nameList: [],
+				warehouseNameAddress: '',
+				startDate: "",
 				dataList: {
-					warehouseName: "鲅鱼圈1号库",
-					validityDate: '2021-11-23',
+					warehouseName: "",
+					validityDate: '',
+					commonId: uni.getStorageSync("userInfo").id,
 					shippingInformationList: [{
-						shipperName: '张三',
-						supplier: '供应商姓名',
-						carNo: '123456,123456,1234456',
+						shipperName: '',
+						supplier: '',
+						carNo: '',
 						carNumberList: [{
-							carNo: '123'
+							carNo: ''
 						}]
 					}]
 
@@ -104,8 +98,14 @@
 			}
 		},
 
-		onLoad() {
-
+		onLoad(options) {
+			debugger
+			// let _pageToData = JSON.parse(options.itemValue)
+			// this.dataList.warehouseName = _pageToData.warehouseName
+			// this.startDate = this.getTime()[0]
+			// this.dataList.validityDate = this.getTime()[1]
+			// this.warehouseNameAddress = _pageToData.warehousePrivate + _pageToData.warehouseCity + _pageToData
+			// 	.warehouseArea + _pageToData.detailedAddress
 		},
 		// #ifndef MP
 		onNavigationBarButtonTap(e) {
@@ -136,12 +136,41 @@
 				if (res.data.data == "INVALID") {
 					this.isShowAlert = true;
 				}
+				this.getCustomer()
 			})
 			console.log("hasLogin", this.hasLogin)
 		},
 		methods: {
+			showCustomerName(value) {debugger
+			for(let i = 0;i<this.dataList.shippingInformationList.length;i++){
+				this.dataList.shippingInformationList[i].showCustomerName = false
+			}
+				value.showCustomerName = true
+			},
+			getCustomer() {
+				let _data = {
+					commonId: uni.getStorageSync("userInfo").id,
+				}
+				this.$api.doRequest('get', '/identityAuthenticationInfo/identityAuthenticationInfoUser', _data).then(
+					res => {
+						if (res.data.code == 200) {
+							// debugger
+							this.nameList = res.data.data
+							// for (let i = 0; i < this.nameList.length; i++) {
+							// 	this.nameList[i].showCustomerName = false
+							// }
+							this.customerName = res.data.data[0].customerName
+						}
+					})
+			},
+			getTime() {
+				let _startTime = new Date().format("yyyy-MM-dd");
+				var _endTime = new Date();
+				_endTime.setDate(_endTime.getDate() + 2);
+				_endTime = _endTime.format("yyyy-MM-dd");
+				return [_startTime, _endTime]
+			},
 			reduceBtn(index) {
-				debugger
 				if (this.dataList.shippingInformationList.length > 1) {
 					this.dataList.shippingInformationList.splice(index, 1)
 					this.$forceUpdate()
@@ -164,7 +193,10 @@
 				})
 			},
 			alertBtn() {
-				this.$api.doRequest('post', '/grainDeliveryRegistration/api/insertInfo', this.submitData).then(res => {
+				for (let i = 0; i < this.dataList.shippingInformationList.length; i++) {
+					delete this.dataList.shippingInformationList[i].carNumberList
+				}
+				this.$api.doRequest('post', '/grainDeliveryRegistration/api/insertInfo', this.dataList).then(res => {
 					if (res.data.code == 200) {
 
 					}
@@ -176,21 +208,20 @@
 			},
 			addGoodPeople() {
 				this.dataList.shippingInformationList.push({
-					shipperName: '张三1',
-					supplier: '供应商姓名1',
-					carNo: '123456,123456,1234456',
+					shipperName: '',
+					supplier: '',
+					carNo: '',
 					carNumberList: [{
-						carNo: '222'
+						carNo: ''
 					}]
 				})
 			},
 			addCarNumber(val) {
 				val.push({
-					carNo: '456'
+					carNo: ''
 				})
 			},
 			delCarNumber(val, index) {
-				debugger
 				if (val.length > 1) {
 					val.splice(index, 1)
 					this.$forceUpdate()

pages/user/depotAcquisition/selectCity.vue

@@ -0,0 +1,56 @@
+<template>
+	<view class="">
+		<citySelect @back_city="back_city"></citySelect>
+	</view>
+</template>
+
+<script>
+	import citySelect from '@/components/linzq-citySelect/linzq-citySelect.vue';
+	export default {
+		components: {
+			citySelect
+		},
+		data() {
+			return {
+				statusBarHeight:''
+			}
+		},
+		onLoad() {
+			let that = this
+			uni.getSystemInfo({
+				success: function(res) {
+					console.log("statusBarHeight", res.statusBarHeight)
+					that.statusBarHeight += res.statusBarHeight + "px"; //这就是状态栏的高度
+				},
+			});
+		},
+		methods: {
+			back_city(e) {
+				if (e.positionName !== 'no') {
+					this.region = e.positionName.cityName 
+				} 
+				if(!e.positionName.cityName){
+					var tmp = e.positionName
+					e.positionName = {}
+					e.positionName.cityName = tmp
+				}
+				console.log("city:",e)
+				uni.setStorage({
+					key: 'depotAcquisition_selectCity',
+					data: e,
+					success() {
+						uni.navigateBack()
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+	.container {
+		padding: 20px;
+		font-size: 14px;
+		line-height: 24px;
+	}
+</style>

util/util.js

@@ -325,6 +325,15 @@ const utils = {
 		}
 		return s
 	},
+	getRoles: function(role) {
+		let _roles = uni.getStorageSync('rolesList')
+		for (let i = 0; i < _roles.length; i++) {
+			if (_roles[i] == role) {
+				return true
+			}
+		}
+		return false
+	},
 	isMobile: function(mobile) {
 		if (!mobile) {
 			utils.toast('请输入手机号码');
@@ -599,5 +608,6 @@ module.exports = {
 	nullToString: utils.nullToString,
 	getLocation: utils.getLocation,
 	openSetting: utils.openSetting,
+	getRoles:utils.getRoles
 
 }