Browse Source

Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

zhongtianhaoyuan 3 years ago
parent
commit
75b78514dc

+ 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';

+ 2 - 2
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
 }

+ 3 - 3
pageD/identity/companyIdentity.vue

@@ -1,8 +1,8 @@
 <template>
 	<view class="center">
 		<view v-if='!status' class="top">
-			<text @click='consent' v-bind:class="switchs1" v-if="consentStatus">公司</text>
-			<text @click='consent' v-bind:class="switchs2" v-if="consentStatus1">个人</text>
+			<text @click='consent' v-bind:class="switchs1">公司</text>
+			<text @click='consent' v-bind:class="switchs2">个人</text>
 		</view>
 		<view class="content">
 			<view v-if="consentStatus == true">
@@ -162,7 +162,7 @@
 						// console.log(this.deptList.customerTypeFlag, "判断")
 						if (this.identityAuthenticationInfo.customerTypeFlag == 2) {
 							this.consentStatus = true
-							this.consentStatus1 = false
+							this.consentStatus1 = true
 							this.switchs1 = "switchs1"
 							this.switchs2 = "switchs2"
 						} else {

+ 1 - 1
pageD/identity/companyIdentityThree.vue

@@ -10,7 +10,7 @@
 			<upload class="upload" :file-list='payeeAddressUrlList[1]' ref="upload" :action="action" :max-size="maxSize"
 				:max-count="1" :size-type="['compressed']" @on-success="getImgUrl1" @on-remove="onRemove"
 				@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions1"
-				:custom="uploadCustom"></upload>123456
+				:custom="uploadCustom"></upload>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">银行卡号</text>

+ 6 - 0
pages.json

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

+ 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>

+ 19 - 6
pages/erpbusiness/quality_testing.vue

@@ -52,11 +52,12 @@
 					<view>{{item.goodsName}}({{item.waterContent}}水)</view>
 				</view>
 				<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.status=="已称毛重"&&managementType==3' @click.stop='quality_testing(item)' v-hasPermission="'acquisitionQualityOut.edit'" class='button'>质检</view>
+					{{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>
+						<view v-if='getRoles("acquisitionQuality.again")&&item.confirm!="1"&&managementType==1' @click.stop='edit(item,1)' class='button'>复检</view>
+						<view v-if='getRoles("acquisitionQualityOut.edit")&&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 +101,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' v-if='getRoles("acquisitionQuality.add")' class="button">新增</view>
 		</view>
 	</view>
 </template>
@@ -239,6 +241,17 @@
 			})
 		},
 		methods: {
+			//获取当前按钮权限
+			getRoles: function(role) {
+				debugger
+				let _roles = uni.getStorageSync('rolesList')
+				for (let i = 0; i < _roles.length; i++) {
+					if (_roles[i] == role) {
+						 return true
+					} 
+				}
+				return false
+			},
 			quality_testing(item){
 				uni.navigateTo({
 					url:'/pages/erpbusiness/out_quality_testing?id='+item.id+'&managementType='+this.managementType+'&cangid='+this.cangid

+ 14 - 2
pages/user/user.vue

@@ -41,6 +41,9 @@
 				</view>
 			</view>
 		</view>
+		<!-- <view style="margin-top: 10rpx;">
+			<web-view src="https://datav.aliyuncs.com/share/01de6913a5761ab4d3171b1f0b3e0704"></web-view>
+		</view> -->
 		<!-- <view style='text-align:center;'>
 				<navigator
 					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/userAgreement.html"
@@ -49,7 +52,7 @@
 					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/screctAgreement.html"
 					class="path" hover-class="navigator-hover">《隐私政策》</navigator>
 			</view> -->
-		<view class="guess-section-wrap">
+		<!-- <view class="guess-section-wrap">
 			<view class='flex justify-between'>
 				<view class='title Medium'>工厂价格</view>
 			</view>
@@ -69,7 +72,7 @@
 				</view>
 			</view>
 		</view>
-		<u-back-top :scroll-top="scrollTop" mode="circle" icon="arrow-upward"></u-back-top>
+		<u-back-top :scroll-top="scrollTop" mode="circle" icon="arrow-upward"></u-back-top> -->
 	</view>
 </template>
 <script>
@@ -196,6 +199,15 @@
 						tips: 0,
 						url: `/pages/erp/contactCustomerService/contactCustomerService`,
 						show: true
+					},
+					{
+						num: 6,
+						name: '数据报表',
+						// icon: 'cuIcon-edit',
+						src: '../../static/img/sign/myContract@2x.png',
+						tips: 0,
+						url: `/pages/user/report`,
+						show: true
 					}
 				],
 				showTran: true,