瀏覽代碼

Merge branch 'deploy' of http://git.chelingzhu.com/chelingzhu-web/storeCheck-app into deploy

lilei 4 年之前
父節點
當前提交
0108d94bd3
共有 2 個文件被更改,包括 17 次插入16 次删除
  1. 1 1
      pages/index/index.vue
  2. 16 15
      pages/toDoList/toDoList.vue

+ 1 - 1
pages/index/index.vue

@@ -18,7 +18,7 @@
 		<div class="panel-box" v-if="$hasPermissions('M_homeTodoList_mobile')">
 			<div class="panel-title">
 				<span class="texts">待办单</span>
-				<span class="btns" @click="toDoList">更多
+				<span v-if="$hasPermissions('M_todoList_mobile')" class="btns" @click="toDoList">更多
 					<u-icon name="icon-xian-11" custom-prefix="xd-icon" size="24" color="#4eacfe"></u-icon>
 				</span>
 			</div>

+ 16 - 15
pages/toDoList/toDoList.vue

@@ -47,10 +47,10 @@
 										<u-icon name="info-circle"></u-icon>
 										 未关联问题项
 									</view>
-									 <view class="text-right">
+									 <view class="text-right">  
 										 <text>{{item.putUserName}}</text>
 									 </view>
-									 <view class="icon-xian" >
+									 <view v-if="$hasPermissions('M_backlog_detail_mobile')" class="icon-xian" >
 										 <u-icon name="icon-xian-11" custom-prefix="xd-icon" size="30" color="#888888"></u-icon>
 									 </view>
 								 </view>
@@ -140,7 +140,7 @@
 						sortField: 'handle_time',
 						sortOrder: 'desc'
 					}
-				],
+				], 
 				sortIndex: 1, // 排序下标 默认按发起时间降序
 			}
 		},
@@ -219,8 +219,6 @@
 			},
 			// 查询列表
 			getRow (pageNo) {
-				console.log(222222222)
-			  let _this = this
 			  if (pageNo) {
 			    this.pageNo = pageNo
 			  }
@@ -243,19 +241,19 @@
 			  }
 			  this.status = "loading"
 			  getBackLogList(params).then(res => {
-				if (res.code == 200 || res.status == 204 || res.status == 200) {
-				  if(_this.pageNo>1){
-					  _this.list = _this.list.concat(res.data.list || [])
+				if (res.status == 200) {
+				  if(this.pageNo>1){
+					  this.list = this.list.concat(res.data.list || [])
 				  }else{
-					  _this.list = res.data.list || []
+					  this.list = res.data.list || []
 				  }
-				  _this.total = res.data.count || 0
+				  this.total = res.data.count || 0
 				} else {
-				  _this.list = []
-				  _this.total = 0
-				  _this.noDataText = res.message
+				  this.list = []
+				  this.total = 0
+				  this.noDataText = res.message
 				}
-				_this.status = "loadmore"
+				this.status = "loadmore"
 			  })
 			},
 			resetPage(){
@@ -272,7 +270,7 @@
 			},
 			// 获取查询参数 刷新列表
 			refresh(params){
-				console.log(params,'1111111111')
+				// console.log(params,'1111111111')
 				this.searchParams = params
 				this.getRow(1)
 			},
@@ -284,6 +282,9 @@
 			},
 			// 详细页
 			viewRow(item){
+				if (!this.$hasPermissions('M_backlog_detail_mobile')) {
+					return
+				}
 				// 已完成的
 				uni.navigateTo({
 					url: "/pages/toDoList/backlogDetail?id="+item.id