wangchao %!s(int64=3) %!d(string=hai) anos
pai
achega
50cf6c3bd2

+ 18 - 6
App.vue

@@ -5,7 +5,7 @@
 	import {
 		mapMutations
 	} from 'vuex';
-		import * as config from '@/config'
+	import * as config from '@/config'
 	import appUpdate from 'common/appUpdate.js'
 	import app_push from './components/APPPush/app_push.js'
 
@@ -25,7 +25,7 @@
 				// arr.push(data)
 				// 接口需要验证的可以将json转成数组添加值再调用
 				// 不需要的可以直接data:data
-				console.log("method, url, data, header",method,baseUrl, url, data, header)
+				console.log("method, url, data, header", method, baseUrl, url, data, header)
 				return new Promise((resolve, reject) => {
 					uni.request({
 						method: method,
@@ -72,6 +72,18 @@
 				s = Math.round(s * 10000) / 10000;
 				s = '(距您' + s.toFixed(2) + '公里)' //保留两位小数
 				return s
+			},
+			//获取当前按钮权限
+			getRoles: function(role) {
+				debugger
+				let  _haveRoles = false;
+				let _roles = uni.getStorageSync('rolesList')
+				for (let i = 0; i < _roles.length; i++) {
+					if (_roles[i] == role) {
+						 _haveRoles = true
+					} 
+				}
+				return _haveRoles
 			}
 		},
 		onLaunch: function() {
@@ -97,7 +109,7 @@
 			plus.push.addEventListener("receive", function(msg) {
 				var title = msg.content.split(':')[0]
 				var content = msg.content.split(':')[1]
-				
+
 				let params = {
 					inApp: true, // app内横幅提醒
 					voice: true, // 声音提醒
@@ -121,10 +133,10 @@
 							name,
 							value
 						});
-						if(value != 0&&value){
+						if (value != 0 && value) {
 							uni.setTabBarBadge({
-								index:4,
-								text:value+""
+								index: 4,
+								text: value + ""
 							})
 						}
 						name = 'taskTip';

+ 7 - 1
pages/erpbusiness/acquisitionInspection/acquisitionInspection.vue

@@ -50,11 +50,17 @@
 						<view>{{item.netWeight?item.netWeight:'未称重'}}</view>
 					</view>
 				</view>
-				<view class="row4">
+		<!-- 		<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=='已收款')||
 					!(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=='已收款')||
+					!(item.paymentManagement&&item.paymentManagement.status=='部分收款')) && item.status!='已质检'"
+					 class="right" @click="tareClick(item)">皮重</view>
 				</view>
 			</view>
 		</view>

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

@@ -49,12 +49,19 @@
 						<view>{{item.netWeight?item.netWeight:'未称重'}}</view>
 					</view>
 				</view>
-				<view class="row4">
+		<!-- 		<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=='已收款')||
+					!(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>
 			</view>
 		</view>
@@ -63,7 +70,8 @@
 		</view>
 		<u-toast ref="uToast" />
 		<view class="footer">
-			<view @click='add' class="button" v-hasPermission="'acquisitionWeightOut.new'">新增</view>
+			<!-- <view @click='add' class="button" v-hasPermission="'acquisitionWeightOut.new'">新增</view> -->
+			<view @click='add' class="button">新增</view>
 		</view>
 	</view>
 </template>

+ 11 - 3
pages/erpbusiness/quality_testing.vue

@@ -51,12 +51,19 @@
 					<view>{{item.carNumber}}</view>
 					<view>{{item.goodsName}}({{item.waterContent}}水)</view>
 				</view>
-				<view class="row3">
+		<!-- 		<view class="row3">
 					<view v-if='item.weighingManagement&&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.confirm!="1"&&managementType==1&&getApp().getRoles("acquisitionQuality.again")' @click.stop='edit(item,1)' class='button'>复检</view>
 						<view v-if='item.status=="已称毛重"&&managementType==3' @click.stop='quality_testing(item)' v-hasPermission="'acquisitionQualityOut.edit'" class='button'>质检</view>
+				</view> -->
+				<view class="row3">
+					<view v-if='item.weighingManagement&&item.weighingManagement.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>
 			</view>
 			<!-- <view class='wrap' v-for='item in gridList' @click='examine(item)'>
@@ -100,7 +107,8 @@
 			<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-hasPermission="'acquisitionQuality.add'" class="button">新增</view> -->
+			<view @click='add' class="button">新增</view>
 		</view>
 	</view>
 </template>