Bladeren bron

修改群贤

wangchao 3 jaren geleden
bovenliggende
commit
b84486e6e8
3 gewijzigde bestanden met toevoegingen van 14 en 16 verwijderingen
  1. 0 1
      App.vue
  2. 14 12
      pages/erpbusiness/acquisitionInspection/warehouseWeighing.vue
  3. 0 3
      pages/erpbusiness/quality_testing.vue

+ 0 - 1
App.vue

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

+ 14 - 12
pages/erpbusiness/acquisitionInspection/warehouseWeighing.vue

@@ -49,19 +49,12 @@
 						<view>{{item.netWeight?item.netWeight:'未称重'}}</view>
 					</view>
 				</view>
-		<!-- 		<view class="row4">
-					<view v-if="item.status!='已称毛重'" class="right" v-hasPermission="'acquisitionWeightOut.weight'" @click.stop="tareClick(item)">皮重</view>
-					<view v-if="!(item.paymentManagement&&item.paymentManagement.status=='已收款')||
-					!(item.paymentManagement&&item.paymentManagement.status=='部分收款')
-					" class="right" :class="item.status=='已质检'?'gray':''" v-hasPermission="'acquisitionWeightOut.mao'" @click.stop="grossWeightClick(item)">毛重</view>
-					<view class="right" v-hasPermission="'acquisitionWeightOut.view'" @click.stop="delClick(item)">删除</view>
-				</view> -->
 				<view class="row4">
-					<view v-if="item.status!='已称毛重'" class="right" @click.stop="tareClick(item)">皮重</view>
-					<view v-if="!(item.paymentManagement&&item.paymentManagement.status=='已收款')||
+					<view v-if="getRoles('acquisitionWeightOut.weight')&&item.status!='已称毛重'" class="right" @click.stop="tareClick(item)">皮重</view>
+					<view v-if="getRoles('acquisitionWeightOut.mao')&&!(item.paymentManagement&&item.paymentManagement.status=='已收款')||
 					!(item.paymentManagement&&item.paymentManagement.status=='部分收款')
 					" class="right" :class="item.status=='已质检'?'gray':''" @click.stop="grossWeightClick(item)">毛重</view>
-					<view class="right" @click.stop="delClick(item)">删除</view>
+					<view class="right" v-if='getRoles("acquisitionWeightOut.view")' @click.stop="delClick(item)">删除</view>
 				</view>
 			</view>
 		</view>
@@ -70,8 +63,7 @@
 		</view>
 		<u-toast ref="uToast" />
 		<view class="footer">
-			<!-- <view @click='add' class="button" v-hasPermission="'acquisitionWeightOut.new'">新增</view> -->
-			<view @click='add' class="button">新增</view>
+			<view @click='add' class="button" v-if='getRoles("acquisitionWeightOut.new")'>新增</view>
 		</view>
 	</view>
 </template>
@@ -142,6 +134,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
+			},
 			add(){
 				uni.navigateTo({
 					url:'/pages/erpbusiness/acquisitionInspection/add_check_the_weight?cangId='+this.cangId+'&warehouseName='+this.warehouseName

+ 0 - 3
pages/erpbusiness/quality_testing.vue

@@ -52,7 +52,6 @@
 					<view>{{item.goodsName}}({{item.waterContent}}水)</view>
 				</view>
 				<view class="row3">
-					{{getRoles("acquisitionQuality.delete")}}
 					<view v-if='getRoles("acquisitionQuality.delete")&&item.weighingManagement&&item.weighingManagement.status=="已质检"&&managementType==1' @click.stop='del(item)' class='button'>删除</view>
 						<view v-if='getRoles("acquisitionQuality.initial")&&item.status=="已初检"&&managementType==1' @click.stop='edit(item,0)' class='button'>初检</view>
 						<view v-if='getRoles("acquisitionQuality.con")&&item.confirm!="1"&&item.status=="已复检"&&managementType==1' @click.stop='edit(item,2)' class='button'>确认</view>
@@ -101,7 +100,6 @@
 			<uni-load-more :status="loadStatus"></uni-load-more>
 		</view>
 		<view v-if='managementType==1' class="footer">
-			<!-- <view @click='add' v-hasPermission="'acquisitionQuality.add'" class="button">新增</view> -->
 			<view @click='add' v-if='getRoles("acquisitionQuality.add")' class="button">新增</view>
 		</view>
 	</view>
@@ -243,7 +241,6 @@
 		methods: {
 			//获取当前按钮权限
 			getRoles: function(role) {
-				debugger
 				let _roles = uni.getStorageSync('rolesList')
 				for (let i = 0; i < _roles.length; i++) {
 					if (_roles[i] == role) {