zhangyuewww 3 anni fa
parent
commit
f7768e1199

+ 1 - 1
pages/erp/exWarehousing/selectCarNo.vue

@@ -48,7 +48,7 @@
 			}
 		},
 		methods: {
-			confirm(item){debugger
+			confirm(item){
 				uni.setStorageSync('erpcarNoListCK', item);
 				uni.setStorageSync('ContractNoCarCK',item.carNo);
 				uni.navigateBack({})

+ 2 - 2
pages/erpbusiness/acquisitionInspection/acquisitionInspection.vue

@@ -51,10 +51,10 @@
 					</view>
 				</view>
 				<view class="row4">
-					<view v-if="item.status!='已称皮重'" class="right" @click="grossWeightClick(item)">毛重</view>
+					<view v-if="item.status!='已称皮重'" class="right" v-hasPermission="'acquisitionWeight.mao'" @click="grossWeightClick(item)">毛重</view>
 					<view v-if="(!(item.paymentManagement&&item.paymentManagement.status=='已收款')||
 					!(item.paymentManagement&&item.paymentManagement.status=='部分收款')) && item.status!='已质检'"
-					 class="right" @click="tareClick(item)">皮重</view>
+					 class="right" v-hasPermission="'acquisitionWeight.weight'" @click="tareClick(item)">皮重</view>
 				</view>
 			</view>
 		</view>

+ 4 - 4
pages/erpbusiness/acquisitionInspection/warehouseWeighing.vue

@@ -50,11 +50,11 @@
 					</view>
 				</view>
 				<view class="row4">
-					<view v-if="item.status!='已称毛重'" class="right" @click.stop="tareClick(item)">皮重</view>
+					<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':''" @click.stop="grossWeightClick(item)">毛重</view>
-					<view class="right" @click.stop="delClick(item)">删除</view>
+					" 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>
 		</view>
@@ -63,7 +63,7 @@
 		</view>
 		<u-toast ref="uToast" />
 		<view class="footer">
-			<view @click='add' class="button">新增</view>
+			<view @click='add' class="button" v-hasPermission="'acquisitionWeightOut.new'">新增</view>
 		</view>
 	</view>
 </template>

+ 6 - 6
pages/erpbusiness/quality_testing.vue

@@ -52,11 +52,11 @@
 					<view>{{item.goodsName}}({{item.waterContent}}水)</view>
 				</view>
 				<view class="row3">
-					<view v-if='item.status=="已质检"&&managementType==1' @click.stop='del(item)' class='button'>删除</view>
-						<view v-if='item.status=="已初检"&&managementType==1' @click.stop='edit(item,0)' class='button'>初检</view>
-						<view v-if='item.confirm!="1"&&item.status=="已复检"&&managementType==1' @click.stop='edit(item,2)' class='button'>确认</view>
-						<view v-if='item.confirm!="1"&&managementType==1' @click.stop='edit(item,1)' class='button'>复检</view>
-						<view v-if='item.status=="已称毛重"&&managementType==3' @click.stop='quality_testing(item)' class='button'>质检</view>
+					<view v-if='item.weighingManagement.status=="已质检"&&managementType==1' @click.stop='del(item)' v-hasPermission="'acquisitionQuality.delete'" class='button'>删除</view>
+						<view v-if='item.status=="已初检"&&managementType==1' v-hasPermission="'acquisitionQuality.initial'" @click.stop='edit(item,0)' class='button'>初检</view>
+						<view v-if='item.confirm!="1"&&item.status=="已复检"&&managementType==1' @click.stop='edit(item,2)' v-hasPermission="'acquisitionQuality.con'" class='button'>确认</view>
+						<view v-if='item.confirm!="1"&&managementType==1'  @click.stop='edit(item,1)' v-hasPermission="'acquisitionQuality.again'" class='button'>复检</view>
+						<!-- <view v-if='item.status=="已称毛重"&&managementType==3' @click.stop='quality_testing(item)' class='button'>质检</view> -->
 				</view>
 			</view>
 			<!-- <view class='wrap' v-for='item in gridList' @click='examine(item)'>
@@ -95,7 +95,7 @@
 			<uni-load-more :status="loadStatus"></uni-load-more>
 		</view>
 		<view v-if='managementType==1' class="footer">
-			<view @click='add' class="button">新增</view>
+			<view @click='add' v-hasPermission="'acquisitionQuality.add'" class="button">新增</view>
 		</view>
 	</view>
 </template>

+ 1 - 1
pages/public/login_account_number.vue

@@ -117,7 +117,7 @@
 							console.log("loginQuickly",res)
 							if(res1.data.code==200){
 								uni.setStorageSync('pcUserInfo', res1.data.data)
-								debugger
+								// debugger
 								helper.getListByUserId()
 							}
 							else{