更新

pages/erpbusiness/acquisitionInformation.vue

@@ -60,7 +60,6 @@
 				warehouseName: '暂无仓库',
 				warehouseList: [],
 				show1: false,
-				status: "",
 				isEdit: false,
 				sgId: '',
 				id: ''
@@ -68,8 +67,6 @@
 		},
 
 		onLoad(options) {
-			this.status = options.status
-			this.sgId = options.id
 		},
 		// #ifndef MP
 		onNavigationBarButtonTap(e) {

pages/erpbusiness/index.vue

@@ -15,11 +15,12 @@
 			<!-- isShowAcquisitionInfo -->
 			<!-- 获取当前用户负责的仓库，如果无仓库隐藏收购信息 -->
 			<!-- &&sgId -->
-			<view class="content2" v-if="isShowAcquisitionInfo">
+			<!-- <view class="content2" v-if="isShowAcquisitionInfo">
 				<view>收购信息</view>
-				<view @click="navTo('/pages/erpbusiness/acquisitionInformation?status='+status+'&id='+sgId)">{{status}}>
+				<view @click="navTo('/pages/erpbusiness/acquisitionInformation')">
+					<u-button size="mini">查看</u-button>
 				</view>
-			</view>
+			</view> -->
 		</view>
 		<!-- <view class="wrap">
 			<view class='title'>出库管理</view>
@@ -108,7 +109,17 @@
 						url: '/pages/erpbusiness/acquisitionInspection/acquisitionInspection',
 						show: true
 					}
+,
 
+					{
+						num: 3,
+						name: '收购信息',
+						// icon: 'cuIcon-copy',
+						src: '../../static/img/erp/receiving@3x.png',
+						tips: 0,
+						url: '/pages/erpbusiness/acquisitionInformation',
+						show: true
+					}
 					// {
 					// 	num: 5,
 					// 	name: '设置',
@@ -315,6 +326,9 @@
 					} else if (i == 2) {
 						this.gridList[i].show = this.getRoles('acquisitionWeight.view')
 					}
+					else if (i == 3) {
+						this.gridList[i].show = this.utils.getRoles('acquisitionInfor.view')
+					}
 				}
 				for (let k = 0; k < this.gridList1.length; k++) {
 					if (k == 0) {

pages/task/audit/acquisition_settlement_approval.vue

@@ -58,7 +58,7 @@
 				<view class="right">{{auditInfo.netWeightTotal}}</view>
 			</view>
 			<view class="row" style="border-bottom:0">
-				<view class="left">平均单价（元吨）</view>
+				<view class="left">平均单价（元/吨）</view>
 				<view class="right">{{auditInfo.averageUnitPrice}}</view>
 			</view>
 
@@ -290,7 +290,8 @@
 					}
 				})
 				this.$api.doRequest('post', '/paymentManagement/exportPhoneData', {
-					warehouseName: this.vesselId
+					warehouseName: this.vesselId,
+					searchType: 1
 				}).then(res1 => {
 					if (res1.data.code == 200) {
 						this.auditInfo = res1.data.data