Browse Source

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

1004749546@qq.com 4 years ago
parent
commit
cb98ec4fec

+ 3 - 0
App.vue

@@ -46,4 +46,7 @@
 		width: 24upx !important;
 		height: 24upx !important;
 	}
+	page {
+		height: 100%;
+	}
 </style>

+ 12 - 0
pages.json

@@ -225,6 +225,18 @@
 			"style": {
 				"navigationBarTitleText": "创建问题"
 			}
+		},
+		{
+			"path": "pages/toDoList/choosePutUser", //  待办单 > 选择处理人
+			"style": {
+				"navigationBarTitleText": "选择处理人"
+			}
+		},
+		{
+			"path": "pages/toDoList/chooseReceiveUser", //  待办单 > 选择抄送人
+			"style": {
+				"navigationBarTitleText": "选择处理人"
+			}
 		}
 	],
 	"globalStyle": {

+ 97 - 40
pages/toDoList/addBacklog.vue

@@ -1,72 +1,112 @@
 <template>
-	<view class="back-content">
-		<!-- 轮播图 -->
-		<view class="paizhao">
-			<view class="icon">
-				<u-icon name="xianchangpaishe" custom-prefix="xd-icon" size="64" color="#888888"></u-icon>
+	<view class="back-body">
+		<view class="back-content">
+			<!-- 轮播图 -->
+			<view class="paizhao">
+				<view class="icon">
+					<u-icon name="xianchangpaishe" custom-prefix="xd-icon" size="64" color="#888888"></u-icon>
+				</view>
+			</view>
+			<swiper v-if="backlogPhotoList.length" class="top-ad-swiper" :indicator-dots="false" :autoplay="true" :interval="5000" :duration="600" :circular="true">
+				<swiper-item v-for="(item,index) in 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>
+			</swiper>
+			<u-form class="form-content" :model="form" ref="uForm" label-width="180">
+				<u-form-item label="门店" prop="storeName">
+					<u-input @click="chooseStore" input-align="right" v-model="form.storeName" disabled placeholder="请选择门店" />
+					<u-icon name="icon-xian-11" custom-prefix="xd-icon" size="30" color="#888888"></u-icon>
+				</u-form-item>
+				<u-form-item label="考评指标" prop="clsName">
+					<u-input @click="chooseClsName" input-align="right" v-model="form.clsName" disabled placeholder="请选择考评指标" />
+					<u-icon name="icon-xian-11" custom-prefix="xd-icon" size="30" color="#888888"></u-icon>
+				</u-form-item>
+				<u-form-item label="处理人" prop="putUser">
+					<u-input input-align="right" v-model="form.clsName" disabled placeholder="请选择处理人" />
+					<u-icon name="icon-xian-11" custom-prefix="xd-icon" size="30" color="#888888"></u-icon>
+				</u-form-item>
+				<u-form-item label="抄送人" prop="receiveUser"> 
+					<u-input input-align="right" v-model="form.clsName" disabled placeholder="请选择抄送人" />
+					<u-icon name="icon-xian-11" custom-prefix="xd-icon" size="30" color="#888888"></u-icon>
+				</u-form-item>
+				<u-form-item label="整改到期日" prop="effectiveEndTime" >
+					<u-input @click="showPicker=true" input-align="right" v-model="form.effectiveEndTime" disabled placeholder="请选择整改到期日" />
+					<u-icon name="icon-xian-11" custom-prefix="xd-icon" size="30" color="#888888"></u-icon>
+				</u-form-item>
+			</u-form>
+			<view class="remarks">
+				<u-input v-model="remarks" type="textarea" placeholder="请输入备注..." />
 			</view>
 		</view>
-		<swiper v-if="backlogPhotoList.length" class="top-ad-swiper" :indicator-dots="false" :autoplay="true" :interval="5000" :duration="600" :circular="true">
-			<swiper-item v-for="(item,index) in 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>
-		</swiper>
-		<u-form class="form-content" :model="form" ref="uForm" label-width="180">
-			<u-form-item label="门店" prop="storeName">
-				<u-input clearable v-model="form.storeName" disabled placeholder="请选择发起时间区间" @click="openPicker"/>
-			</u-form-item>
-			<u-form-item label="考评指标" prop="clsName">
-				<u-input v-model="form.clsName" placeholder="请输入门店名称" />
-			</u-form-item>
-			<!-- <u-form-item label="处理人" prop="userName">
-				<u-input v-model="form.userName" placeholder="请输入巡店人名称" />
-			</u-form-item>
-			<u-form-item label="抄送" prop="status" label-position="top"> 
-				<view :class="['status-item', item.checked ? 'active' : '']" v-for="item in statusList" :key="item.id" @click="chooseStatus(item)">
-					{{item.dispName}}
-				</view>
-			</u-form-item>
-			<u-form-item label="整改到期日" prop="sourceType" label-position="top">
-				<view :class="['status-item', item.checked ? 'active' : '']" v-for="item in sourceTypeList" :key="item.id" @click="chooseSourceType(item)">
-					{{item.dispName}}
-				</view>
-			</u-form-item> -->
-		</u-form>
-		
+		<u-button class="save-btn" type="primary">保存</u-button>
+		<!-- 时间选择器 -->
+		<mx-date-picker class="date-picker" :show="showPicker" type="date" format="yyyy-mm-dd" :value="form.effectiveEndTime" :show-tips="true" @confirm="onSelected" @cancel="showPicker=false" />
 	</view>
 </template>
 
 <script>
+	import MxDatePicker from "@/components/mx-datepicker/mx-datepicker.vue"
 	export default {
 		components: {
+			MxDatePicker
 		},
 		data() {
 			return {
 				// 顶部轮播图片
 				backlogPhotoList:[],
+				showPicker: false, // 是否显示时间弹窗
 				form: {
 					storeName: '', // 门店
-					clsName: '' ,// 考评指标
-					
-				}
+					clsName: '',// 考评指标
+					putUser: '', // 处理人
+					receiveUser: '', // 抄送人
+					effectiveEndTime: '' // 整改到期日
+				},
+				remarks: '' // 备注
 			}
 		},
 		onLoad(option) {
 			
 		},
 		methods: {
-			
+			// 确认日期选择
+			onSelected (v) {
+				console.log(v,'vvvvvvvv')
+				this.form.effectiveEndTime = v.value
+				this.showPicker = false
+			},
+			// 选择门店
+			chooseStore () {
+				uni.navigateTo({
+					url: '/pages/spotCheckConfigure/evaluateStore'
+				})
+			},
+			// 选择考评指标
+			chooseClsName () {
+				uni.navigateTo({
+					url: '/pages/spotCheckConfigure/evaluateItem'
+				})
+			}
 			
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	.back-content {
+	.back-body {
+		height: 100%;
+		background-color: #eee;
+		display: flex;
+		flex-direction: column;
+		.back-content {
+			flex: 1;
+			overflow-y: scroll;
+		}
 		.paizhao {
+			background-color: #fff;
 			height: 340upx;
 			display: flex;
 			align-items: center;
@@ -80,12 +120,29 @@
 				justify-content: center;
 			}
 		}
+		.text-right {
+			text-align: right;
+		}
 		.top-ad-swiper{
+			background-color: #fff;
 			height: 340upx;
 		}
 		.swiper-item-imgse{
 			width: 750upx;
 			height: 340upx;
 		}
+		.form-content{
+			background-color: #fff;
+			padding: 0 30upx;
+		}
+		.remarks{
+			background-color: #fff;
+			padding: 0 30upx;
+			margin-top: 20upx;
+		}
+		.save-btn{
+			width: 90%;
+			margin-bottom: 20upx;
+		}
 	}
 </style>

+ 67 - 0
pages/toDoList/choosePutUser.vue

@@ -0,0 +1,67 @@
+<template>
+	<view>
+		<uni-check-list :listData="list"></uni-check-list>
+	</view>
+</template>
+
+<script>
+	import uniCheckList from '@/components/uni-check-list/uni-check-list.vue'
+	export default {
+		components: {
+			uniCheckList
+		},
+		data() {
+			return {
+				list: [{
+						value: 'USA',
+						name: '美国'
+					},
+					{
+						value: 'CHN',
+						name: '中国',
+						checked: 'true'
+					},
+					{
+						value: 'BRA',
+						name: '巴西'
+					},
+					{
+						value: 'JPN',
+						name: '日本'
+					},
+					{
+						value: 'ENG',
+						name: '英国'
+					},
+					{
+						value: 'FRA',
+						name: '法国'
+					}
+				]
+			}
+		},
+		methods: {
+			// 改变checkbox的选中状态
+			checkboxChange(e) {
+				var items = this.items,
+					values = e.detail.value;
+				for (var i = 0, lenI = items.length; i < lenI; ++i) {
+					const item = items[i]
+					if(values.includes(item.value)){
+						this.$set(item,'checked',true)
+					}else{
+						this.$set(item,'checked',false)
+					}
+					console.log(item,'--------------')
+				}
+				
+			},
+			submit(){
+				console.log('-------tijiao')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>

+ 67 - 0
pages/toDoList/chooseReceiveUser.vue

@@ -0,0 +1,67 @@
+<template>
+	<view>
+		<uni-check-list :listData="list"></uni-check-list>
+	</view>
+</template>
+
+<script>
+	import uniCheckList from '@/components/uni-check-list/uni-check-list.vue'
+	export default {
+		components: {
+			uniCheckList
+		},
+		data() {
+			return {
+				list: [{
+						value: 'USA',
+						name: '美国'
+					},
+					{
+						value: 'CHN',
+						name: '中国',
+						checked: 'true'
+					},
+					{
+						value: 'BRA',
+						name: '巴西'
+					},
+					{
+						value: 'JPN',
+						name: '日本'
+					},
+					{
+						value: 'ENG',
+						name: '英国'
+					},
+					{
+						value: 'FRA',
+						name: '法国'
+					}
+				]
+			}
+		},
+		methods: {
+			// 改变checkbox的选中状态
+			checkboxChange(e) {
+				var items = this.items,
+					values = e.detail.value;
+				for (var i = 0, lenI = items.length; i < lenI; ++i) {
+					const item = items[i]
+					if(values.includes(item.value)){
+						this.$set(item,'checked',true)
+					}else{
+						this.$set(item,'checked',false)
+					}
+					console.log(item,'--------------')
+				}
+				
+			},
+			submit(){
+				console.log('-------tijiao')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>

+ 0 - 2
pages/toDoList/searchModal.vue

@@ -143,8 +143,6 @@
 			// 打开时间选择弹框
 			openPicker () {
 				this.showPicker = true
-				console.log(111)
-				// this.$emit('openPicke')
 			},
 			// 确认日期选择
 			onSelected (v) {