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

pages.json

@@ -712,7 +712,18 @@
 				// "navigationStyle": "custom"
 			}
 
-		}, {
+		},
+		// {
+		// 	"path": "pages/business/businessNew",
+		// 	"style": {
+		// 		"navigationStyle": "custom",
+		// 		"navigationBarTitleText": "交易",
+		// 		"enablePullDownRefresh": true
+		// 	}
+
+		// },
+
+		{
 			"path": "pages/release/release",
 			"style": {
 				"navigationBarTitleText": "我的发布",
@@ -1171,21 +1182,21 @@
 				"enablePullDownRefresh": false
 			}
 
-		}, 
+		},
 		{
 			"path": "pages/task/audit/freight_settlement_approvalcopy",
 			"style": {
 				"navigationBarTitleText": "运费结算审核",
 				"enablePullDownRefresh": false
 			}
-		
+
 		}, {
 			"path": "pages/task/audit/freight_settlement_detailscopy",
 			"style": {
 				"navigationBarTitleText": "运费结算详情",
 				"enablePullDownRefresh": false
 			}
-		
+
 		}, {
 			"path": "pages/task/audit/acquisition_settlement_approval",
 			"style": {
@@ -1300,7 +1311,7 @@
 				"enablePullDownRefresh": false
 			}
 
-		},{
+		}, {
 			"path": "pages/erpbusiness/customerAudit",
 			"style": {
 				"navigationBarTitleText": "客户审核",
@@ -1314,7 +1325,7 @@
 				"enablePullDownRefresh": false
 			}
 
-		},{
+		}, {
 			"path": "pages/user/depotAcquisition/depotAcquisition",
 			"style": {
 				"navigationBarTitleText": "库点收购",
@@ -1557,95 +1568,77 @@
 				"enablePullDownRefresh": false
 			}
 
-		}
-	    ,{
-            "path" : "pages/universalityAudit/list",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "我的申请",
-                "enablePullDownRefresh": false,
+		}, {
+			"path": "pages/universalityAudit/list",
+			"style": {
+				"navigationBarTitleText": "我的申请",
+				"enablePullDownRefresh": false,
 				"app-plus": {
-				    "titleNView": {
-						"buttons": [
-						{
-						"color": "#000",
-						"fontSize": "28rpx",
-						"text": "发起"
-						}
-						]
-				    }
+					"titleNView": {
+						"buttons": [{
+							"color": "#000",
+							"fontSize": "28rpx",
+							"text": "发起"
+						}]
+					}
 				}
-            }
-            
-        }
-        ,{
-            "path" : "pages/universalityAudit/look",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "申请详情",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/universalityAudit/addaduit",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "发起申请",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/dataReport/costbreakdown",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "费用明细",
-                "enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/universalityAudit/look",
+			"style": {
+				"navigationBarTitleText": "申请详情",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/universalityAudit/addaduit",
+			"style": {
+				"navigationBarTitleText": "发起申请",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/dataReport/costbreakdown",
+			"style": {
+				"navigationBarTitleText": "费用明细",
+				"enablePullDownRefresh": false
 				// "onReachBottomDistance": 50
-            }
-            
-        }
-        ,{
-            "path" : "pages/dataReport/contractdetails/contractdetails",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "合同",
-                "enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/dataReport/contractdetails/contractdetails",
+			"style": {
+				"navigationBarTitleText": "合同",
+				"enablePullDownRefresh": false
 				// "onReachBottomDistance": 50
-            }
-            
-        }
-        ,{
-            "path" : "pages/dataReport/breakdownofprofit",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "合同利润",
-                "enablePullDownRefresh": false,
+			}
+
+		}, {
+			"path": "pages/dataReport/breakdownofprofit",
+			"style": {
+				"navigationBarTitleText": "合同利润",
+				"enablePullDownRefresh": false,
 				"onReachBottomDistance": 50
-            }
-            
-        }
-        ,{
-            "path" : "pages/dataReport/Inventoryentrydetails",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "入库明细",
-                "enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/dataReport/Inventoryentrydetails",
+			"style": {
+				"navigationBarTitleText": "入库明细",
+				"enablePullDownRefresh": false
 				// "onReachBottomDistance": 50
-            }
-            
-        }
-        ,{
-            "path" : "pages/task/audit/universalityAudit",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "通用审核",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ],
+			}
+
+		}, {
+			"path": "pages/task/audit/universalityAudit",
+			"style": {
+				"navigationBarTitleText": "通用审核",
+				"enablePullDownRefresh": false
+			}
+
+		}
+	],
 	"subpackages": [{
 			"root": "pageA",
 			"pages": [{

pages/erp/exWarehousing/exWarehousing.vue

@@ -503,37 +503,35 @@
 							this.detailData.inOutTypeKey = 6
 						}
 					}
-					//查询所有的合同  进行获取车牌号
-					this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
-						flag: 5,
-						compId: helper.erpWarehouse.compId,
+					this.$api.doRequest('get', '/contractManagementInfo/getOutContract', {
+						contractNo:this.detailData.contractNo,compId:uni.getStorageSync('pcUserInfo').compId
 					}).then(res => {
+
 						if (res.data.code == 200) {
 							this.contractList = res.data.data
-							for (let i = 0; i < res.data.data.length; i++) {
 								// "MYCGYMHLJ2021102401"
-								if (res.data.data[i].contractNo == this.detailData.contractNo) {
 									if (this.detailData.inOutType == '销售出库') {
-										this.detailData.tips = '买方' + res.data.data[i].buyer
+										this.detailData.tips = '买方' + res.data.data.buyer
 									} else if (this.detailData.inOutType == '移库出库') {
 										this.detailData.tips = '入货库' + this.inOutNoList[0].receiveWarehouse
 									}
-									this.contractType = res.data.data[i].contractType //获取合同类型   用于判断输入车牌号
+									if(this.detailData.inOutType != '移库出库'){
+										this.contractType = res.data.data.contractType //获取合同类型   用于判断输入车牌号
+									}
+									
 									//如果查到该合同
 									// res.data.data[i].deliverType  = !res.data.data[i].deliverType?'1':res.data.data[i].deliverType  
-									if (res.data.data[i].deliverType == '1') { //判断自运1，他运2合同
+									if (res.data.data.deliverType == '1') { //判断自运1，他运2合同
 										that.showCar = true
 									} else {
 										that.showCar = false
 									}
-									if (res.data.data[i].tranCarInfoList) {
-										for(var num = 0 ; num < res.data.data[i].tranCarInfoList.length; num++){
-										   res.data.data[i].tranCarInfoList[num].carNo1 = res.data.data[i].tranCarInfoList[num].carNo + '（'+res.data.data[i].tranCarInfoList[num].tranCarNo+'）'
+									if (res.data.data.tranCarInfoList) {
+										for(var num = 0 ; num < res.data.data.tranCarInfoList.length; num++){
+										   res.data.data.tranCarInfoList[num].carNo1 = res.data.data.tranCarInfoList[num].carNo + '（'+res.data.data[i].tranCarInfoList[num].tranCarNo+'）'
 										}
-										this.carList = res.data.data[i].tranCarInfoList //车牌号下拉列表
+										this.carList = res.data.data.tranCarInfoList //车牌号下拉列表
 									}
-								}
-							}
 							uni.hideLoading()
 						}
 					})
@@ -552,6 +550,7 @@
 				// })
 			},
 			inOutChange(e) {
+				console.log(e)
 				this.detailData.inOutTaskNo = this.inOutNoList[e[0]].inOutTaskNo
 				this.detailData.inOutType  = this.inOutNoList[e[0]].inOutType
 				// this.contractType = this.inOutNoList[e[0]].contractType //获取合同类型   用于判断输入车牌号
@@ -561,21 +560,23 @@
 				} else {
 					this.detailData.contractNo = this.inOutNoList[e[0]].moveTaskNo
 				}
-				for(let i = 0 ; i<this.contractList.length ; i++){
-					if (this.contractList[i].contractNo == this.detailData.contractNo) {
-						this.contractType = this.contractList[i].contractType //获取合同类型   用于判断输入车牌号
+				this.$api.doRequest('get', '/contractManagementInfo/getOutContract', {
+					contractNo:this.detailData.contractNo,compId:uni.getStorageSync('pcUserInfo').compId
+				}).then(res => {
+					this.contractList=res.data.data
+					if(this.detailData.inOutType != '移库出库'){
+						this.contractType = this.contractList.contractType //获取合同类型   用于判断输入车牌号
 					}
-					
-					if (this.contractList[i].deliverType == '1') { //判断自运1，他运2合同
+					if (this.contractList.deliverType == '1') { //判断自运1，他运2合同
 						this.showCar = true
 					} else {
 						this.showCar = false
 					}
-				}
+				})
 				this.detailData.goodsName = this.inOutNoList[e[0]].goodsName
 				this.detailData.goodsNameKey = this.inOutNoList[e[0]].goodsNameKey
 				this.detailData.grade = this.inOutNoList[e[0]].grade
-				this.detailData.inOutType = this.inOutNoList[e[0]].inOutType
+				// this.detailData.inOutType = this.inOutNoList[e[0]].inOutType
 				this.weightbills.goodsName = this.inOutNoList[e[0]].goodsName
 				if (this.detailData.inOutType == '销售出库') {
 					this.weightbills.buyer = this.inOutNoList[e[0]].buyer

pages/user/newReport.vue

@@ -322,7 +322,7 @@
 			<uni-transition ref="ani" custom-class="transition" :mode-class="modeClass" :styles="styles"
 				:show="isSHowContent6">
 				<u-line color="#EEEEEE" />
-				<view class="row1 flex jcsb">
+				<view class="row1 flex jcsb" style="padding:0 12rpx 0 5rpx;">
 					<view class="left">
 						app注册
 					</view>
@@ -336,7 +336,7 @@
 					<qiun-data-charts type="area" :opts="opts8" :chartData="chartData8" />
 				</view>
 
-				<view class="row1 flex jcsb">
+				<view class="row1 flex jcsb" style="margin-top: 90rpx;padding:0 12rpx 0 5rpx;">
 					<view class="left">
 						粮脉入驻
 					</view>
@@ -856,7 +856,7 @@
 					case 1:
 						return '#FFBB6E'
 					case 2:
-						return '##8D9EE9'
+						return '#8D9EE9'
 					case 3:
 						return '#FF8B95'
 					case 4:
@@ -1727,7 +1727,7 @@
 
 	.content-item {
 		background: white;
-		margin: 20rpx 20rpx 0 20rpx;
+		margin: 20rpx 25rpx 0 25rpx;
 		border-radius: 20rpx;
 		padding: 20rpx;
 		box-sizing: border-box;
@@ -1933,7 +1933,7 @@
 			}
 
 			.left {
-				width: 70%;
+				width: 80%;
 			}
 
 			.weight {
@@ -2007,7 +2007,8 @@
 		}
 
 		.left {
-			font-weight: 700;
+			// font-weight: 700;
+			// margin
 		}
 
 	}