小程序 sdy

config/index.js

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

pages.json

@@ -311,12 +311,12 @@
 				"navigationStyle": "custom"
 			}
 		},
-		{
-			"path": "pages/user/report",
-			"style": {
-				"navigationBarTitleText": "数据报表"
-			}
-		},
+		// {
+		// 	"path": "pages/user/report",
+		// 	"style": {
+		// 		"navigationBarTitleText": "数据报表"
+		// 	}
+		// },
 		{
 			"path": "pages/buy/transaction",
 			"style": {

pages/erpbusiness/acquisitionInspection/acquisitionInspection.vue

@@ -50,15 +50,15 @@
 						<view>{{item.netWeight?item.netWeight:'未称重'}}</view>
 					</view>
 				</view>
-		<!-- 		<view class="row4">
-					<view v-if="item.status!='已称皮重'" class="right" v-hasPermission="'acquisitionWeight.mao'" @click="grossWeightClick(item)">毛重</view>
-					<view v-if="(!(item.paymentManagement&&item.paymentManagement.status=='已收款')||
+				<!-- <view class="row4">
+					<view v-if="getRoles('acquisitionWeight.mao')&&item.status!='已称皮重'" class="right" v-hasPermission="'acquisitionWeight.mao'" @click="grossWeightClick(item)">毛重</view>
+					<view v-if="getRoles('acquisitionWeight.weight')&&(!(item.paymentManagement&&item.paymentManagement.status=='已收款')||
 					!(item.paymentManagement&&item.paymentManagement.status=='部分收款')) && item.status!='已质检'"
 					 class="right" v-hasPermission="'acquisitionWeight.weight'" @click="tareClick(item)">皮重</view>
 				</view> -->
 				<view class="row4">
-					<view v-if="item.status!='已称皮重'" class="right" @click="grossWeightClick(item)">毛重</view>
-					<view v-if="(!(item.paymentManagement&&item.paymentManagement.status=='已收款')||
+					<view v-if="getRoles('acquisitionWeight.mao')&&item.status!='已称皮重'" class="right"  @click="grossWeightClick(item)">毛重</view>
+					<view v-if="getRoles('acquisitionWeight.weight')&&(!(item.paymentManagement&&item.paymentManagement.status=='已收款')||
 					!(item.paymentManagement&&item.paymentManagement.status=='部分收款')) && item.status!='已质检'"
 					 class="right" @click="tareClick(item)">皮重</view>
 				</view>
@@ -145,6 +145,16 @@
 			// this.getMoreNews()
 		},
 		methods: {
+			//获取当前按钮权限
+			getRoles: function(role) {
+				let _roles = uni.getStorageSync('rolesList')
+				for (let i = 0; i < _roles.length; i++) {
+					if (_roles[i] == role) {
+						 return true
+					} 
+				}
+				return false
+			},
 			loadData() {
 				var that = this
 				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelf', {

pages/erpbusiness/quality_testing.vue

@@ -243,7 +243,6 @@
 		methods: {
 			//获取当前按钮权限
 			getRoles: function(role) {
-				debugger
 				let _roles = uni.getStorageSync('rolesList')
 				for (let i = 0; i < _roles.length; i++) {
 					if (_roles[i] == role) {

pages/task/audit/freight_setting_approval.vue

@@ -4,9 +4,12 @@
 			<view class="topInfo-item">
 				<view class="flex info">
 					<view class="logo">
-					<image src="../../../static/img/reject.png" mode="" v-if="list.priceStatus == '已驳回'" style="height: 40rpx;"></image><!-- 驳回 -->
-					<image src="../../../static/img/tongguo.png" mode="" v-if="list.priceStatus == '已通过'" style="height: 40rpx;"></image><!-- 通过 -->
-					<image src="../../../static/img/daishenhe.png" mode="" v-if="list.priceStatus == '审核中'" style="height: 40rpx;"></image><!-- 待审核 -->
+						<image src="../../../static/img/reject.png" mode="" v-if="list.priceStatus == '已驳回'"
+							style="height: 40rpx;"></image><!-- 驳回 -->
+						<image src="../../../static/img/tongguo.png" mode="" v-if="list.priceStatus == '已通过'"
+							style="height: 40rpx;"></image><!-- 通过 -->
+						<image src="../../../static/img/daishenhe.png" mode="" v-if="list.priceStatus == '审核中'"
+							style="height: 40rpx;"></image><!-- 待审核 -->
 					</view>
 					<view class="infoText">{{list.priceStatus}}</view>
 				</view>
@@ -55,7 +58,8 @@
 			this.getList()
 		},
 		computed: {
-			...mapState(['hasLogin', 'userInfo']),},
+			...mapState(['hasLogin', 'userInfo']),
+		},
 		methods: {
 			getList() {
 				this.$api.doRequest('get', '/tranProcessInfo/getTranProcess', {
@@ -72,13 +76,13 @@
 				tranProcessInfo.tranPriceIng = this.list.tranPriceIng
 				tranProcessInfo.reviewer = this.userInfo.userName
 				this.$api.doRequest('post', '/tranProcessInfo/api/setUpTranPrice', tranProcessInfo).then(res => {
-					if(res.data.code == 200){
-							this.$api.msg('审核通过成功!')
-							that.setTimeout(function() {
-									uni.navigateBack()
-							},1000);
+					if (res.data.code == 200) {
+						this.$api.msg('审核通过成功!')
+						this.setTimeout(function() {
+							uni.navigateBack()
+						}, 1000);
 					}
-				
+
 				})
 			}
 		}
@@ -113,6 +117,7 @@
 		height: 210rpx;
 		background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
 		padding: 30rpx;
+
 		.topInfo-item {
 			height: 158rpx;
 			background-color: #FFFFFF;
@@ -124,18 +129,21 @@
 				height: 40rpx;
 				margin-top: 8rpx;
 			}
+
 			.infoText {
 				font-size: 36rpx;
 				font-weight: 600;
 				margin-left: 20rpx;
 			}
-			.infoData{
+
+			.infoData {
 				color: #878C9C;
 				font-size: 26rpx;
 				margin-top: 10rpx;
 			}
 		}
 	}
+
 	.submit {
 		width: 98%;
 		background: #22C572;