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

config/index.js

@@ -1,16 +1,16 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
 	// baseUrl: 'http://localhost:8080/',
-	baseUrlNew: 'http://192.168.110.67:9100/',
+	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.1.118:8090/',
 	// baseUrlNew: 'http://192.168.110.9:9100/',
-	baseUrlNew: 'http://192.168.110.138:8090/',
+	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8099/',
 	 // baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// 上传图片的
-	// baseUrlNew: 'https://api2.eliangeyun.com/',
+	baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

manifest.json

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

pages/erpbusiness/quality_testing.vue

@@ -19,11 +19,23 @@
 					name="close-circle-fill" color="#D6D9E0"></u-icon>
 				<!-- <text @click='emptysearch' v-if='searchKeyWord.length>0' class='tip_text cuIcon-roundclosefill'></text> -->
 			</view>
+			<view style='align-items: center;justify-content: space-between;' class='flex'>
 			<view class='changewarehouse'>
-				<view @click='show=true'>{{warehouseName?warehouseName:'选择仓库'}}<text class='cuIcon-unfold'></text></view>
+				<view  @click='show=true'>{{warehouseName?warehouseName:'选择仓库'}}<text class='cuIcon-unfold'></text></view>
 				<u-picker @confirm="warehousechange" range-key='warehouseName' mode="selector" v-model="show"
 					:range="selector"></u-picker>
 			</view>
+			
+			<u-picker @confirm='compconfirm' mode="selector" v-model="show1" :range="companyList"
+				range-key="compName"></u-picker>
+			</view >
+			<view style='justify-content: space-between;' class='flex'>
+				<view ></view>
+				<view class="company">
+					<image class='icon' style='width:19px;height:19px;' src="../../static/img/icon_qiye@3x.png"
+							mode=""></image> {{compName}}
+				</view>	
+			</view>
 		</view>
 		<view class="content">
 			<view style='background:#fff;' class="flex">
@@ -139,6 +151,7 @@
 		},
 		data() {
 			return {
+				compName:'',
 				inputShow: false,
 				modalName: '',
 				mycarStyle: '',
@@ -158,6 +171,7 @@
 				userInfoTmp: [],
 				inputStatus: 'none',
 				carInfo: [],
+				show1:false,
 				gridCol: 4,
 				show: false,
 				pageSize: 10,
@@ -177,6 +191,7 @@
 				commonWarehouseNo: '',
 				cangid: '',
 				warehouse: {},
+				companyList:[]
 
 			}
 		},
@@ -233,6 +248,7 @@
 			this.managementType = options.managementType
 		},
 		onShow() {
+			this.companyList=uni.getStorageSync('companyList')
 			uni.setStorageSync('isClick', false)
 			uni.showLoading({
 				title: "正在加载"
@@ -277,6 +293,8 @@
 					this.getList(true)
 				}
 			})
+			that.compName = uni.getStorageSync('compName1')
+			
 		},
 		methods: {
 			print(item){
@@ -1143,4 +1161,22 @@
 	.center {
 		padding-bottom: 150rpx;
 	}
+	.company {
+	/* 	position: fixed; */
+		right: 0;
+		/* top: 17.5%; */
+		background: url('../../static/img/qiyebeijing.png') no-repeat;
+		background-size: 100% 100%;
+		width: 60%;
+		font-size: 11px;
+		padding-bottom: 5px;
+		padding-right: 10px;
+		text-align:right;
+		border-radius: 40rpx 0 0 40rpx;
+	}
+	
+	.company .icon {
+		position: relative;
+		top: 4px;
+	}
 </style>

pages/task/audit/acquisitioncontract.vue

@@ -583,6 +583,9 @@
 							
 									}
 									console.log(response.data.data)
+									if(response.data.data.length == 0 ){
+										this.auditCheck = "success"
+									}
 									for(let i = 0 ;i<response.data.data.length;i++){
 										if(response.data.data[i].status == "error"){
 											this.auditCheck = "error"

pages/task/audit/warehouse_approval.vue

@@ -26,7 +26,7 @@
 				<view class="left">货名</view>
 				<view class="right">{{list.goodsName}}</view>
 			</view>
-			<view class='row' v-if="list.bulkDensityStandard !=1">
+			<!-- <view class='row' v-if="list.bulkDensityStandard !=1">
 				<view class="left" >基准水分（%）</view>
 				<view class="right">{{list.waterBase}}</view>
 			</view>
@@ -41,7 +41,7 @@
 			<view v-if="list.paramType == '2' && list.bulkDensityStandard !=1" class='row'>
 				<view class="left">扣重比</view>
 				<view class="right">{{list.deductWeight}}</view>
-			</view>
+			</view> -->
 			<view class="form_view" style="background: #F9F9FA;" v-if="list.bulkDensityStandard ==1">
 				<table border="1" width="100%" style="border-collapse: collapse;" cellspacing="0" cellpadding="0" class="table_css">
 				<tr>
@@ -55,16 +55,35 @@
 				</table>
 				
 			</view>
-			<view class='row' v-if="list.bulkDensityStandard !=1">
+			<!-- <view class='row' v-if="list.bulkDensityStandard !=1">
 				<view class="left">干粮收购价格（元/公斤）</view>
 				<view class="right">{{list.dryGrainPrice}}</view>
-			</view>
+			</view> -->
 			<view class='row boder'>
 				<view class="left">销售上限</view>
 				<view class="right">{{list.saleLimit}}</view>
 			</view>
 		</view>
-		<view class="content2" v-if="list.bulkDensityStandard !=1">
+		<view class="form_view" v-if="list.bulkDensityStandard !=1">
+			<table border="1" width="100%" style="border-collapse: collapse;" cellspacing="0" cellpadding="0" class="table_css">
+			<tr>
+				<td>水分</td>
+				<td>一等</td>
+				<td>二等</td>
+				<td>三等</td>
+				<td>等外</td>
+			</tr>
+			<tr v-for="(item,index) in list.detailPrints">
+				<td>{{item.waterMin}}</td>
+				<td>{{item.price1}}</td>
+				<td>{{item.price2}}</td>
+				<td>{{item.price3}}</td>
+				<td>{{item.priceOther}}</td>
+			</tr>
+			</table>
+			
+		</view>
+		<!-- <view class="content2" v-if="list.bulkDensityStandard !=1">
 			<view class="title">粮价设置</view>
 			<view v-for="(item,index) in list.details" :key="index">
 				<view class="row">
@@ -83,7 +102,7 @@
 					<view class="right">{{item1.price}}</view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<view class="content3">
 			<view class="title row">
 				流程

pages/task/audit/warehouse_details.vue

@@ -26,7 +26,7 @@
 				<view class="left">货名</view>
 				<view class="right">{{list.goodsName}}</view>
 			</view>
-			<view class='row' v-if="list.bulkDensityStandard !=1">
+			<!-- <view class='row' v-if="list.bulkDensityStandard !=1">
 				<view class="left">基准水分（%）</view>
 				<view class="right">{{list.waterBase}}</view>
 			</view>
@@ -41,7 +41,7 @@
 			<view v-if="list.paramType == '2' && list.bulkDensityStandard !=1" class='row'>
 				<view class="left">扣重比</view>
 				<view class="right">{{list.deductWeight}}</view>
-			</view>
+			</view> -->
 			<view class="form_view" style="background: #F9F9FA;" v-if="list.bulkDensityStandard ==1">
 				<table border="1" width="100%" style="border-collapse: collapse;" cellspacing="0" cellpadding="0" class="table_css">
 				<tr>
@@ -54,16 +54,35 @@
 				</tr>
 				</table>
 			</view>
-			<view class='row' v-if="list.bulkDensityStandard !=1">
+			<!-- <view class='row' v-if="list.bulkDensityStandard !=1">
 				<view class="left">干粮收购价格（元/公斤）</view>
 				<view class="right">{{list.dryGrainPrice}}</view>
-			</view>
+			</view> -->
 			<view class='row boder'>
 				<view class="left">销售上限</view>
 				<view class="right">{{list.saleLimit}}</view>
 			</view>
 		</view>
-		<view class="content2" v-if="list.bulkDensityStandard !=1">
+		<view class="form_view" v-if="list.bulkDensityStandard !=1">
+			<table border="1" width="100%" style="border-collapse: collapse;" cellspacing="0" cellpadding="0" class="table_css">
+			<tr>
+				<td>水分</td>
+				<td>一等</td>
+				<td>二等</td>
+				<td>三等</td>
+				<td>等外</td>
+			</tr>
+			<tr v-for="(item,index) in list.detailPrints">
+				<td>{{item.waterMin}}</td>
+				<td>{{item.price1}}</td>
+				<td>{{item.price2}}</td>
+				<td>{{item.price3}}</td>
+				<td>{{item.priceOther}}</td>
+			</tr>
+			</table>
+			
+		</view>
+		<!-- <view class="content2" v-if="list.bulkDensityStandard !=1">
 			<view class="title">粮价设置</view>
 			<view v-for="(item,index) in list.details" :key="index">
 				<view class="row">
@@ -80,7 +99,7 @@
 					<view class="right">{{item1.price}}</view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<view class="content3">
 			<view class="title row">
 				流程

pages/task/my_task.vue

@@ -6,11 +6,19 @@
 					placeholder="请输入任务日期或任务标题" v-model="keyword" @search="searchKeyWord()"
 					@custom="searchKeyWord()"></u-search>
 			</view>
+			<view style='justify-content: space-between;' class='flex'>
+				<view ></view>
+				<view class="company">
+					<image class='icon' style='width:19px;height:19px;' src="../../static/img/icon_qiye@3x.png"
+							mode=""></image> {{compName}}
+				</view>	
+			</view>
 			<view class="top2">
 				<view class="left">
 					<view @click='tabcarchange(1)' class='line' :class='statusFlag==1?"active":""'>未完成</view>
 					<view @click='tabcarchange(3)' class='line' :class='statusFlag==3?"active":""'>已完成</view>
 					<view @click='tabcarchange(5)' class='line' :class='statusFlag==5?"active":""'>已发起</view>
+					<view @click='tabcarchange(7)' class='line' :class='statusFlag==7?"active":""'>抄送</view>
 				</view>
 				<view class="right">
 				<!-- 	<view class="right-contrent1">逐条审核</view>
@@ -82,7 +90,8 @@
 				},
 				data: {},
 				keyword: "",
-				copyTaskInfo: []
+				copyTaskInfo: [],
+				pcUserInfo:{}
 			};
 		},
 		onBackPress(e) {
@@ -209,6 +218,8 @@
 			...mapState(['hasLogin', 'userInfo'])
 		},
 		onShow() {
+			var that =this
+			that.compName = uni.getStorageSync('compName1')
 			if(this.statusFlag==1){
 				this.taskInfo=[]
 				this.pages=1
@@ -217,6 +228,7 @@
 			// this.warehouseInOutInfo.phone = this.userInfo.phone
 		},
 		onLoad() {
+			this.pcUserInfo = uni.getStorageSync("pcUserInfo")
 			if (uni.getStorageSync("everyTask") == true) {
 				this.checked = true
 			} else {
@@ -383,7 +395,14 @@
 					data.searchKeyword = searchKeyword
 					url = '/commonUser/query/findHisPageNoticeTasksMy'
 				}
-
+				else if (this.statusFlag == 7) {
+					data.currentPage = pages
+					data.pageSize = limit
+					data.acceptId = this.userInfo.phone
+					data.compId = this.pcUserInfo.compId
+					data.searchKeyword = searchKeyword
+					url = '/noticeCopyInfo/getNotice'
+				}
 				//this.warehouseInOutInfo.status = this.status
 				this.$api.doRequest('get', url, data).then(res => {
 					if (res.data.code == 200) {
@@ -905,4 +924,23 @@
 			}
 		}
 	}
+	.company {
+		// position: fixed;
+		// right: 0;
+		// top: 18%;
+		background: url('../../static/img/qiyebeijing.png');
+		background-size: 100% 100%;
+		text-align:right;
+		font-size: 11px;
+		padding-bottom: 5px;
+		padding-right: 10px;
+		width:60%;
+		margin-right:-10px;
+		border-radius: 40rpx 0 0 40rpx;
+	}
+	
+	.company .icon {
+		position: relative;
+		top: 4px;
+	}
 </style>

pages/user/user.vue

@@ -103,6 +103,7 @@
 		},
 		data() {
 			return {
+				pcUserInfo:{},
 				isShowAlert: false,
 				content: '您尚未登录，是否立即登录?',
 				haveCompany: false,
@@ -398,7 +399,8 @@
 		},
 		onShow() {
 			// console.log(111111111)
-			if (uni.getStorageSync('pcUserInfo')) {
+			this.pcUserInfo = uni.getStorageSync('pcUserInfo')
+			if (this.pcUserInfo) {
 				// console.log(2222222)
 				for (var i = 0; i < this.gridList1.length; i++) {
 					if (this.gridList1[i].num == 0 || this.gridList1[i].num == 1 || this.gridList1[i].num == 3 || this
@@ -489,6 +491,15 @@
 				}).then(res => {
 					if (res.data.data) {
 						that.companyList = res.data.data
+						if(that.pcUserInfo){
+							for(let i=0;i<that.companyList.length;i++){
+								if(that.pcUserInfo.compId == that.companyList[i].compId){
+									uni.setStorageSync('compName1',that.companyList[i].compName)
+									that.compName = that.companyList[i].compName
+								}
+								
+							}
+						}
 						console.log("that.3333")
 						console.log(that.companyList)
 						if (that.companyList.length > 0) {
@@ -541,6 +552,7 @@
 								veriCode: "123456",
 							}).then(res1 => {
 								console.log("loginQuickly", res)
+								uni.setStorageSync("cangid",'')
 								if (res1.data.code == 200) {
 									uni.setStorageSync('pcUserInfo', res1.data.data)
 									uni.setStorageSync('compName1', that.companyList[e[0]].compName)