Jelajahi Sumber

Signed-off-by: 1004749546@qq.com <1004749546@qq.com>
修改

1004749546@qq.com 4 tahun lalu
induk
melakukan
899666542d

+ 7 - 0
api/backLog.js

@@ -14,6 +14,13 @@ export const getBackLogDetail = params => {
     method: 'get'
   })
 }
+// 待办详情 查询问题进度
+export const getBackLogRecord = params => {
+  return axios.request({
+    url: `backlog/record/findByBacklogId/${params.id}`,
+    method: 'get'
+  })
+}
 // 保存待办
 export const saveBackLog = params => {
   return axios.request({

+ 0 - 794
components/HM-filterDropdown/HM-filterDropdown.vue

@@ -1,794 +0,0 @@
-<template>
-	<view class="HMfilterDropdown" :class="{'setDropdownBottom':maskVisibility}" :style="{'top':menuTop+'rpx'}" @touchmove.stop.prevent="discard" @tap.stop="discard">
-		<view class="nav">
-			<block v-for="(item,index) in menu" :key="index">
-				<view class="first-menu" :class="{'on':showPage==index}" @tap="togglePage(index)">
-					<text class="name">{{item.name}}</text>
-					<text class="iconfont triangle" :style="'transform:rotate('+triangleDeg[index]+'deg);'"></text>
-				</view>
-			</block>
-		</view>
-		<view class="mask" :class="{'show':isShowMask,'hide':maskVisibility!=true}" @tap="togglePage(showPage)"></view>
-		<block v-for="(page,page_index) in subData" :key="page_index">
-			<view class="sub-menu-class" :class="{'show':showPage==page_index,'hide':pageState[page_index]!=true}">
-				<block v-if="page.type=='hierarchy'&& page.submenu.length>0">
-					<scroll-view class="sub-menu-list" :class="[activeMenuArr[page_index].length>1?'first':'alone']"
-					 :scroll-y="true" :scroll-into-view="'first_id'+firstScrollInto">
-						<block v-for="(sub,index) in page.submenu" :key="index">
-							<view class="sub-menu" :id="'first_id'+index" :class="{'on':activeMenuArr[page_index][0]==index}" @tap="selectHierarchyMenu(page_index,index,null,null)">
-								<view class="menu-name">
-									<text>{{sub.name}}</text>
-									<text class="iconfont selected"></text>
-								</view>
-							</view>
-						</block>
-					</scroll-view>
-					<block v-for="(sub,index) in page.submenu" :key="index">
-						<scroll-view class="sub-menu-list not-first" :scroll-y="true" v-if="activeMenuArr[page_index][0]==index&&sub.submenu.length>0"
-						 :scroll-into-view="'second_id'+secondScrollInto">
-							<block v-for="(sub_second,second_index) in sub.submenu" :key="second_index">
-								<view class="sub-menu" :id="'second_id'+second_index" :class="{'on':activeMenuArr[page_index][1]==second_index}">
-									<view class="menu-name" @tap="selectHierarchyMenu(page_index,activeMenuArr[page_index][0],second_index,null)">
-										<text>{{sub_second.name}}</text>
-										<text class="iconfont selected"></text>
-									</view>
-									<view class="more-sub-menu" v-if="sub_second.submenu&&sub.submenu.length>0&&sub_second.submenu.length>0">
-										<block v-for="(sub2,sub2_index) in sub_second.submenu" :key="sub2_index">
-											<text v-if="sub_second.showAllSub || (sub2_index<8)" :class="{'on':activeMenuArr[page_index][1]==second_index&&activeMenuArr[page_index][2]==sub2_index}"
-											 @tap="selectHierarchyMenu(page_index,activeMenuArr[page_index][0],second_index,sub2_index)">{{sub2.name}}</text>
-											<text v-if="sub_second.showAllSub!=true && sub2_index==8 && sub_second.submenu.length>9" @tap="showMoreSub(second_index)">更多<text
-												 class="iconfont triangle"></text></text>
-										</block>
-									</view>
-								</view>
-							</block>
-						</scroll-view>
-					</block>
-				</block>
-				<block v-if="page.type=='filter'">
-					<view class="filter">
-						<scroll-view class="menu-box" :scroll-y="true">
-							<view class="box" v-for="(box,box_index) in page.submenu" :key="box_index">
-								<view class="title">{{box.name}}</view>
-								<view class="labels">
-									<view v-for="(label,label_index) in box.submenu" :key="label_index" @tap="selectFilterLabel(page_index,box_index,label_index)"
-									 :class="{'on':label.selected}">{{label.name}}</view>
-								</view>
-							</view>
-						</scroll-view>
-						<view class="btn-box">
-							<view class="reset" @tap="resetFilterData(page_index)">重置</view>
-							<view class="submit" @tap="setFilterData(page_index)">确定</view>
-						</view>
-					</view>
-				</block>
-				<block v-if="page.type=='radio'">
-					<view class="filter">
-						<scroll-view class="menu-box" :scroll-y="true">
-							<view class="box" v-for="(box,box_index) in page.submenu" :key="box_index">
-								<view class="title">{{box.name}}</view>
-								<view class="labels">
-									<view v-for="(label,label_index) in box.submenu" :key="label_index" @tap="selectRadioLabel(page_index,box_index,label_index)"
-									 :class="{'on':label.selected}">{{label.name}}</view>
-								</view>
-							</view>
-						</scroll-view>
-						<view class="btn-box">
-							<view class="reset" @tap="resetFilterData(page_index)">重置</view>
-							<view class="submit" @tap="setFilterData(page_index)">确定</view>
-						</view>
-					</view>
-				</block>
-			</view>
-		</block>
-	</view>
-</template>
-<script>
-	export default {
-		data() {
-			return {
-				subData: [], //菜单数据
-				menu: [], //顶部横条数据
-				showPage: -1, //菜单页面显示/隐藏动画控制
-				pageState: [], //页面的状态
-				activeMenuArr: [], //UI状态
-				shadowActiveMenuArr: [], //记录选中
-				defaultActive:[],
-				triangleDeg: [], //小三角形的翻转动画控制
-				isShowMask: false, //遮罩层显示/隐藏动画控制
-				maskVisibility: false, //遮罩层显示/隐藏状态
-				//滚动区域定位
-				firstScrollInto: 0,
-				secondScrollInto: 0,
-				componentTop:0	,//组件top
-				isReadNewSelect:false
-			}
-		},
-		props: {
-			menuTop:{
-				value: Number,
-				default: false
-			},
-			filterData: {
-				value: Array,
-				default: []
-			},
-			defaultSelected:{
-				value: Array,
-				default: []
-			},
-			updateMenuName:{
-				value: Boolean,
-				default: true
-			},
-			dataFormat:{
-				value: String,
-				default: 'Array'
-			}
-		},
-		watch: {
-			filterData: {
-				handler() {
-					this.initMenu(); //filterData重新赋值初始化菜单
-				},
-				immediate: true
-			},
-			defaultSelected(newVal) {
-
-				if(newVal.length==0){
-					return;
-				}
-				this.defaultActive = JSON.parse(JSON.stringify(newVal));
-				this.activeMenuArr = JSON.parse(JSON.stringify(newVal));
-				this.shadowActiveMenuArr = JSON.parse(JSON.stringify(newVal));
-				if(this.updateMenuName){
-					this.setMenuName();
-				}
-			}
-		},
-		methods: {
-			initMenu() {
-
-				let tmpMenuActiveArr=[];
-				let tmpMenu=[];
-				for (let i = 0; i < this.filterData.length; i++) {
-					let tmpitem = this.filterData[i];
-					tmpMenu.push({
-						//如果没有设置name,则取第一个菜单作为menu.name,filter类型则将"筛选"作为menu.name
-						name: tmpitem.name || (tmpitem.type == "filter" ? "筛选" : tmpitem.submenu[0].name),
-						type: tmpitem.type
-					});
-					//初始化选中项数组-ui状态
-					tmpMenuActiveArr.push(this.processActive(tmpitem));
-					//初始化角度数组
-					this.triangleDeg.push(0);
-					//初始化控制显示状态数组
-					this.pageState.push(false);
-					//递归处理子菜单数据
-					tmpitem = this.processSubMenu(tmpitem);
-					this.filterData[i] = tmpitem;
-				}
-				this.menu = tmpMenu;
-				//初始化选中项数组
-				tmpMenuActiveArr = this.defaultActive.length>0?this.defaultActive:this.activeMenuArr.length>0?this.activeMenuArr:tmpMenuActiveArr;
-				this.defaultActive = [];
-				this.activeMenuArr = JSON.parse(JSON.stringify(tmpMenuActiveArr));
-				this.shadowActiveMenuArr = JSON.parse(JSON.stringify(tmpMenuActiveArr));
-				//加载菜单数据
-				this.subData = this.filterData;
-				//设定顶部菜单名字
-				if(this.updateMenuName){
-					this.setMenuName();
-				}
-			},
-			setMenuName(){
-				for(var i=0;i<this.activeMenuArr.length;i++){
-					let row = this.activeMenuArr[i];
-					if(this.subData[i].type=='hierarchy'){
-						if (typeof(row[0]) == 'number'){
-							let tmpsub = this.subData[i].submenu[row[0]];
-							if(row.length>1){
-								tmpsub = tmpsub.submenu[row[1]];
-								if(row.length>2){
-									tmpsub = tmpsub.submenu[row[2]];
-								}
-							}
-							this.menu[i].name = tmpsub.name;
-						}else{
-							this.menu[i].name = this.subData[i].name;
-						}
-					}
-				}
-			},
-			//展开更多
-			showMoreSub(index) {
-				this.subData[this.showPage].submenu[this.activeMenuArr[this.showPage][0]].submenu[index].showAllSub = true;
-				this.$forceUpdate();
-			},
-			//选中
-			selectHierarchyMenu(page_index, level1_index, level2_index, level3_index) {
-				//读取记录
-				if (level1_index != null && level2_index == null && level3_index == null && this.shadowActiveMenuArr[page_index][0] ==
-					level1_index) {
-					this.activeMenuArr.splice(page_index, 1, JSON.parse(JSON.stringify(this.shadowActiveMenuArr[page_index])));
-				} else {
-					this.activeMenuArr[page_index].splice(0, 1, level1_index);
-					(level2_index!=null||this.activeMenuArr[page_index].length>=2)&&this.activeMenuArr[page_index].splice(1, 1, level2_index) || this.activeMenuArr[page_index].splice(1, 1);
-					(level3_index!=null||this.activeMenuArr[page_index].length>=3)&&this.activeMenuArr[page_index].splice(2, 1, level3_index) || this.activeMenuArr[page_index].splice(2, 1);
-				}
-				//写入结果
-				if (level3_index != null || level2_index != null || (level1_index != null && this.subData[page_index].submenu[level1_index].submenu.length == 0)
-				) {
-					let sub = this.subData[page_index].submenu[level1_index].submenu[level2_index];
-					if(this.updateMenuName){
-						this.menu[page_index].name = (level3_index != null && sub.submenu[level3_index].name) || (level2_index != null && sub.name) || this.subData[page_index].submenu[level1_index].name;
-					}
-					this.shadowActiveMenuArr[page_index] = JSON.parse(JSON.stringify(this.activeMenuArr[page_index]));
-					this.togglePage(this.showPage);
-				}
-			},
-			//写入结果,筛选
-			setFilterData(page_index) {
-				this.shadowActiveMenuArr[page_index] = JSON.parse(JSON.stringify(this.activeMenuArr[page_index]));
-				this.togglePage(this.showPage);
-			},
-			//重置结果和ui,筛选
-			resetFilterData(page_index) {
-				let tmpArr = [];
-				let level = this.shadowActiveMenuArr[page_index].length;
-				while (level > 0) {
-					tmpArr.push([]);
-					let box = this.subData[page_index].submenu[level - 1].submenu;
-					for (let i = 0; i < box.length; i++) {
-						this.subData[page_index].submenu[level - 1].submenu[i].selected = false;
-					}
-					level--;
-				}
-				this.activeMenuArr[page_index] = JSON.parse(JSON.stringify(tmpArr));
-				this.$forceUpdate();
-			},
-			//选中筛选类label-UI状态
-			selectFilterLabel(page_index, box_index, label_index) {
-				let find_index = this.activeMenuArr[page_index][box_index].indexOf(label_index);
-				if (find_index > -1) {
-					this.activeMenuArr[page_index][box_index].splice(find_index, 1);
-					this.subData[page_index].submenu[box_index].submenu[label_index].selected = false;
-				} else {
-					this.activeMenuArr[page_index][box_index].push(label_index);
-					this.subData[page_index].submenu[box_index].submenu[label_index].selected = true;
-				}
-				this.$forceUpdate();
-			},
-			//选中单选类label-UI状态
-			selectRadioLabel(page_index, box_index, label_index) {
-				
-				let activeIndex = this.activeMenuArr[page_index][box_index][0];
-				if(activeIndex == label_index){
-					this.subData[page_index].submenu[box_index].submenu[activeIndex].selected = false;
-					this.activeMenuArr[page_index][box_index][0] = null;
-				}else{
-					if(activeIndex!=null && activeIndex<this.subData[page_index].submenu[box_index].submenu.length){
-						this.subData[page_index].submenu[box_index].submenu[activeIndex].selected = false;
-					}
-					
-					this.subData[page_index].submenu[box_index].submenu[label_index].selected = true;
-					this.activeMenuArr[page_index][box_index][0] = label_index;
-				}
-				this.$forceUpdate();
-			},
-			//菜单开关
-			togglePage(index) {
-				if (index == this.showPage) {
-					this.hidePageLayer(true);
-					this.hideMask();
-					this.showPage = -1;
-				} else {
-					if (this.showPage > -1) {
-						this.hidePageLayer(false);
-					}
-					this.showPageLayer(index);
-					this.showMask();
-				}
-			},
-			//hide遮罩层
-			hideMask() {
-				this.isShowMask = false;
-				setTimeout(() => {
-					this.maskVisibility = false;
-				}, 200);
-			},
-			//show遮罩层
-			showMask() {
-				this.maskVisibility = true;
-				this.$nextTick(() => {
-					setTimeout(() => {
-						this.isShowMask = true;
-					}, 0);
-				})
-			},
-			//hide菜单页
-			hidePageLayer(isAnimation) {
-				this.triangleDeg[this.showPage] = 0;
-				let tmpIndex = this.showPage;
-				if (isAnimation) {
-					setTimeout(() => {
-						this.pageState.splice(tmpIndex, 1, false);
-					}, 200);
-					this.confirm();
-				} else {
-					this.pageState.splice(tmpIndex, 1, false)
-				}
-				this.firstScrollInto = null;
-				this.secondScrollInto = null;
-			},
-			confirm() {
-				let index = JSON.parse(JSON.stringify(this.shadowActiveMenuArr));
-				let value = JSON.parse(JSON.stringify(this.shadowActiveMenuArr));
-				
-				//对结果做一下处理
-				index.forEach((item, i) => {
-					if (typeof(item[0]) == 'object') {
-						//针对筛选结果过一个排序
-						item.forEach((s, j) => {
-							if(s!=null){
-								s.sort((val1, val2) => {
-									return val1 - val2;
-								});
-								item[j] = s;
-								s.forEach((v, k) => {
-									value[i][j][k] = (v==null||v>=this.subData[i].submenu[j].submenu.length)?null:this.subData[i].submenu[j].submenu[v].value;
-									if(this.subData[i].type == 'radio' && value[i][j][k] == null){
-										value[i][j] = [];
-										index[i][j] = [];
-									}
-								});
-							}
-						});
-					}else{
-						let submenu = this.subData[i].submenu[item[0]];
-						value[i][0] = submenu.value;
-						if(value[i].length>=2  && item[1]!=null){
-							if(submenu.submenu.length>0){
-								submenu = submenu.submenu[item[1]];
-								value[i][1] = submenu.hasOwnProperty('value')?submenu.value:null;
-							}else{
-								value[i][1] = null
-							}
-							if(value[i].length>=3 && item[2]!=null){
-								if(submenu.submenu.length>0){
-									submenu = submenu.submenu[item[2]];
-									value[i][2] = submenu.hasOwnProperty('value')?submenu.value:null;
-								}else{
-									value[i][2] = null;
-								}
-							}
-						}
-					}
-					index[i] = item;
-					
-				});
-				// 输出
-				this.$emit('confirm', {
-					index: index,
-					value: value
-				});
-			},
-			//show菜单页
-			showPageLayer(index) {
-				this.processPage(index);
-				this.pageState.splice(index, 1, true);
-				this.$nextTick(() => {
-					setTimeout(() => {
-						this.showPage = index;
-					}, 0);
-				})
-				this.triangleDeg[index] = 180;
-			},
-			reloadActiveMenuArr(){
-				for (let i = 0; i < this.filterData.length; i++) {
-					let tmpitem = this.filterData[i];
-					let tmpArr = this.processActive(tmpitem);
-					tmpitem = this.processSubMenu(tmpitem);
-					if(this.activeMenuArr[i].length!=tmpArr.length){
-						this.filterData[i] = tmpitem;
-						this.activeMenuArr.splice(i, 1, JSON.parse(JSON.stringify(tmpArr)));
-						this.shadowActiveMenuArr.splice(i, 1, JSON.parse(JSON.stringify(tmpArr)));
-					}
-				} 
-				this.subData = this.filterData;
-				this.$forceUpdate();
-			},
-			processPage(index) {
-				//check UI控制数组,结果数组,防止传入数据层级和UI控制数组不同步
-				this.reloadActiveMenuArr();
-				//重置UI控制数组
-				this.activeMenuArr.splice(index, 1, JSON.parse(JSON.stringify(this.shadowActiveMenuArr[index])));
-				if (this.menu[index].type == 'filter') {
-					//重载筛选页选中状态
-					let level = this.shadowActiveMenuArr[index].length;
-					for (let i = 0; i < level; i++) {
-						let box = this.subData[index].submenu[i].submenu;
-						for (let j = 0; j < box.length; j++) {
-							if (this.shadowActiveMenuArr[index][i].indexOf(j) > -1) {
-								this.subData[index].submenu[i].submenu[j].selected = true;
-							} else {
-								this.subData[index].submenu[i].submenu[j].selected = false;
-							}
-						}
-					}
-				} else if (this.menu[index].type == 'hierarchy') {
-					this.$nextTick(() => {
-						setTimeout(() => {
-							//滚动到选中项
-							this.firstScrollInto = parseInt(this.activeMenuArr[index][0]);
-							this.secondScrollInto = parseInt(this.activeMenuArr[index][1]);
-						}, 0);
-					})
-				} else if (this.menu[index].type == 'radio') {
-					//重载筛选页选中状态
-					let level = this.shadowActiveMenuArr[index].length;
-					for (let i = 0; i < level; i++) {
-						let box = this.subData[index].submenu[i].submenu;
-						for (let j = 0; j < box.length; j++) {
-							if (this.shadowActiveMenuArr[index][i].indexOf(j) > -1) {
-								this.subData[index].submenu[i].submenu[j].selected = true;
-							} else {
-								this.subData[index].submenu[i].submenu[j].selected = false;
-							}
-						}
-					}
-				} 
-			},
-			processActive(tmpitem) {
-				let tmpArr = []
-				if (tmpitem.type == 'hierarchy'&&tmpitem.hasOwnProperty('submenu')&&tmpitem.submenu.length>0) {
-					let level = this.getMaxFloor(tmpitem.submenu);
-					while (level > 0) {
-						tmpArr.push(null);
-						level--;
-					}
-				} else if (tmpitem.type == 'filter') {
-					let level = tmpitem.submenu.length;
-					while (level > 0) {
-						tmpArr.push([]);
-						level--;
-					}
-				} else if (tmpitem.type == 'radio') {
-					let level = tmpitem.submenu.length;
-					while (level > 0) {
-						tmpArr.push([]);
-						level--;
-					}
-				}
-				return tmpArr;
-			},
-			processSubMenu(menu) {
-				if (menu.hasOwnProperty('submenu') && menu.submenu.length > 0) {
-					for (let i = 0; i < menu.submenu.length; i++) {
-						menu.submenu[i] = this.processSubMenu(menu.submenu[i]);
-					}
-				} else {
-					menu.submenu = [];
-				}
-				return menu;
-			},
-			//计算菜单层级
-			getMaxFloor(treeData) {
-				let floor = 0
-				let max = 0
-				function each(data, floor) {
-					data.forEach(e => {
-						max = floor > max ? floor : max;
-						if (e.hasOwnProperty('submenu') && e.submenu.length > 0) {
-							each(e.submenu, floor + 1)
-						}
-					})
-				}
-				each(treeData, 1)
-				return max;
-			},
-			discard() {
-
-			}
-		}
-	}
-</script>
-<style lang="scss">
-	.HMfilterDropdown {
-		flex-shrink: 0;
-		width: 100%;
-		position: fixed;
-		// position: sticky;
-		z-index: 997;
-		flex-wrap: nowrap;
-		display: flex;
-		flex-direction: row;
-		top: var(--window-top);
-		left:0;
-		// top:100px;
-		overflow-y: hidden;
-		&.setDropdownBottom{
-			// height: 345px;
-			bottom: 0;
-		}
-		view {
-			display: flex;
-			flex-wrap: nowrap;
-		}
-	}
-	.region {
-		flex: 1;
-		height: 44px;
-	}
-	.nav {
-		width: 100%;
-		height: 44px;
-		border-bottom: solid 1rpx #eee;
-		z-index: 12;
-		background-color: #ffffff;
-		flex-direction: row;
-		.first-menu {
-			width: 100%;
-			font-size: 13px;
-			color: #757575;
-			flex-direction: row;
-			align-items: center;
-			justify-content: center;
-			transition: color .2s linear;
-
-			&.on {
-				color: #ec652b;
-
-				.iconfont {
-					color: #ec652b;
-				}
-			}
-			.name {
-				height: 20px;
-				text-align: center;
-				text-overflow: clip;
-				overflow: hidden;
-			}
-			.iconfont {
-				width: 13px;
-				height: 13px;
-				align-items: center;
-				justify-content: center;
-				transition: transform .2s linear, color .2s linear;
-			}
-		}
-	}
-	.sub-menu-class {
-		width: 100%;
-		position: absolute;
-		left: 0;
-		transform: translate3d(0, - 100%, 0);
-		max-height: 345px;
-		background-color: #ffffff;
-		z-index: 11;
-		box-shadow: 0 5px 5px rgba(0, 0, 0, .1);
-		overflow: hidden;
-		flex-direction: row;
-		transition: transform .15s linear;
-		&.hide {
-			display: none;
-		}
-
-		&.show {
-			transform: translate3d(0, calc(44px + 1rpx), 0);
-		}
-	}
-	.sub-menu-list {
-		width: 100%;
-		height: 345px;
-		flex-direction: column;
-		.sub-menu {
-			min-height: 44px;
-			font-size: 13px;
-			flex-direction: column;
-			padding-right: 15px;
-			>.menu-name {
-				height: 44px;
-				flex-direction: row;
-				align-items: center;
-				justify-content: space-between;
-				>.iconfont {
-					display: none;
-					font-size: 18px;
-					color: #ec652b;
-				}
-			}
-		}
-		&.first {
-			flex-shrink: 0;
-			width: 236rpx;
-			background-color: #f0f0f0;
-			.sub-menu {
-				padding-left: 15px;
-
-				&.on {
-					background-color: #fff;
-				}
-			}
-		}
-		&.alone {
-			max-height: 345px;
-			min-height: 170px;
-			height: auto;
-			.sub-menu {
-				min-height: calc(44px - 1rpx);
-				margin-left: 15px;
-				border-bottom: solid 1rpx #e5e5e5;
-
-				&.on {
-					color: #ec652b;
-
-					>.menu-name {
-						>.iconfont {
-							display: block;
-						}
-					}
-				}
-			}
-		}
-		&.not-first {
-			.sub-menu {
-				min-height: calc(44px - 1rpx);
-				margin-left: 15px;
-				border-bottom: solid 1rpx #e5e5e5;
-				>.menu-name {
-					height: calc(44px - 1rpx);
-					>.iconfont {
-						display: none;
-						font-size: 18px;
-						color: #ec652b;
-					}
-				}
-				&.on {
-					color: #ec652b;
-					>.menu-name {
-						>.iconfont {
-							display: block;
-						}
-					}
-				}
-				.more-sub-menu {
-					flex-direction: row;
-					flex-wrap: wrap;
-					padding-bottom: 9px;
-					>text {
-						height: 30px;
-						border-radius: 3px;
-						background-color: #f5f5f5;
-						color: #9b9b9b;
-						margin-bottom: 6px;
-						margin-right: 6px;
-						text-align: center;
-						line-height: 30px;
-						border: solid #f5f5f5 1rpx;
-						flex: 0 0 calc(33.33% - 6px);
-						overflow: hidden;
-						font-size: 12px;
-						&:nth-child(3n) {
-							margin-right: 0;
-						}
-						&.on {
-							border-color: #f6c8ac;
-							color: #ec652b;
-						}
-						.iconfont {
-							color: #9b9b9b;
-						}
-					}
-				}
-			}
-		}
-	}
-	.filter {
-		width: 100%;
-		height: 345px;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-		align-items: center;
-		.menu-box {
-			width: 698rpx;
-			height: calc(345px - 75px);
-			flex-shrink: 1;
-			.box {
-				width: 100%;
-				margin-top: 16px;
-				flex-direction: column;
-				.title {
-					width: 100%;
-					font-size: 13px;
-					color: #888;
-				}
-				.labels {
-					flex-direction: row;
-					flex-wrap: wrap;
-					.on {
-						border-color: #ec652b;
-						background-color: #ec652b;
-						color: #fff;
-					}
-					>view {
-						width: 148rpx;
-						height: 30px;
-						border: solid 1rpx #adadad;
-						border-radius: 2px;
-						margin-right: 15px;
-						margin-top: 8px;
-						font-size: 12px;
-						flex-direction: row;
-						justify-content: center;
-						align-items: center;
-						&:nth-child(4n) {
-							margin-right: 0;
-						}
-					}
-				}
-			}
-		}
-		.btn-box {
-			flex-shrink: 0;
-			width: 698rpx;
-			height: 75px;
-			flex-direction: row !important;
-			align-items: center;
-			justify-content: space-between;
-			>view {
-				width: 320rpx;
-				height: 40px;
-				border-radius: 40px;
-				border: solid 1rpx #ec652b;
-				align-items: center;
-				justify-content: center;
-			}
-			.reset {
-				color: #ec652b;
-			}
-			.submit {
-				color: #fff;
-				background-color: #ec652b;
-			}
-		}
-	}
-	.mask {
-		z-index: 10;
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background-color: rgba(0, 0, 0, 0);
-		transition: background-color .15s linear;
-		&.show {
-			background-color: rgba(0, 0, 0, 0.5);
-		}
-		&.hide {
-			display: none;
-		}
-	}
-	/* 字体图标 */
-	@font-face {
-		font-family: "HM-FD-font";
-		src: url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAALAAAsAAAAABpQAAAJzAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCDBgp4gQIBNgIkAwwLCAAEIAWEbQc5G8sFERWMIbIfCbbzqA4hp7InSBibVsYGb4J42o82b3e/nJlHMw/NHbGOlwKJRCRpwzPtpAECCOZubdqxjYpQLMlVg+70/08edrgQOtx2ukpVyApZn+dyehPoQObHo3O85rYx9vOjXoBxQIHugW2yIkqIW2QXcScu4jwE8CSWbKSmrqUHFwOaJoCsLM5P4haSGIxRcRHshrUGucLCVcfqI3AZfV/+USguKCwNmtsxVztDxU/n55C+3W0Z4QQpEOTNFqCBbMCAjDUWB9CIwWk87aa70cYgqLkyd3dEmm+18R8eKATEBrV7A5CulBT8dKiWOYZk412XNcDdKSEKSGODnyKIDl+dmVt9/Dx4pu/xyeutkMlHISGPTsPCnoTNP9nOT6wTtDdlO6dPr47efvj942lkYuQzrhMKEjq9N6y98P3340gmlJ/RStUD6F31CAEEPtUW94/7rf+7XgaAz57X0ZHXAGsFFwVgw38yALuMb0IBbVyNamFYEw4oKMDTj3AHRQP5Pt4dci9VwSVkRNQh5r7CLskZadhsWHhRDBsXczk8ZYk3ewnCxmQeQKa3BOHvA8XXO2j+vqRhf7CE+sPmn4anvoL29JLa4qqaUQkmoK+QG2osCckq7txi2leK86aIPyJ3eQZ8xytXYmyQ51jQndJAxIJlqiGSLsOqImiZCjTiZCJt6Lq26U2OoXqwUo0hRaAE0K5AziANy/uLVeXzWyjVqyjcoeupjxDr5MMDn8MDkLG9Aenu5ZrOSSoghAUsRmogkkahSoWAtnlUARnCkY3It0Iu7mWhdmd9Z/19BwBP6GidEi0G56opckXTGZVSPxgAAAA=');
-	}
-	.iconfont {
-		font-family: "HM-FD-font" !important;
-		font-size: 13px;
-		font-style: normal;
-		color: #757575;
-		&.triangle {
-			&:before {
-				content: "\e65a";
-			}
-		}
-		&.selected {
-			&:before {
-				content: "\e607";
-			}
-		}
-	}
-</style>

+ 69 - 24
pages/toDoList/backlogDetail.vue

@@ -1,15 +1,16 @@
 <template>
 	<view class="back-content">
 		<!-- 轮播图 -->
-		<swiper class="top-ad-swiper" :indicator-dots="false" :autoplay="true" :interval="5000" :duration="600" :circular="true">
-			<swiper-item v-if="infoData.backlogPhotoList && infoData.backlogPhotoList.length" v-for="(item,index) in infoData.backlogPhotoList" :key="index">
+		<swiper v-if="infoData.backlogPhotoList && infoData.backlogPhotoList.length" class="top-ad-swiper" :indicator-dots="false" :autoplay="true" :interval="5000" :duration="600" :circular="true">
+			<swiper-item v-for="(item,index) in infoData.backlogPhotoList" :key="index">
 				<div class="swiper-item uni-bg-red">
-					<!-- <image class="swiper-item-imgse" :fade-show='true' :src="item.photo"></image> -->
 					<u-image mode="scaleToFill" width="750upx" height="400upx" :src="item.photo"></u-image>
 				</div>
 			</swiper-item>
-			<u-image v-else mode="scaleToFill" width="750upx" height="400upx" src="/static/noPic.jpg"></u-image>
 		</swiper>
+		<view v-else class="noPic">
+			暂无图片
+		</view>
 		<view class="back-text">
 			<!-- 门店 -->
 			<view class="text-item">
@@ -19,7 +20,7 @@
 			<view class="text-item">
 				<view>
 					<text>处理人</text>
-					<text class="margin-left ellipsis-one">张三丰</text>
+					<text class="margin-left ellipsis-one">{{infoData.receiveUserName}}</text>
 				</view>
 				<view class="time ">
 					{{infoData.effectiveEndTime}} 到期
@@ -29,7 +30,7 @@
 			<view class="text-item">
 				<view>
 					<text>创建人</text>
-					<text class="margin-left ellipsis-one">张三丰</text>
+					<text class="margin-left ellipsis-one">{{infoData.putUserName}}</text>
 				</view>
 				<view class="time">
 					{{infoData.createTime}} 创建
@@ -58,42 +59,38 @@
 			<u-steps :list="numList" direction ="column" :current="0"></u-steps>
 		</view>
 		<view class="footer">
-			<u-button v-if="infoData.status=='待整改'" type="primary">整改完成</u-button>
-			<view v-else-if="infoData.status=='待审核'" class="check-pending">
+			<!-- receiveFlag   接收人/责任人标记 只有处理人可以整改-->
+			<u-button v-if="infoData.receiveFlag && infoData.receiveFlag == 1 && infoData.status=='PENDING'" type="primary">整改完成</u-button>
+			<!-- putFlag  创建人标记 只有创建人可以审核-->
+			<view v-if="infoData.putFlag && infoData.putFlag == 1 && infoData.status=='CHECK_PENDING'" class="check-pending">
 				<u-button class="act-btn" type="error">整改不通过</u-button>
 				<u-button class="act-btn" type="success">整改通过</u-button>
 			</view>
-			<view v-else class="comment-input">
+			<!-- copyFlag    抄送标识  只有抄送人可以评论-->
+			<view v-if="infoData.copyFlag && infoData.copyFlag==1" class="comment-input">
 				<input type="text" v-model="comment" @confirm="sendComment" placeholder="请输入评论..."/>
-				<view>整改状态:{{infoData.status}}</view>
+				<view>整改状态:<text :class="clsStatus()">{{infoData.status}}</text></view>
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
-	import { getBackLogDetail } from '@/api/backLog.js'
+	import { getBackLogDetail, getBackLogRecord } from '@/api/backLog.js'
 	export default {
 		components: {
 		},
 		data() {
 			return {
 				infoData:{}, // 详情数据
-				numList: [
-					{
-						name: '2020-08-09 \xa0\xa0\xa0\xa0\审核问题 \xa0\xa0\xa0\xa0\审核通过',
-					}, {
-						name: '2020-08-09 审核问题  审核不通过'
-					}, {
-						name: '2020-08-09 \xa0\xa0\xa0\xa0\创建问题 \xa0\xa0\xa0\xa0\ 抄送 \xa0\xa0\xa0\xa0\所有人'
-					},
-				 ],
+				numList: [],
 				 comment: '' // 评论
 			}
 		},
 		onLoad(option) {
 			console.log(option.id)
 			this.getData(option.id)
+			this.getRecordData(option.id)
 		},
 		methods: {
 			// 获取详情数据
@@ -107,8 +104,40 @@
 					}
 				})
 			},
+			// 获取进度数据
+			getRecordData (id) {
+				getBackLogRecord({id:id}).then(res=>{
+					if(res.status==200){
+						let arr = []
+						res.data.map(item=>{
+							const p = {}
+							p.name = item.handleTime + "'\xa0\xa0\xa0\xa0\xa0\xa0\'" + item.handleType + "'\xa0\xa0\xa0\xa0\xa0\xa0\'" + (item.handleDesc ? item.handleDesc : '')
+							arr.push(p)
+						})
+						this.numList = arr
+					} else {
+						this.toashMsg(res.message)
+						this.numList = []
+					}
+				})
+			},
 			sendComment (v) {
 				
+			},
+			// 状态颜色处理
+			clsStatus(status){
+				if(status == '待审核'){
+					return 'dsh'
+				}
+				if(status == '待整改'){
+					return 'dzg'
+				}
+				if(status == '整改完成'){
+					return 'ywc'
+				}
+				if(status == '已过期'){
+					return 'ygq'
+				}
 			}
 		}
 	}
@@ -124,15 +153,19 @@
 		.top-ad-swiper{
 			height: 340upx;
 		}
-		.swiper-item-imgse{
+		.noPic{
 			width: 750upx;
-			height: 340upx;
+			height: 400upx;
+			font-size: 38upx;
+			text-align: center;
+			line-height: 400upx;
+			color: #666;
 		}
 		// 详情内容
 		.back-text{
 			background: #ffffff;
 			padding: 10upx 20upx;
-			margin: 20upx 0;
+			margin-bottom: 20upx;
 			border-radius: 6upx;
 			box-shadow: 1px 1px 3px #EEEEEE;
 			.text-item{
@@ -166,7 +199,7 @@
 		// 底部按钮
 		.footer {
 			background-color: #fff;
-			margin-top: 20upx;
+			// margin-top: 20upx;
 			.check-pending{
 				display: flex;
 				.act-btn {
@@ -185,6 +218,18 @@
 					margin-top: 20upx;
 				}
 			}
+			.dsh{
+				color: red;
+			}
+			.dzg{
+				color: #007AFF;
+			}
+			.ygq {
+				color: #999;
+			}
+			.ywc {
+				color: #10c71e;
+			}
 		}
 	}
 </style>

+ 17 - 2
pages/toDoList/searchModal.vue

@@ -29,16 +29,29 @@
 				<button type="info" @click="resetForm">重置</button>
 			</view>
 			<!-- 时间选择器 -->
-			<mx-date-picker class="date-picker" :show="showPicker" type="range" format="yyyy-mm-dd" :value="form.time" :show-tips="true" @confirm="onSelected" @cancel="showPicker=false" />
+			<w-picker
+			class="date-picker"
+				:visible.sync="showPicker"
+				mode="range" 
+				:current="true"
+				fields="day"
+				@confirm="onSelected($event,'range')"
+				@cancel="showPicker=false"
+				ref="date" 
+			></w-picker>
+			<!-- <mx-date-picker class="date-picker" :show="showPicker" type="range" format="yyyy-mm-dd" :value="form.time" :show-tips="true" @confirm="onSelected" @cancel="showPicker=false" /> -->
 		</u-popup>
+		
 	</div>
 </template>
 
 <script>
+	import wPicker from "@/components/w-picker/w-picker.vue"
 	import MxDatePicker from "@/components/mx-datepicker/mx-datepicker.vue"
 	export default {
 		components: {
-			MxDatePicker
+			MxDatePicker,
+			wPicker
 		},
 		props: {
 			visible: {
@@ -192,6 +205,8 @@
 				this.sourceTypeList.map(item=>{
 					item.checked = false
 				})
+				this.$emit('refresh',{})
+				this.isshow = false
 			}
 		},
 	}

+ 40 - 64
pages/toDoList/toDoList.vue

@@ -15,24 +15,20 @@
 					 swiperWidth="750"></u-tabs-swiper>
 				</view>
 				<view class="all-filter" v-show="current==2">
-					<u-dropdown>
-						<u-dropdown-item v-model="createTimeSort" title="发起时间" :options="createTimeSortList"></u-dropdown-item>
-						<u-dropdown-item v-model="handleTimeSort" title="处理时间" :options="handleTimeSortList"></u-dropdown-item>
-					</u-dropdown>
-					<!-- <u-row>
+					<u-row>
 						<text>发起时间</text>
-						<view class="filter-icon">
-							<u-icon @click="changeSort(0)" name="arrow-up-fill" :color="(sortIndex===0)?'#2979ff':'#888888'" size="24"></u-icon>
-							<u-icon @click="changeSort(1)" name="arrow-down-fill" :color="(sortIndex===1)?'#2979ff':'#888888'" size="24"></u-icon>
+						<view @click="changeSort('createTime')" class="filter-icon">
+							<u-icon name="arrow-up-fill" :color="(sortIndex===0)?'#2979ff':'#888888'" size="24"></u-icon>
+							<u-icon name="arrow-down-fill" :color="(sortIndex===1)?'#2979ff':'#888888'" size="24"></u-icon>
 						</view>
 					</u-row>
 					<u-row>
 						<text>处理时间</text>
-						<view class="filter-icon">
-							<u-icon @click="changeSort(2)" name="arrow-up-fill" :color="(sortIndex===2)?'#2979ff':'#888888'" size="24"></u-icon>
-							<u-icon @click="changeSort(3)" name="arrow-down-fill" :color="(sortIndex===3)?'#2979ff':'#888888'" size="24"></u-icon>
+						<view @click="changeSort('handleTime')" class="filter-icon">
+							<u-icon name="arrow-up-fill" :color="(sortIndex===2)?'#2979ff':'#888888'" size="24"></u-icon>
+							<u-icon name="arrow-down-fill" :color="(sortIndex===3)?'#2979ff':'#888888'" size="24"></u-icon>
 						</view>
-					</u-row> -->
+					</u-row>
 					<view class="filter" @click="showSearch=true">
 						<text>筛选</text>
 						<u-icon name="shaixuan" custom-prefix="xd-icon" size="32" color="#888888"></u-icon>
@@ -45,7 +41,7 @@
 							class="check-order-list" 
 							v-if="index==current"
 							v-for="(item,sindex) in list" 
-							:key="item.id"
+							:key="item.id+item.backlogNo"
 							@click="viewRow(item)"
 							>
 								 <view class="check-row">
@@ -68,7 +64,7 @@
 										{{item.sourceType}}
 									 </view>
 									 <view class="text-right">
-										 <text class="mark">
+										 <text v-if="item.copyFlag && item.copyFlag == 1" class="mark">
 										 	抄送
 										 </text>
 										 <view :class="['status',clsStatus(item.status)]">{{item.status}}</view>
@@ -99,7 +95,7 @@
 		data() {
 			return {
 				showSearch: false, // 是否显示搜索弹框
-				searchParams: null, // 全部查询数据参数
+				searchParams: {}, // 全部查询数据参数
 				status: 'loadmore',
 				noDataText: '暂无数据',
 				background: {
@@ -132,36 +128,6 @@
 				action:'swiperChange', // 操作类型,上划分页,或左右滑动
 				sortField: 'create_time', // 全部  排序字段 默认按发起时间
 				sortOrder: 'desc', // 全部  排序字段 默认按发起时间降序
-				createTimeSort: 'desc',
-				handleTimeSort: null,
-				createTimeSortList: [
-					{
-						label: '默认排序',
-						value: ''
-					},
-					{
-						label: '升序',
-						value: 'asc'
-					},
-					{
-						label: '降序',
-						value: 'desc'
-					},
-				],
-				handleTimeSortList: [
-					{
-						label: '默认排序',
-						value: ''
-					},
-					{
-						label: '升序',
-						value: 'asc'
-					},
-					{
-						label: '降序',
-						value: 'desc'
-					},
-				],
 				sortList: [  // 排序列表
 					{
 						sortField: 'create_time',
@@ -184,9 +150,15 @@
 			}
 		},
 		onLoad() {
-			this.getRow()
+			this.pageInit()
 		},
 		methods:{
+			pageInit () {
+				this.sortIndex = 1
+				this.searchParams = {}
+				this.pageNo = 1
+				this.getRow()
+			},
 			// tabs通知swiper切换
 			tabsChange(index) {
 				this.swiperCurrent = index;
@@ -216,8 +188,14 @@
 				}
 			},
 			// 全部 排序
-			changeSort (index) {
-				this.sortIndex = this.sortIndex === index ? null : index
+			changeSort (type) {
+				if (type === 'createTime') {
+					this.sortIndex = this.sortIndex === 1 ? 0 : 1
+				}
+				if (type === 'handleTime') {
+					this.sortIndex = this.sortIndex === 2 ? 3 : 2
+				}
+				this.getRow(1)
 			},
 			// scroll-view到底部加载更多
 			onreachBottom() {
@@ -239,17 +217,18 @@
 			    pageNo: this.pageNo,
 			    pageSize: this.pageSize,
 			    queryLabel: this.tabList[this.current].queryLabel, // tab分类
-			    status: '', // 状态(pending 待整改 check_pending待审核 finished 整改完成 expired 已过期)
-			    sourceType: '', // 问题来源(远程巡店 VIDEO_INSPECTION /现场巡店 SPOT_INSPECTION/点检 POINT_INSPECTION /手动创建  MANUAL)
-			    putUserName: '', // 巡店人
-			    storeName: '', // 门店名称
-				createTime: '', // 发起时间
-				sortField: '', // 排序字段 create_time  发起时间  handle_time 处理时间
-				sortOrder: '' // asc 升序    desc 降序
 			  }
 			  if (params.queryLabel == 'ALL') {
-				  params.sortField = this.sortIndex === null ? '' :this.sortList[this.sortIndex].sortField
-				  params.sortOrder = this.sortIndex === null ? '' :this.sortList[this.sortIndex].sortOrder
+				  // 排序字段 create_time  发起时间  handle_time 处理时间
+				  params.sortField = this.sortList[this.sortIndex].sortField
+				  // asc 升序    desc 降序
+				  params.sortOrder = this.sortList[this.sortIndex].sortOrder
+				  params.statusList = this.searchParams.status ? this.searchParams.status : [] // 状态(pending 待整改 check_pending待审核 finished 整改完成 expired 已过期)
+				  params.sourceTypeList = this.searchParams.sourceType ? this.searchParams.sourceType : [] // 问题来源(远程巡店 VIDEO_INSPECTION /现场巡店 SPOT_INSPECTION/点检 POINT_INSPECTION /手动创建  MANUAL)
+				  params.putUserName = this.searchParams.putUserName ? this.searchParams.putUserName : '' // 巡店人
+				  params.storeName = this.searchParams.storeName ? this.searchParams.storeName : '' // 门店名称
+				  params.beginDate = this.searchParams.beginDate ? this.searchParams.beginDate : '' // 发起开始时间
+				  params.endDate = this.searchParams.endDate ? this.searchParams.endDate : '' // 发起结束时间
 			  }
 			  this.status = "loading"
 			  getBackLogList(params).then(res => {
@@ -280,7 +259,7 @@
 					this.getRow(1);
 				}
 			},
-			// 查询刷新
+			// 获取查询参数 刷新列表
 			refresh(params){
 				console.log(params,'1111111111')
 				this.searchParams = params
@@ -379,11 +358,8 @@
 				.filter-icon{
 					display: flex;
 					flex-direction: column;
-					margin-left: 10upx;
-				}
-				.filter{
-					width: 30%;
-					text-align: center;
+					// margin-left: 10upx;
+					padding: 20upx;
 				}
 			}
 			// 列表样式
@@ -430,7 +406,7 @@
 					// 状态
 					.status {
 						display: inline-block;
-						width: 150upx;
+						width: 200upx;
 					}
 					.dsh{
 						color: red;

TEMPAT SAMPAH
static/noPic.jpg