Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/aiot-app into dengfei

api/wt/index.js

@@ -74,6 +74,18 @@ export async function getDoneTaskPage(query) {
 	}
 	return Promise.reject(new Error(res.message));
 }
+
+
+//获取已办事项列表
+export async function getDoneTaskList(query) {
+	const res = await postJ(
+		Vue.prototype.apiUrl + `/bpm/task/done-page`, query, true
+	);
+	if (res.code == 0) {
+		return res.data;
+	}
+	return Promise.reject(new Error(res.message));
+}
 //获取流程详情
 export async function getTaskListByProcessinstanceid(query) {
 	const res = await get(

components/MySearch/MySearch.vue

@@ -0,0 +1,130 @@
+<template>
+
+	<u-popup lock-scroll :show="show" closeOnClickOverlay mode="top" @close="close" @open="open">
+		<view class="container">
+			<u--form ref="form" labelPosition="left" :model="formData" labelWidth="180" labelAlign="left">
+				<block v-for="(item, index) in formItems" :key="index">
+					<!-- <slot name='slot'></slot> -->
+					<u-form-item :label="item.label" :prop="item.prop">
+						<component :is="item.component" v-model="formData[item.prop]" v-bind="item.props"
+							v-on="item.events" />
+					</u-form-item>
+				</block>
+
+			</u--form>
+
+			<view class="action">
+				<u-button text="重置" shape="circle" style="color: #000;" @click="reset"></u-button>
+				<u-button type="primary" text="确定" shape="circle" @click="search"></u-button>
+			</view>
+			
+			
+
+		</view>
+	</u-popup>
+
+</template>
+
+<script>
+	import MyInput from '@/uni_modules/uview-ui/components/u--input/u--input.vue'
+	import MyPicker from '@/uni_modules/uview-ui/components/u-picker/u-picker.vue'
+	import MyDateRange from '@/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue'
+
+
+	export default {
+		name: "MySearch",
+		components: {
+			MyInput,
+			MyPicker,
+			MyDateRange
+		},
+		props: {
+			show: {
+				type: Boolean,
+				default: false
+			},
+			formItems: {
+				type: Array,
+				default: () => []
+			},
+			initialData: {
+				type: Object,
+				default: () => ({})
+			}
+		},
+		data() {
+			return {
+				formData: {},
+			};
+		},
+		watch: {
+			initialData: {
+				handler(newVal) {
+					this.formData = {
+						...newVal
+					};
+				},
+				deep: true
+			}
+		},
+		methods: {
+			
+			
+			
+			change(){
+				console.log(this);
+			},
+			open() {
+
+			},
+			close() {
+				this.$emit('update:show', false)
+			},
+			maskClick(e) {
+				console.log('maskClick事件:', e);
+			},
+			reset() {
+				this.formData = {}
+				console.log(this.formData);
+			},
+			search() {
+				this.close()
+				this.$emit('search',this.formData)
+			}
+		},
+		created() {
+			console.log(this);
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		padding: 20rpx;
+	}
+
+	/deep/.u-form-item__body {
+		padding: 16rpx 0
+	}
+
+	/deep/.uni-date__icon-clear {
+		border: none !important;
+		transform: translateY(25%);
+	}
+
+	.action {
+		padding: 20rpx;
+		display: flex;
+
+	}
+
+	/deep/.u-button {
+		width: 40%;
+	}
+
+	.form-button-container {
+		display: flex;
+		justify-content: space-around;
+		margin-top: 20px;
+	}
+</style>

pages.json

@@ -1,4 +1,8 @@
 {
+
+	"easycom": {
+		"^u-(.*)": "@/uni_modules/uview-ui/components/u-$1/u-$1.vue"
+	},
 	"pages": [
 		//pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
@@ -1952,21 +1956,21 @@
 			}
 		},
 		{
-					"path": "pages/saleManage/businessOpportunity/followList",
-					"style": {
-						"navigationBarTitleText": "商机跟进记录",
-						"navigationStyle": "custom",
-						"navigationBarTextStyle": "white"
-					}
-				},
-				{
-					"path": "pages/saleManage/contact/followList",
-					"style": {
-						"navigationBarTitleText": "客户跟进记录",
-						"navigationStyle": "custom",
-						"navigationBarTextStyle": "white"
-					}
-				},
+			"path": "pages/saleManage/businessOpportunity/followList",
+			"style": {
+				"navigationBarTitleText": "商机跟进记录",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/saleManage/contact/followList",
+			"style": {
+				"navigationBarTitleText": "客户跟进记录",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
 		{
 			"path": "pages/saleManage/components/selectContact",
 			"style": {
@@ -2021,7 +2025,7 @@
 				"navigationStyle": "custom",
 				"navigationBarTextStyle": "white"
 			}
-		},{
+		}, {
 			"path": "pages/saleManage/saleOrder/components/drawer",
 			"style": {
 				"navigationBarTitleText": "订单详情",
@@ -2046,173 +2050,173 @@
 			}
 		},
 		{
-					"path": "pages/saleManage/components/selectProject",
-					"style": {
-						"navigationBarTitleText": "选择项目",
-						"navigationStyle": "custom",
-						"navigationBarTextStyle": "white"
-					}
-				},
-				{
-					"path": "pages/doc/selectDoc",
-					"style": {
-						"navigationBarTitleText": "关联文档库",
-						"navigationStyle": "custom",
-						"navigationBarTextStyle": "white"
-					}
-				},
-				{
-					"path": "pages/doc/docList",
-					"style": {
-						"navigationBarTitleText": "文档管理",
-						"navigationStyle": "custom",
-						"navigationBarTextStyle": "white"
-					}
-				},
-				{
-					"path": "pages/salesServiceManagement/demandList/index",
-					"style": {
-						"navigationBarTitleText": "售后需求",
-						"navigationStyle": "custom",
-						"navigationBarTextStyle": "white"
-					}
-				},
-				{
-					"path": "pages/salesServiceManagement/demandList/add",
-					"style": {
-						"navigationBarTitleText": "新增需求",
-						"navigationStyle": "custom",
-						"navigationBarTextStyle": "white"
-					}
-				},
-				{
-					"path": "pages/salesServiceManagement/demandList/components/Invoice",
-					"style": {
-						"navigationBarTitleText": "发货单",
-						"navigationStyle": "custom",
-						"navigationBarTextStyle": "white"
-					}
-				},
-				{
-					"path": "pages/salesServiceManagement/demandList/components/faultAdd",
-					"style": {
-						"navigationBarTitleText": "故障信息",
-						"navigationStyle": "custom",
-						"navigationBarTextStyle": "white"
-					}
-				},
-				{
-					"path": "pages/salesServiceManagement/demandList/components/contactAdd",
-					"style": {
-						"navigationBarTitleText": "联系人信息",
-						"navigationStyle": "custom",
-						"navigationBarTextStyle": "white"
-					}
-				},
-				{
-					"path": "pages/salesServiceManagement/demandList/components/submission",
-					"style": {
-						"navigationBarTitleText": "需求审核",
-						"navigationStyle": "custom",
-						"navigationBarTextStyle": "white"
-					}
-				},
-				{
-					"path": "pages/salesServiceManagement/workOrder/index",
-					"style": {
-						"navigationBarTitleText": "售后工单",
-						"navigationStyle": "custom",
-						"navigationBarTextStyle": "white"
-					}
-				},
-				{
-					"path": "pages/salesServiceManagement/workOrder/components/editPlan", 
-					"style": {
-						"navigationBarTitleText": "修改工单",
-						"navigationStyle": "custom",
-						"navigationBarTextStyle": "white"
-					}
-				},
-				{
-					"path": "pages/salesServiceManagement/workOrder/components/schemeAdd", 
-					"style": {
-						"navigationBarTitleText": "添加方案",
-						"navigationStyle": "custom",
-						"navigationBarTextStyle": "white"
-					}
-				},
-				{
-					"path": "pages/salesServiceManagement/workOrder/components/selectProduct", 
-					"style": {
-						"navigationBarTitleText": "选择产品",
-						"navigationStyle": "custom",
-						"navigationBarTextStyle": "white"
-					}
-				},
-				{
-					"path": "pages/salesServiceManagement/workOrder/components/accessory", 
-					"style": {
-						"navigationBarTitleText": "配件信息",
-						"navigationStyle": "custom",
-						"navigationBarTextStyle": "white"
-					}
-				},
-				{
-					"path": "pages/salesServiceManagement/workOrder/components/accessoryAdd", 
-					"style": {
-						"navigationBarTitleText": "添加配件",
-						"navigationStyle": "custom",
-						"navigationBarTextStyle": "white"
-					}
-				},
-				{
-					"path": "pages/salesServiceManagement/workOrder/components/forWork/transfer", 
-					"style": {
-						"navigationBarTitleText": "转派",
-						"navigationStyle": "custom",
-						"navigationBarTextStyle": "white"
-					}
-				},
-				{
-					"path": "pages/salesServiceManagement/accessory/index", 
-					"style": {
-						"navigationBarTitleText": "配件申请记录",
-						"navigationStyle": "custom",
-						"navigationBarTextStyle": "white"
-					}
-				},
-				{
-					"path": "pages/salesServiceManagement/recycle/index", 
-					"style": {
-						"navigationBarTitleText": "配件回收记录",
-						"navigationStyle": "custom",
-						"navigationBarTextStyle": "white"
-					}
-				},
-				{
-					"path": "pages/salesServiceManagement/accessory/accessoryAdd", 
-					"style": {
-						"navigationBarTitleText": "配件信息",
-						"navigationStyle": "custom",
-						"navigationBarTextStyle": "white"
-					}
-				},
-				{
-					"path": "pages/salesServiceManagement/accessory/components/selectWork", 
-					"style": {
-						"navigationBarTitleText": "选择工单",
-						"navigationStyle": "custom",
-						"navigationBarTextStyle": "white"
-					}
-				},
-				{
-					"path": "pages/salesServiceManagement/recycle/recycleAdd", 
-					"style": {
-						"navigationBarTitleText": "配件回收新增",
-						"navigationStyle": "custom",
-						"navigationBarTextStyle": "white"
-					}
-				}
+			"path": "pages/saleManage/components/selectProject",
+			"style": {
+				"navigationBarTitleText": "选择项目",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/doc/selectDoc",
+			"style": {
+				"navigationBarTitleText": "关联文档库",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/doc/docList",
+			"style": {
+				"navigationBarTitleText": "文档管理",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/salesServiceManagement/demandList/index",
+			"style": {
+				"navigationBarTitleText": "售后需求",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/salesServiceManagement/demandList/add",
+			"style": {
+				"navigationBarTitleText": "新增需求",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/salesServiceManagement/demandList/components/Invoice",
+			"style": {
+				"navigationBarTitleText": "发货单",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/salesServiceManagement/demandList/components/faultAdd",
+			"style": {
+				"navigationBarTitleText": "故障信息",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/salesServiceManagement/demandList/components/contactAdd",
+			"style": {
+				"navigationBarTitleText": "联系人信息",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/salesServiceManagement/demandList/components/submission",
+			"style": {
+				"navigationBarTitleText": "需求审核",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/salesServiceManagement/workOrder/index",
+			"style": {
+				"navigationBarTitleText": "售后工单",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/salesServiceManagement/workOrder/components/editPlan",
+			"style": {
+				"navigationBarTitleText": "修改工单",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/salesServiceManagement/workOrder/components/schemeAdd",
+			"style": {
+				"navigationBarTitleText": "添加方案",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/salesServiceManagement/workOrder/components/selectProduct",
+			"style": {
+				"navigationBarTitleText": "选择产品",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/salesServiceManagement/workOrder/components/accessory",
+			"style": {
+				"navigationBarTitleText": "配件信息",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/salesServiceManagement/workOrder/components/accessoryAdd",
+			"style": {
+				"navigationBarTitleText": "添加配件",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/salesServiceManagement/workOrder/components/forWork/transfer",
+			"style": {
+				"navigationBarTitleText": "转派",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/salesServiceManagement/accessory/index",
+			"style": {
+				"navigationBarTitleText": "配件申请记录",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/salesServiceManagement/recycle/index",
+			"style": {
+				"navigationBarTitleText": "配件回收记录",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/salesServiceManagement/accessory/accessoryAdd",
+			"style": {
+				"navigationBarTitleText": "配件信息",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/salesServiceManagement/accessory/components/selectWork",
+			"style": {
+				"navigationBarTitleText": "选择工单",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/salesServiceManagement/recycle/recycleAdd",
+			"style": {
+				"navigationBarTitleText": "配件回收新增",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		}
 	],
 	"tabBar": {
 		"color": "#908f8f",
@@ -2220,8 +2224,7 @@
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
 		"fontSize": "14px",
-		"list": [
-			{
+		"list": [{
 				"pagePath": "pages/home/home",
 				"iconPath": "static/tab/home.png",
 				"selectedIconPath": "static/tab/home_.png",
@@ -2250,4 +2253,4 @@
 	"app-plus": {
 		"softinputMode": "adjustPan"
 	}
-}
+}

pages/home/home.vue

@@ -476,7 +476,7 @@
 				color: #fff;
 
 				.num {
-					font-size: 48rpx;
+					font-size: 40rpx;
 				}
 
 				.label {
@@ -597,7 +597,7 @@
 				color: #000;
 
 				.num {
-					font-size: 48rpx;
+					font-size: 40rpx;
 				}
 
 				.label {

pages/home/wt/done/done.vue

@@ -14,7 +14,7 @@
 
 					<view class="kd-card">
 						<view class="card-title">
-							<text>{{ item.processInstance.name }}</text>
+							<text>{{ item.name }}</text>
 							<text
 								:class="item.result == 0 ? 'text-danger' : 'text-primary'">{{ handleResult[item.result] }}</text>
 						</view>
@@ -22,8 +22,8 @@
 							<view class="card-body">
 								
 								<view class="card-col">
-									<text class="label">流程节点</text>
-									<text class="content">{{ item.name }}</text>
+									<text class="label">流程名称</text>
+									<text class="content">{{ item.processInstance.name }}</text>
 								</view>
 								<view class="card-col">
 									<text class="label">审批意见</text>
@@ -48,14 +48,18 @@
 
 <script>
 	import {
-		getDoneTaskPage
+		getDoneTaskPage,
+		getDoneTaskList
 	} from '@/api/wt/index.js'
 
-	let [page, isEnd] = [1, false]
+	// let [page, isEnd] = [1, false]
 	export default {
 		components: {},
 		data() {
 			return {
+				page:1,
+				size:10,
+				isEnd:false,
 				list: [],
 				handleResult: {
 					0: '驳回',
@@ -117,7 +121,7 @@
 			}
 		},
 		onShow() {
-			page = 1
+			this.page = 1
 			this.getList()
 		},
 		methods: {
@@ -129,7 +133,7 @@
 			
 			},
 			doSearch() {
-				page = 1
+				this.page = 1
 				this.list = []
 				this.getList()
 			},
@@ -137,13 +141,13 @@
 				this.searchData = {
 					name: '',
 				}
-				page = 1
+				this.page = 1
 				this.list = []
 				this.getList()
 			},
 			scrolltolower() {
-				if (isEnd) return
-				page++
+				if (this.isEnd) return
+				this.page++
 				this.getList()
 			},
 			calendarConfirm(...rest) {
@@ -151,15 +155,15 @@
 			},
 			async getList() {
 				const params = {
-					page,
-					size: 8,
-					handleStatus: 1,
+					pageNo:this.page,
+					size: this.size,
+					status:'',
 					...this.searchData
 				}
-				isEnd = false
-				const data = await getDoneTaskPage(params)
+				this.isEnd = false
+				const data = await getDoneTaskList(params)
 				this.list.push(...data.list)
-				isEnd = this.list.length >= data.count
+				this.isEnd = this.list.length >= data.count
 			}
 		}
 	}

pages/salesServiceManagement/accessory/index.vue

@@ -10,8 +10,10 @@
 				</uni-easyinput>
 			</uni-section>
 			<button class="search_btn" @click="doSearch">搜索</button>
-			<image class="menu_icon" src="~@/static/pda/menu.svg"></image>
+			<image class="menu_icon" src="~@/static/pda/menu.svg" @click="showSearch"></image>
 		</view>
+
+
 		<view class="wrapper">
 			<u-list @scrolltolower="scrolltolower" class="listContent" style="height: auto;">
 				<view v-for="(item, index) in tableList" :key="index" style="position: relative;">
@@ -19,12 +21,18 @@
 						@edit="add(item,'edit')" @delete="deleteRow(item)">
 					</myCard>
 				</view>
+
+
+				<u-empty v-show="emptyShow && tableList.length==0" width="300" height="300" textSize="30"></u-empty>
 			</u-list>
+
 		</view>
 		<view class="add" @click="add('','add')">
 			<u-icon name="plus" color="#fff"></u-icon>
 		</view>
 		<u-toast ref="uToast"></u-toast>
+
+		<MySearch :show.sync="searchShow" :formItems="formItems" @search="confirmSearch"></MySearch>
 	</view>
 </template>
 
@@ -40,6 +48,67 @@
 		},
 		data() {
 			return {
+				searchForm: {},
+				emptyShow: false,
+				searchShow: false,
+				formItems: [{
+						label: '编码：',
+						prop: 'code',
+						component: 'MyInput',
+						props: {
+							placeholder: '请输入内容'
+						}
+					},
+					{
+						label: '工单编码：',
+						prop: 'workCode',
+						component: 'MyInput',
+						props: {
+							placeholder: '请输入内容',
+						}
+					},
+					{
+						label: '领用人：',
+						prop: 'recipientName',
+						component: 'MyInput',
+						props: {
+							placeholder: '请输入内容',
+						}
+					},
+					{
+						label: '客户名称：',
+						prop: 'contactName',
+						component: 'MyInput',
+						props: {
+							placeholder: '请输入内容',
+						}
+					},
+					{
+						label: '设备名称：',
+						prop: 'deviceName',
+						component: 'MyInput',
+						props: {
+							placeholder: '请输入内容',
+						}
+					},
+					{
+						label: '物品名称：',
+						prop: 'categoryName',
+						component: 'MyInput',
+						props: {
+							placeholder: '请输入内容',
+						}
+					},
+					{
+						label: '创建时间：',
+						prop: 'creatTime',
+						component: 'MyDateRange',
+						props: {
+							type: 'daterange',
+						}
+					}
+
+				],
 				columns: [
 					[{
 						label: '编号：',
@@ -163,7 +232,8 @@
 				size: 10,
 				isEnd: false,
 				tableList: [],
-				searchVal: ''
+				searchVal: '',
+				
 			}
 		},
 		onShow() {
@@ -180,10 +250,11 @@
 			},
 			//获取列表信息
 			getList() {
+				this.emptyShow = false
 				if (this.isEnd) {
 					this.$refs.uToast.show({
 						message: "暂无更多数据",
-						duration:1000
+						duration: 1000
 					})
 					return
 				}
@@ -193,11 +264,15 @@
 				let data = {
 					pageNum: this.page,
 					size: this.size,
-					keyWord: this.searchVal
+					keyWord: this.searchVal,
+					...this.searchForm
 				}
 				accessoryPage(data).then(res => {
 					if (this.page === 1) {
 						this.tableList = res.list;
+						if (this.tableList.length === 0) {
+							this.emptyShow = true
+						}
 					} else {
 						this.tableList.push(...res.list);
 					}
@@ -242,12 +317,34 @@
 				console.log('清空');
 				this.searchVal = ''
 				this.doSearch()
+			},
+			showSearch() {
+				this.searchShow = true
+			},
+
+			confirmSearch(e) {
+				console.log(e);
+				let data = JSON.parse(JSON.stringify(e))
+				if (data.creatTime) {
+					var [startTime, endTime] = data.creatTime
+					delete data.creatTime
+					this.searchForm = {
+						...data,
+						startTime,
+						endTime
+					}
+				} else {
+					this.searchForm = data
+				}
+				this.doSearch()
 			}
 		}
 	}
 </script>
 
 <style scoped lang="scss">
+	
+
 	.top-wrapper {
 		background-color: #fff;
 		display: flex;
@@ -297,4 +394,8 @@
 		align-items: center;
 		justify-content: center;
 	}
+
+	/deep/ .u-empty {
+		margin-top: 200px !important;
+	}
 </style>

pages/salesServiceManagement/recycle/index.vue

@@ -5,11 +5,12 @@
 		</uni-nav-bar>
 		<view class="top-wrapper">
 			<uni-section>
-				<uni-easyinput  @clear="clearSearch" prefixIcon="search" style="width: 460rpx" v-model="searchVal" placeholder="名称">
+				<uni-easyinput @clear="clearSearch" prefixIcon="search" style="width: 460rpx" v-model="searchVal"
+					placeholder="名称">
 				</uni-easyinput>
 			</uni-section>
 			<button class="search_btn" @click="doSearch">搜索</button>
-			<image class="menu_icon" src="~@/static/pda/menu.svg"></image>
+			<image class="menu_icon" src="~@/static/pda/menu.svg" @click="showSearch"></image>
 		</view>
 		<view class="wrapper">
 			<u-list @scrolltolower="scrolltolower" class="listContent" style="height: auto;">
@@ -18,12 +19,15 @@
 						@delete="deleteRow(item)" :item="item">
 					</myCard>
 				</view>
+				<u-empty v-show="emptyShow && tableList.length==0" width="300" height="300" textSize="30"></u-empty>
 			</u-list>
 		</view>
 		<view class="add" @click="add('','add')">
 			<u-icon name="plus" color="#fff"></u-icon>
 		</view>
 		<u-toast ref="uToast"></u-toast>
+
+		<MySearch :show.sync="searchShow" :formItems="formItems" @search="confirmSearch"></MySearch>
 	</view>
 </template>
 
@@ -39,6 +43,69 @@
 		},
 		data() {
 			return {
+				searchForm: {},
+				emptyShow: false,
+				searchShow: false,
+				formItems: [{
+						label: '编码：',
+						prop: 'code',
+						component: 'MyInput',
+						props: {
+							placeholder: '请输入内容'
+						}
+					},
+					{
+						label: '工单编码：',
+						prop: 'workCode',
+						component: 'MyInput',
+						props: {
+							placeholder: '请输入内容',
+						}
+					},
+					{
+						label: '回收人：',
+						prop: 'recycleName',
+						component: 'MyInput',
+						props: {
+							placeholder: '请输入内容',
+						}
+					},
+					{
+						label: '客户名称：',
+						prop: 'contactName',
+						component: 'MyInput',
+						props: {
+							placeholder: '请输入内容',
+						}
+					},
+					{
+						label: '设备名称：',
+						prop: 'deviceName',
+						component: 'MyInput',
+						props: {
+							placeholder: '请输入内容',
+						}
+					},
+					{
+						label: '物品名称：',
+						prop: 'categoryName',
+						component: 'MyInput',
+						props: {
+							placeholder: '请输入内容',
+						}
+					},
+					{
+						label: '创建时间：',
+						prop: 'creatTime',
+						component: 'MyDateRange',
+						props: {
+							type: 'daterange',
+						}
+					}
+
+				],
+
+
 				columns: [
 					[{
 						label: '编号：',
@@ -149,15 +216,15 @@
 			}
 		},
 		created() {
-			
+
 		},
-		onShow(){
+		onShow() {
 			this.doSearch();
 		},
 		onReachBottom() {
 			this.getList()
 		},
-		
+
 		methods: {
 			doSearch() {
 				this.isEnd = false;
@@ -166,10 +233,11 @@
 			},
 			//获取列表信息
 			getList() {
+				this.emptyShow = false
 				if (this.isEnd) {
 					this.$refs.uToast.show({
 						message: "暂无更多数据",
-						duration:1000
+						duration: 1000
 					})
 					return;
 				}
@@ -179,17 +247,21 @@
 				let data = {
 					pageNum: this.page,
 					size: this.size,
-					keyWord: this.searchVal
+					keyWord: this.searchVal,
+					...this.searchForm
 				}
 				recyclePage(data).then(res => {
 					if (this.page === 1) {
 						this.tableList = res.list;
+						if (this.tableList.length === 0) {
+							this.emptyShow = true
+						}
 					} else {
 						this.tableList.push(...res.list);
 					}
 					this.page += 1;
 					this.isEnd = this.tableList.length >= res.count;
-					const height=uni.getSystemInfoSync()
+					const height = uni.getSystemInfoSync()
 					console.log(height);
 					uni.hideLoading();
 				}).catch((e) => {
@@ -229,9 +301,28 @@
 			clearSearch() {
 				this.searchVal = ''
 				this.doSearch()
+			},
+			showSearch() {
+				this.searchShow = true
+			},
+			confirmSearch(e) {
+				console.log(e);
+				let data = JSON.parse(JSON.stringify(e))
+				if (data.creatTime) {
+					var [startTime, endTime] = data.creatTime
+					delete data.creatTime
+					this.searchForm = {
+						...data,
+						startTime,
+						endTime
+					}
+				} else {
+					this.searchForm = data
+				}
+				this.doSearch()
 			}
-			
-			
+
+
 		}
 	}
 </script>
@@ -287,5 +378,7 @@
 		justify-content: center;
 	}
 	
-	
+	/deep/ .u-empty {
+		margin-top: 200px !important;
+	}
 </style>

pages/salesServiceManagement/workOrder/index.vue

@@ -10,7 +10,7 @@
 				</uni-easyinput>
 			</uni-section>
 			<button class="search_btn" @click="doSearch">搜索</button>
-			<image class="menu_icon" src="~@/static/pda/menu.svg"></image>
+			<image class="menu_icon" src="~@/static/pda/menu.svg" @click="showSearch"></image>
 		</view>
 		<view class="">
 			<view class="tab_box rx-sc">
@@ -30,12 +30,16 @@
 						@checkAndAccept="checkAndAccept(item)" @evaluate="evaluate(item)" :item="item" :index="index+1"
 						@receive="receive(item)" :columns="columns" :btnList="btnList">
 					</myCard>
+
+					<u-empty v-show="emptyShow && tableList.length==0" width="300" height="300" textSize="30"></u-empty>
 				</view>
 			</u-list>
 		</view>
 		<CheckAndAccept ref="acceptRef" @getList='doSearch' />
 		<Evaluate ref="evaluateRef" @getList='doSearch' />
 		<u-toast ref="uToast"></u-toast>
+		<MySearch :show.sync="searchShow" :formItems="formItems" @search="confirmSearch">
+		</MySearch>
 	</view>
 </template>
 
@@ -56,6 +60,82 @@
 
 		data() {
 			return {
+				searchForm: {},
+				emptyShow: false,
+				searchShow: false,
+				formItems: [{
+						label: '工单编号：',
+						prop: 'code',
+						component: 'MyInput',
+						props: {
+							placeholder: '请输入内容',
+						}
+					},
+					{
+						label: '客户名称：',
+						prop: 'contactName',
+						component: 'MyInput',
+						props: {
+							placeholder: '请输入内容',
+						}
+					},
+					{
+						label: '设备名称：',
+						prop: 'deviceName',
+						component: 'MyInput',
+						props: {
+							placeholder: '请输入内容',
+						}
+					},
+					// {
+					// 	label: '故障等级：',
+					// 	prop: 'faultLevel',
+					// 	component: 'MyInput',
+					// 	props: {
+					// 		placeholder: '请选择',
+					// 		events:{
+					// 			focus:(e)=>{
+					// 				console.log('123');
+					// 				console.log(e);
+					// 			}
+					// 		}
+					// 	}
+					// },
+					{
+						label: '计划单号：',
+						prop: 'planCode',
+						component: 'MyInput',
+						props: {
+							placeholder: '请输入内容',
+						}
+					},
+
+
+					{
+						label: '计划名称：',
+						prop: 'planName',
+						component: 'MyInput',
+						props: {
+							placeholder: '请输入内容',
+						}
+					},
+					{
+						label: '报工人：',
+						prop: 'executeUserName',
+						component: 'MyInput',
+						props: {
+							placeholder: '请输入内容',
+						}
+					},
+					{
+						label: '验收人：',
+						prop: 'accepterUserName',
+						component: 'MyInput',
+						props: {
+							placeholder: '请输入内容',
+						}
+					},
+				],
 				tabList: [{
 						value: 'all',
 						label: '全部',
@@ -323,6 +403,7 @@
 			},
 			//获取列表信息
 			getList() {
+				this.emptyShow = false
 				if (this.isEnd) {
 					this.$refs.uToast.show({
 						message: "暂无更多数据",
@@ -336,7 +417,8 @@
 				let data = {
 					pageNum: this.page,
 					size: this.size,
-					keyWord: this.searchVal
+					keyWord: this.searchVal,
+					...this.searchForm
 				}
 				if (this.pickTabIndex != 'all') {
 					data.orderStatus = this.pickTabIndex;
@@ -344,6 +426,9 @@
 				getSalesWorkOrder(data).then(res => {
 					if (this.page === 1) {
 						this.tableList = res.list
+						if (this.tableList.length === 0) {
+							this.emptyShow = true
+						}
 					} else {
 						this.tableList.push(...res.list)
 					}
@@ -408,6 +493,15 @@
 			clearSearch() {
 				this.searchVal = ''
 				this.doSearch()
+			},
+			showSearch() {
+				this.searchShow = true
+			},
+			confirmSearch(e) {
+				console.log(e);
+				let data = JSON.parse(JSON.stringify(e))
+				this.searchForm = data
+				this.doSearch()
 			}
 		}
 	}
@@ -471,4 +565,8 @@
 			color: $theme-color;
 		}
 	}
+
+	/deep/ .u-empty {
+		margin-top: 200px !important;
+	}
 </style>

pages/systemSettings/index.vue

@@ -117,7 +117,7 @@ export default {
           console.log('-----确认退出登录9999999');
 		  uni.clearStorage()
           try {
-            postJ(this.apiUrl + '/user/logout')
+            postJ(this.apiUrl + '/main/user/logout')
               .then(res => {
 
                 uni.removeStorageSync('token')