前端小程序 更新sdy

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "1.1.13",
-    "versionCode" : 1113,
+    "versionName" : "1.1.15",
+    "versionCode" : 1114,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

pages/erp/improvedWrehousing/improvedWrehousingDetail.vue

@@ -190,8 +190,8 @@
 					month: true,
 					day: true,
 				},
-				isEditCB: 'false',
-				isEditYF: 'false',
+				isEditCB: true,
+				isEditYF: true,
 				warehouseName: '',
 				binNumber: '',
 				

pages/erp/index.vue

@@ -36,7 +36,7 @@
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='立即开通'
-			title='您尚未开通ERP业务' showCancelButton='false' :content="content" @confirm="goOpenService"></u-modal>
+			title='您尚未开通ERP业务' showCancelButton='false' :content="content" @confirm="goOpenService" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 <script>
@@ -187,6 +187,9 @@
 			})
 		},
 		methods: {
+			cancelClick(){
+				uni.navigateBack(-1)
+			},
 			getCompWarehouse() {},
 			goOpenService() {
 				if (!this.hasLogin) {

pages/erp/warehousing/warehousing.vue

@@ -190,8 +190,8 @@
 					month: true,
 					day: true,
 				},
-				isEditCB: 'false',
-				isEditYF: 'false',
+				isEditCB: true,
+				isEditYF: true,
 				warehouseName: '',
 				binNumber: '',
 				contractNoList: [],

pages/erpbusiness/add_quality_testing.vue

@@ -330,12 +330,15 @@
 			waterContentChange() {
 				var that = this
 				if(this.gridList.goodsName && this.cangid){
-					this.$api.doRequest('get', '/purchasePrice/dryGrainPrice',{
-						warehouseId:this.cangid,
-						goodsName:this.gridList.goodsName
-					}).then(res => {
-						that.gridList.dryGrainPrice = res.data.data
-					})
+					if(!this.gridList.dryGrainPrice||this.gridList.dryGrainPrice == 0){
+						this.$api.doRequest('get', '/purchasePrice/dryGrainPrice',{
+							warehouseId:this.cangid,
+							goodsName:this.gridList.goodsName
+						}).then(res => {
+							that.gridList.dryGrainPrice = res.data.data
+						})
+					}
+					
 				}
 				
 				if (this.gridList.goodsName) {

pages/erpbusiness/edit_quality_testing.vue

@@ -80,13 +80,20 @@
 					{{gridList.type}}
 				</view>
 			</view>
-			<view class="c-row">
+			<view v-if="gridList.type == '潮粮'" class="c-row">
 				<view class="title">净重单价（元/公斤）</view>
 				<view class="con-list">
 					<input :disabled='flag==1' v-model='gridList.tidalGrainPrice' disabled placeholder="自动获取,不可编辑"
 						 name="input"></input>
 				</view>
 			</view>
+			<view v-if="gridList.type == '干粮'" class="c-row">
+				<view class="title">干粮单价（元/公斤）</view>
+				<view class="con-list">
+					<input v-model='gridList.dryGrainPrice' placeholder="请输入干粮单价"
+						 name="input"></input>
+				</view>
+			</view>
 		</view>
 		<view style='margin-bottom:100px;' class='wrap'>
 			<view class='title_b'>化验信息</view>
@@ -273,12 +280,15 @@
 			waterContentChange() {
 				var that = this
 				if(this.gridList.goodsName && this.cangid){
-					this.$api.doRequest('get', '/purchasePrice/dryGrainPrice',{
-						warehouseId:this.cangid,
-						goodsName:this.gridList.goodsName
-					}).then(res => {
-						that.gridList.dryGrainPrice = res.data.data
-					})
+					if(!this.gridList.dryGrainPrice||this.gridList.dryGrainPrice == 0){
+						this.$api.doRequest('get', '/purchasePrice/dryGrainPrice',{
+							warehouseId:this.cangid,
+							goodsName:this.gridList.goodsName
+						}).then(res => {
+							that.gridList.dryGrainPrice = res.data.data
+						})
+					}
+					
 				}
 				
 				if (this.gridList.goodsName) {

pages/erpbusiness/examine_quality_testing.vue

@@ -74,12 +74,18 @@
 					{{gridList.type}}
 				</view>
 			</view>
-			<view v-if='managementType==1' class="c-row">
+			<view v-if="gridList.type == '潮粮'" class="c-row">
 				<view class="title">净重单价（元/公斤）</view>
 				<view class="con-list">
 					{{gridList.tidalGrainPrice}}
 				</view>
 			</view>
+			<view v-if="gridList.type == '干粮'" class="c-row">
+				<view class="title">干粮单价（元/公斤）</view>
+				<view class="con-list">
+					{{gridList.dryGrainPrice}}
+				</view>
+			</view>
 		</view>
 		<view style='margin-bottom:100px;' class='wrap'>
 			<view class='title_b'>化验信息</view>
@@ -169,7 +175,9 @@
 				headUrl:"../../static/img/myimg/YongHu@3x.png",
 				userphone:"",
 				username:"请更改昵称",
-				gridList: {},
+				gridList: {
+					type:'潮粮'
+				},
 				managementType:'',
 				warehouseName: '',
 				warehouseList:[],

pages/erpbusiness/index.vue

@@ -40,6 +40,7 @@
 		},
 		data() {
 			return {
+				a:false,
 				inputShow: false,
 				modalName: '',
 				mycarStyle: '',
@@ -77,6 +78,7 @@
 						url: '/pages/erpbusiness/quality_testing?managementType=1',
 						show: true
 					},
+
 					{
 						num: 2,
 						name: '收购检斤',
@@ -86,6 +88,7 @@
 						url: '/pages/erpbusiness/acquisitionInspection/acquisitionInspection',
 						show: false
 					}
+
 					// {
 					// 	num: 5,
 					// 	name: '设置',
@@ -97,15 +100,15 @@
 					// }
 				],
 				gridList1: [
-					{
-						num: 0,
-						name: '出库检斤',
-						// icon: 'cuIcon-apps',
-						src:'../../static/img/erp/chukujianjin@3x.png',
-						tips: 0,
-						url: '/pages/erpbusiness/acquisitionInspection/warehouseWeighing',
-						show: true
-					},
+					// {
+					// 	num: 0,
+					// 	name: '出库检斤',
+					// 	// icon: 'cuIcon-apps',
+					// 	src:'../../static/img/erp/chukujianjin@3x.png',
+					// 	tips: 0,
+					// 	url: '/pages/erpbusiness/acquisitionInspection/warehouseWeighing',
+					// 	show: false
+					// },
 					{
 						num: 1,
 						name: '出库质检',
@@ -165,7 +168,7 @@
 			}
 		},
 		onShow() {
-			
+			// this.isShow();
 			uni.hideKeyboard()
 			uni.showTabBar()
 			this.loadData()
@@ -235,6 +238,31 @@
 			console.log("this.userInfo",this.userInfo)
 		},
 		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
+			},
+			isShow(){
+				for(let i = 0;i<this.gridList.length;i++){
+					if(i==1){
+						this.gridList[i].show = this.getRoles('acquisitionQuality.view')
+					}else if (i==2){
+						this.gridList[i].show = this.getRoles('acquisitionWeight.view')
+					}
+				}
+				for(let k = 0;k<this.gridList1.length;k++){
+					if(k==0){
+						this.gridList[k].show = this.getRoles('acquisitionWeightOut.view')
+					}else if (k==1){
+						this.gridList[k].show = this.getRoles('acquisitionQualityOut.view')
+					}
+				}
+			},
 			fankui(){
 				uni.navigateTo({
 					url: `/pages/user/fankui`

pages/erpbusiness/quality_testing.vue

@@ -1009,5 +1009,8 @@
 	.status3{
 		background: #3296FA;
 	}
+	.center{
+		padding-bottom: 150rpx;
+	}
 </style>
 

pages/task/my_task.vue

@@ -47,7 +47,7 @@
 				PageCur: "task",
 				taskInfo: [],
 				pages: 1, //页数
-				limit: 50, //每次取条目数
+				limit: 10, //每次取条目数
 				loadStatus: 'loading', //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
 				isLoadMore: false, //是否加载中
 				isSole: false,

pages/user/report.vue

@@ -0,0 +1,24 @@
+<template>
+    <web-view :src="url"></web-view>
+</template>
+
+<script>
+	export default {
+        data() {
+            return {
+                url:"https://datav.aliyuncs.com/share/235518097ffd673bc1eb05011b9a02b6"
+            }
+        },
+        onLoad: function(option) {
+            // this.url = option.url;
+        },
+        methods: {
+        }
+    }
+</script>
+    
+
+
+<style>
+
+</style>