前端

components/flow.vue

@@ -321,6 +321,7 @@
 		padding: 20rpx;
 		text-align: center;
 		color: #22C572;
+		margin-bottom:30rpx;
 	}
 
 	.form_top {

config/index.js

@@ -4,7 +4,7 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.110.9:8099/',
 	// baseUrlNew: 'http://192.168.110.9:9888/',
-	baseUrlNew: 'http://192.168.110.138:8090/',
+	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.67:9888/',
 	// baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8090/',
@@ -16,7 +16,7 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
 	// 上传图片的
-	// baseUrlNew: 'https://api2.eliangeyun.com/',
+	baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pages/erp/deliveryfeedback/details.vue

@@ -399,10 +399,8 @@
 		      var maxStorage = 0
 			  if(this.detailData.tranCarInfoList){
 				for (var i = 0; i < this.detailData.tranCarInfoList.length; i++) {
-					maxStorage += Number(
-					  this.detailData.tranCarInfoList[i].loadNetWeight
-					)
-				  } 
+					maxStorage += Number(this.detailData.tranCarInfoList[i].loadNetWeight)
+				}
 			  }
 		      return maxStorage.toFixed(2)
 		    },

pages/erpbusiness/add_quality_testing.vue

@@ -1364,7 +1364,8 @@
 								}
 							}
 						} else {
-							if (this.inType == "收购入库") {
+							if (this.inType == "收购入库") { 
+								//收购入库不校验仓库设置中的货名
 								uni.showModal({
 									title: '提示',
 									content: '仓库设置中无该合同货名',

pages/task/audit/warehouse_details.vue

@@ -102,7 +102,7 @@
 				</view>
 			</view>
 		</view> -->
-		<flow :auditList="auditList" @status='getStatus'></flow>
+		<flow ref='flow1' :auditList="auditList" @status='getStatus'></flow>
 		<u-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
 			<u-button @click='fanHui' type="success" class="btn2">返回</u-button>

pages/task/audit/warehouse_warrant.vue

@@ -70,7 +70,7 @@
 				<view class="right">{{auditInfo.count}}</view>
 			</view> -->
 		</view>
-		<view class="content1" v-if="auditInfo.warehousingOrderList[0].remark">
+		<view class="content1" v-if="auditInfo.warehousingOrderList&&auditInfo.warehousingOrderList[0].remark">
 			<view class="title ">
 				备注信息
 			</view>