浏览代码

检点配置修改

lilei 4 年之前
父节点
当前提交
07d1510f8e

+ 1 - 1
pages/spotCheckConfigure/addSpotCheck.vue

@@ -62,7 +62,7 @@
 <script>
 <script>
 import vSelect from '@/components/select/v-select.vue';
 import vSelect from '@/components/select/v-select.vue';
 import { clzConfirm } from '@/libs/tools.js';
 import { clzConfirm } from '@/libs/tools.js';
-import { saveBackLog } from '@/api/checkTaskConfig.js'
+import { saveBackLog,getCheckTaskConfig } from '@/api/checkTaskConfig.js'
 import moment from 'moment';
 import moment from 'moment';
 export default {
 export default {
 	components: {
 	components: {

+ 42 - 37
pages/spotCheckConfigure/spotCheckDetail/spotCheckDetail.vue

@@ -1,49 +1,52 @@
 <template>
 <template>
 	<view class="container">
 	<view class="container">
-		<view class="content">
+		<view class="content" v-if="pageData">
 			<view class="content-item">
 			<view class="content-item">
 				<text>任务名称</text>
 				<text>任务名称</text>
-				<view>111</view>
+				<view>{{pageData.name}}</view>
 			</view>
 			</view>
 			<view class="content-item">
 			<view class="content-item">
 				<text>任务周期</text>
 				<text>任务周期</text>
-				<view></view>
+				<view>{{pageData.cycleType}}</view>
 			</view>
 			</view>
 			<view class="content-item">
 			<view class="content-item">
 				<text>执行日期</text>
 				<text>执行日期</text>
-				<view>2020/10/10</view>
+				<view>{{pageData.buildDateDay||pageData.buildDateWeekList}}</view>
 			</view>
 			</view>
 			<view class="content-item">
 			<view class="content-item">
 				<text>执行时间</text>
 				<text>执行时间</text>
-				<view>09:00</view>
+				<view>{{pageData.buildTime}}</view>
 			</view>
 			</view>
 			<view class="content-item">
 			<view class="content-item">
 				<text>开始日期</text>
 				<text>开始日期</text>
-				<view>2020/10/10</view>
+				<view>{{pageData.startDate}}</view>
 			</view>
 			</view>
 			<view class="content-item">
 			<view class="content-item">
 				<text>结束日期</text>
 				<text>结束日期</text>
-				<view>2020/10/11</view>
+				<view>{{pageData.endDate}}</view>
 			</view>
 			</view>
 			<view class="content-item">
 			<view class="content-item">
-				<text>考评类型</text>
-				<view>点检</view>
-			</view>
-			<view class="content-item" @click="viewItem">
 				<text>考评指标</text>
 				<text>考评指标</text>
 				<view style="color: #007AFF;" >
 				<view style="color: #007AFF;" >
-					12个 <u-icon name="icon-xian-11" custom-prefix="xd-icon" size="28" color="#888888"></u-icon>
+					{{pageData.assessTargetIds.length}} 项 
+					<u-icon name="icon-xian-11" custom-prefix="xd-icon" size="28" color="#888888" @click="openZBpage"></u-icon>
 				</view>
 				</view>
 			</view>
 			</view>
-			<view class="content-item" @click="viewStores">
+			<view class="content-item">
 				<text>考评门店</text>
 				<text>考评门店</text>
 				<view style="color: #007AFF;">
 				<view style="color: #007AFF;">
-					12个 <u-icon name="icon-xian-11" custom-prefix="xd-icon" size="28" color="#888888"></u-icon>
+					{{pageData.storeIdList.length}} 个 <u-icon name="icon-xian-11" custom-prefix="xd-icon" size="28" color="#888888" @click="viewStores"></u-icon>
 				</view>
 				</view>
 			</view>
 			</view>
 			<view class="content-item">
 			<view class="content-item">
 				<text>任务有效期天数</text>
 				<text>任务有效期天数</text>
-				<view>3天</view>
+				<view>{{pageData.effectiveDay}}天</view>
+			</view>
+		</view>
+		<view v-else>
+			<view class="loadingStyle">
+				<u-loading mode="circle"></u-loading>
+				<view>正在加载</view>
 			</view>
 			</view>
 		</view>
 		</view>
 	</view>
 	</view>
@@ -53,49 +56,51 @@
 	import {getCheckTaskConfig} from '../../../api/checkTaskConfig.js'
 	import {getCheckTaskConfig} from '../../../api/checkTaskConfig.js'
 	export default{
 	export default{
 		data(){
 		data(){
-			// const currentDate = this.getDate({
-			// 	format: true
-			// })
 			return{
 			return{
 				pageData:null,		// 接受上个页面传的数据
 				pageData:null,		// 接受上个页面传的数据
-				show: false,		// 是否显示消息提醒弹窗
-				content: '',		// 消息提醒内容
-				title:'',			// 消息提醒标题
-				showCancelButton:''	,// 是否显示确认框的取消按钮  true 显示  false不显示
-				listData:[]
+				id:''
 			}
 			}
 		},
 		},
-		onLoad() {
+		onLoad(opts) {
+			this.id = opts.id
 			this.getData()
 			this.getData()
 		},
 		},
 		methods:{
 		methods:{
 			// 详情
 			// 详情
 			getData(){
 			getData(){
-				getCheckTaskConfig({id:89}).then(res=>{
+				getCheckTaskConfig({id:this.id}).then(res=>{
 					console.log(res)
 					console.log(res)
 					if(res.status==200){
 					if(res.status==200){
-						this.listData=res.data[0]
-						console.log(this.listData)
+						this.pageData=res.data
 					}
 					}
 				})
 				})
 			},
 			},
-			// 查看已选考评门店详情
-			viewStores(){
-				uni.navigateTo({
-					url: '/pages/spotCheckConfigure/spotCheckDetail/evaluateStoreDetail'
-				})
+			// 考评指标选择
+			openZBpage() {
+				let item = this.pageData.assessTargetIds
+				if(item.length>0){
+					uni.navigateTo({
+						url: '/pages/userCenter/viewStores?item='+encodeURIComponent(JSON.stringify(item))
+					})
+				}
 			},
 			},
-			// 查看已选考评指标详情
-			viewItem(){
-				uni.navigateTo({
-					url: '/pages/spotCheckConfigure/spotCheckDetail/evaluateItemDetail'
-				})
+			viewStores(){
+				let item = this.pageData.storeIdList
+				if(item.length>0){
+					uni.navigateTo({
+						url: '/pages/userCenter/viewStores?item='+encodeURIComponent(JSON.stringify(item))
+					})
+				}
 			}
 			}
 		}
 		}
 	}
 	}
 </script>
 </script>
 
 
 <style lang="less">
 <style lang="less">
+	.loadingStyle{
+		text-align: center;
+		padding: 10vh 0 10vh 0;
+	}
 	.container{
 	.container{
 		color:#666;
 		color:#666;
 		font-size: 28rpx;
 		font-size: 28rpx;

+ 6 - 4
pages/spotCheckConfigure/spotCheckList.vue

@@ -9,8 +9,8 @@
 			<view class="itemName">
 			<view class="itemName">
 				<span>{{ item.startDate }} 至 {{ item.endDate }}</span>
 				<span>{{ item.startDate }} 至 {{ item.endDate }}</span>
 				<span>
 				<span>
-					<u-button type="success" size="mini" style="margin-right: 15upx;" @click="handetail">查看</u-button>
-					<u-button v-if="item.status == 0&&item.taskGenerateFlag==0" type="primary" size="mini" style="margin-right: 15upx;" @click="handedit">编辑</u-button>
+					<u-button type="success" size="mini" style="margin-right: 15upx;" @click="handetail(item)">查看</u-button>
+					<u-button v-if="item.status == 0&&item.taskGenerateFlag==0" type="primary" size="mini" style="margin-right: 15upx;" @click="handedit(item)">编辑</u-button>
 					<u-button v-if="item.status == 0&&item.taskGenerateFlag==0" type="error" size="mini" @click="handelete(item)">删除</u-button>
 					<u-button v-if="item.status == 0&&item.taskGenerateFlag==0" type="error" size="mini" @click="handelete(item)">删除</u-button>
 				</span>
 				</span>
 			</view>
 			</view>
@@ -93,10 +93,11 @@ export default {
 		// 启用禁用
 		// 启用禁用
 		changeItem(item){
 		changeItem(item){
 			let _this = this
 			let _this = this
-			enableCheckTaskConfig({id:item.id,flag:item.status}).then(res=>{
+			let status = item.status == 1 ? 0 : 1
+			enableCheckTaskConfig({id:item.id,flag: status}).then(res=>{
 				if(res.status == 200){
 				if(res.status == 200){
 					let i = _this.list.findIndex(a=>a.id == item.id)
 					let i = _this.list.findIndex(a=>a.id == item.id)
-					_this.list[i].status = item.status == 1 ? 0 : 1
+					_this.list[i].status = status
 					_this.list.splice()
 					_this.list.splice()
 				}
 				}
 				uni.showToast({
 				uni.showToast({
@@ -146,6 +147,7 @@ export default {
 <style lang="scss">
 <style lang="scss">
 page {
 page {
 	background: #f8f8f8;
 	background: #f8f8f8;
+	height: auto;
 }
 }
 .itemInfo {
 .itemInfo {
 	margin: 20upx;
 	margin: 20upx;