From 1dc43d244243679b08caec562a14bbd0ca04a8e9 Mon Sep 17 00:00:00 2001
From: Bobi <2166145077@qq.com>
Date: Wed, 27 Nov 2024 14:58:46 +0800
Subject: [PATCH] ggg

---
 api/api.js                             | 50 ++++++++++++++++++++++++++++----
 components/work/Collection.vue         | 48 ++++++++++++++++++++++++++++++
 pages/index/index.vue                  | 15 +++++++++-
 pages_order/order/FavoriteList.vue     | 14 ++++++---
 pages_order/order/HelpCenter.vue       | 23 +++++++++++----
 pages_order/order/PrivacyAgreement.vue | 25 +++++++++++-----
 pages_order/order/ProcessCardOne.vue   | 38 ++++++++++++++++++------
 pages_order/order/ProcessCardThree.vue | 18 +++++++++++-
 pages_order/order/ProcessCardTo.vue    | 22 ++++++++++++--
 pages_order/order/WorkOrders.vue       | 53 +++++++++++++++++++++++-----------
 pages_order/order/Worknotice.vue       |  2 ++
 pages_order/order/memberList.vue       | 42 +++++++++++++++++----------
 12 files changed, 282 insertions(+), 68 deletions(-)
 create mode 100644 components/work/Collection.vue

diff --git a/api/api.js b/api/api.js
index bc01329..4805a19 100644
--- a/api/api.js
+++ b/api/api.js
@@ -19,15 +19,15 @@ const config = {
 		method: 'GET',
 		limit: 500
 	},
-	
-	
+
+
 	//轮播图-轮播图列表
 	queryBannerList: {
 		url: '/workorder/banner/queryBannerList',
 		method: 'GET',
 	},
-	
-	
+
+
 	//工单信息-查询工单列表
 	queryTemplateList: {
 		url: '/workorder/template/queryTemplateList',
@@ -43,7 +43,47 @@ const config = {
 		url: '/workorder/news/queryNewsById',
 		method: 'GET',
 	},
-
+	// 配置信息-帮助中心
+	helpInfo: {
+		url: '/workorder/config/helpInfo',
+		method: 'GET',
+	},
+	// 配置信息-隐私协议
+	privacyInfo: {
+		url: '/workorder/config/privacyInfo',
+		method: 'GET',
+	},
+	//用户列表
+	queryUserList: {
+		url: '/workorder/user/queryUserList',
+		method: 'GET',
+	},
+	//工单信息-工序卡1(选配)详情
+	queryStepOne: {
+		url: '/workorder/template/queryStepOne',
+		method: 'GET',
+	},
+	//工单信息-工序卡2详情
+	queryStepTwo: {
+		url: '/workorder/template/queryStepTwo',
+		method: 'GET',
+	},
+	//收藏信息-我的收藏
+	queryCollectionList: {
+		url: '/workorder/collection/queryCollectionList',
+		method: 'GET',
+	},
+	//工单信息-根据id查询工单详情
+	queryTemplateById: {
+		url: '/workorder/template/queryTemplateById',
+		method: 'GET',
+	},
+	//工单信息-工序卡3详情
+	queryStepThree: {
+		url: '/workorder/template/queryStepThree',
+		method: 'GET',
+	},
+	
 }
 
 
diff --git a/components/work/Collection.vue b/components/work/Collection.vue
new file mode 100644
index 0000000..9648524
--- /dev/null
+++ b/components/work/Collection.vue
@@ -0,0 +1,48 @@
+<template>
+	<view class="Urgent-Work-List" @click="$emit('click')">
+		<view class="Work-List">
+			任务号：
+		</view>
+		<view class="Work-List">
+			担当信息：
+		</view>
+		<view class="Work-List">
+
+			机型信息：
+		</view>
+		<view class="Work-List">
+			数量：
+		</view>
+		<view class="Work-List">
+			工单状态：
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "Collection",
+		props : {
+			obj : {}
+		},
+		data() {
+			return {
+
+			};
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.Urgent-Work-List{
+		margin-top: 20rpx;
+		border: 6rpx solid $uni-color;
+		border-radius: 25rpx;
+		padding: 15rpx;
+		background-color: #fff;
+		.Work-List{
+			margin: 15rpx 0rpx;
+			letter-spacing: 2px
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index db83fa3..81f1abb 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -53,7 +53,7 @@
 			v-for="(item,index) in list"
 			:obj="item"
 			:key="index"
-			@click="$utils.navigateTo('/pages_order/order/WorkOrders')"
+			@click="$utils.navigateTo('/pages_order/order/WorkOrders?id=' + item.id)"
 			/>
 			
 		</view>
@@ -78,10 +78,12 @@
 			tabber,
 			PrivacyAgreementPoup,
 			WorkOrderitem,
+			
 		},
 		data() {
 			return {
 				bannerList: [],
+				CollectionList:[],
 				mixinsListApi : 'queryTemplateList',
 				baseList: [
 					{
@@ -104,8 +106,10 @@
 		onLoad() {
 			this.queryBannerList()
 		    this.queryNewsList()
+			this.queryCollectionList()
 		},
 		methods: {
+			//轮播图
 			queryBannerList(){
 				this.$api('queryBannerList', res =>{
 					if(res.code == 200){
@@ -113,6 +117,7 @@
 					}
 				})
 			},
+			//公告列表
 			queryNewsList(){
 				this.$api('queryNewsList', res =>{
 					if(res.code == 200){
@@ -124,6 +129,14 @@
 					}
 				})
 			},
+			//收藏信息-我的收藏
+			queryCollectionList(){
+				this.$api('queryCollectionList', res =>{
+					if(res.code == 200){
+						this.CollectionList = res.result.records
+					}
+				})
+			},
 			toNotice(index){
 				console.log(this.NewsList[index]);
 				// @click="$utils.navigateTo('/pages_order/order/Worknotice')"
diff --git a/pages_order/order/FavoriteList.vue b/pages_order/order/FavoriteList.vue
index c578db3..1d01405 100644
--- a/pages_order/order/FavoriteList.vue
+++ b/pages_order/order/FavoriteList.vue
@@ -20,9 +20,10 @@
 		</view>
 		
 		<view class="Urgent-Work-Order">
-			<WorkOrderitem
+			<Collection
 			v-for="(item,index) in list"
 			:obj="item"
+			:key="index"
 			/>
 		</view>
 
@@ -32,16 +33,20 @@
 
 <script>
 	import tabber from '@/components/base/tabbar.vue'
-	import WorkOrderitem from '@/components/work/WorkOrderitem.vue'
+	import Collection from '@/components/work/Collection.vue'
 	import mixinsList from '@/mixins/list.js'
+	import {
+		mapGetters
+	} from 'vuex'
 	export default {
 		mixins: [mixinsList],
 		components: {
 			tabber,
-			WorkOrderitem,
+			Collection,
 		},
 		data() {
 			return {
+				mixinsListApi : 'queryTemplateList',
 				tabs: [{
 					name: '所有',
 				}, {
@@ -53,7 +58,7 @@
 				}, {
 					name: '挂机中'
 				}],
-				mixinsListApi : 'queryTemplateList',
+				mixinsListApi : 'queryCollectionList',
 			}
 		},
 		computed: {
@@ -65,6 +70,7 @@
 			click(item) {
 				console.log('item', item);
 			},
+			
 		}
 	}
 </script>
diff --git a/pages_order/order/HelpCenter.vue b/pages_order/order/HelpCenter.vue
index 6868865..854237c 100644
--- a/pages_order/order/HelpCenter.vue
+++ b/pages_order/order/HelpCenter.vue
@@ -5,11 +5,10 @@
 		title="帮助中心"
 		leftClick 
 		@leftClick="$utils.navigateBack"/>
-		<view class="box">
-			<view class="center">
-				<h2>帮助中心</h2>
-			</view>
 		
+		
+		<view style="padding: 20rpx;">
+			<uv-parse :content="help.parmValue"></uv-parse>
 		</view>
 	</view>
 </template>
@@ -18,10 +17,20 @@
 	export default {
 		data() {
 			return {
-				
+				help:{},
 			}
 		},
+		onLoad() {
+			this.helpInfo()
+		},
 		methods: {
+			helpInfo(){
+				this.$api('helpInfo', res =>{
+					if(res.code == 200){
+						this.help = res.result
+					}
+				})
+			},
 			
 		}
 	}
@@ -29,9 +38,11 @@
 
 <style scoped lang="scss">
 	.page{
-		.box{margin-top: 150rpx;
+		.Box{
 			display: flex;
 			justify-content: center;
+			margin-top: 80rpx;
+			
 		}
 	}
 
diff --git a/pages_order/order/PrivacyAgreement.vue b/pages_order/order/PrivacyAgreement.vue
index dfbb075..4c5692f 100644
--- a/pages_order/order/PrivacyAgreement.vue
+++ b/pages_order/order/PrivacyAgreement.vue
@@ -5,11 +5,11 @@
 		title="隐私协议"
 		leftClick 
 		@leftClick="$utils.navigateBack"/>
-		<view class="box">
-			<view class="center">
-				<h2>隐私协议</h2>
-			</view>
 		
+		
+		
+		<view style="padding: 20rpx;">
+			<uv-parse :content="privacy.parmValue"></uv-parse>
 		</view>
 	</view>
 </template>
@@ -18,20 +18,31 @@
 	export default {
 		data() {
 			return {
-				
+				privacy:{}
 			}
 		},
+		onLoad() {
+			this.privacyInfo()
+		},
 		methods: {
-			
+			privacyInfo(){
+				this.$api('privacyInfo', res =>{
+					if(res.code == 200){
+						this.privacy = res.result
+					}
+				})
+			},
 		}
 	}
 </script>
 
 <style scoped lang="scss">
 	.page{
-		.box{margin-top: 150rpx;
+		.Box{
 			display: flex;
 			justify-content: center;
+			margin-top: 80rpx;
+			
 		}
 	}
 
diff --git a/pages_order/order/ProcessCardOne.vue b/pages_order/order/ProcessCardOne.vue
index c3f7694..2734c6e 100644
--- a/pages_order/order/ProcessCardOne.vue
+++ b/pages_order/order/ProcessCardOne.vue
@@ -1,26 +1,46 @@
 <template>
-	<view>
-		<navbar
-		title="工序卡3"
-		leftClick 
-		
-		@leftClick="$utils.navigateBack"/>
+	<view class="page">
+		<navbar title="工序卡1" leftClick @leftClick="$utils.navigateBack" />
+	<view class="">
+		{{StepOne.operator}}
 	</view>
+	</view>
+	
 </template>
 
 <script>
 	export default {
 		data() {
 			return {
-				
+				id: 0,
+				StepOne: {},
+
 			}
 		},
+		onLoad(arg) {
+			this.id = arg.id
+			console.log(arg);
+			this.queryStepOne()
+		},
 		methods: {
-			
+
+			queryStepOne() {
+				this.$api('queryStepOne', {
+					templateId: this.id
+				}, res => {
+
+					if (res.code == 200) {
+						this.StepOne = res.result.workorderGeneralStepone
+
+
+					}
+				})
+			},
+
 		}
 	}
 </script>
 
 <style>
 
-</style>
+</style>
\ No newline at end of file
diff --git a/pages_order/order/ProcessCardThree.vue b/pages_order/order/ProcessCardThree.vue
index c3f7694..a0f8aee 100644
--- a/pages_order/order/ProcessCardThree.vue
+++ b/pages_order/order/ProcessCardThree.vue
@@ -12,11 +12,27 @@
 	export default {
 		data() {
 			return {
-				
+				StepThree :{}
 			}
 		},
+		onLoad(arg) {
+			this.id = arg.id
+			console.log(arg);
+			this.queryStepThree()
+		},
 		methods: {
+			queryStepThree() {
+				this.$api('queryStepThree', {
+					templateId: this.id
+				}, res => {
+			
+					if (res.code == 200) {
+						this.StepThree = res.result
+			
 			
+					}
+				})
+			},
 		}
 	}
 </script>
diff --git a/pages_order/order/ProcessCardTo.vue b/pages_order/order/ProcessCardTo.vue
index 9c2df10..6cfbfb7 100644
--- a/pages_order/order/ProcessCardTo.vue
+++ b/pages_order/order/ProcessCardTo.vue
@@ -12,11 +12,29 @@
 	export default {
 		data() {
 			return {
-				
+				id: 0,
+				StepTwo:{},
 			}
 		},
+		onLoad(arg) {
+			this.id = arg.id
+			console.log(arg);
+			this.queryStepTwo()
+		},
 		methods: {
-			
+			queryStepTwo(){
+				this.$api('queryStepTwo',{
+					templateId: this.id
+				},res =>{
+					if(res.code == 200){
+						
+						this.StepTwo = res.result
+						
+					}
+				})
+				
+			},
+
 		}
 	}
 </script>
diff --git a/pages_order/order/WorkOrders.vue b/pages_order/order/WorkOrders.vue
index 9cc87de..eeb07aa 100644
--- a/pages_order/order/WorkOrders.vue
+++ b/pages_order/order/WorkOrders.vue
@@ -15,7 +15,7 @@
 					任务号：
 				</view>
 				<view class="index">
-					GY1269103AC0
+					{{TemplateById.taskNo}}
 				</view>
 			</view>
 			<view class="work-box">
@@ -23,15 +23,15 @@
 					担当信息：
 				</view>
 				<view class="index">
-					李林珠-15197216688
+					{{TemplateById.responsibler}}
 				</view>
 			</view>
-			<view class="work-box">
+			<view class="work-boxx">
 				<view class="works">
 					机型信息：
 				</view>
-				<view class="index">
-					BSZ24861768
+				<view class="inde">
+					{{TemplateById.model}}
 				</view>
 			</view>
 			<view class="work-box">
@@ -39,7 +39,7 @@
 					数量：
 				</view>
 				<view class="index">
-					88
+					{{TemplateById.number}}
 				</view>
 			</view>
 			<view class="work-box">
@@ -47,7 +47,7 @@
 					状态：
 				</view>
 				<view class="index">
-					本体加工
+					{{TemplateById.remark}}
 				</view>
 			</view>
 			<view class="work-boxx">
@@ -55,24 +55,23 @@
 					备注：
 				</view>
 				<view class="indexx">
-					备料已完成，等待本体加工，进入下一步气
-					密检测55555555
+					
 				</view>
 			</view>
 		</view>
 		
 
 		<view class="working-procedure">
-			<view class="working" @click="$utils.navigateTo('/pages_order/order/ProcessCardOne')">
+			<view class="working" @click="$utils.navigateTo('/pages_order/order/ProcessCardOne?id=' + id)" >
 				中试压缩机试作工序卡1（选配）
 			</view>
-			<view class="working" @click="$utils.navigateTo('/pages_order/order/ProcessCardTo')">
+			<view class="working" @click="$utils.navigateTo('/pages_order/order/ProcessCardTo?id=' + id)">
 				中试压缩机试作工序卡2
 			</view>
-			<view class="working" @click="$utils.navigateTo('/pages_order/order/ProcessCardThree')">
-				中试压缩机试作工序卡2
+			<view class="working" @click="$utils.navigateTo('/pages_order/order/ProcessCardThree?id=' + id)">
+				中试压缩机试作工序卡3
 			</view>
-			<view class="working" @click="$utils.navigateTo('/pages_order/order/ProcessCardFour')">
+			<view class="working" @click="$utils.navigateTo('/pages_order/order/ProcessCardFour?id=' + id)">
 				中试压缩机试作工序卡4(总成)
 			</view>
 		</view>
@@ -90,11 +89,29 @@
 	export default {
 		data() {
 			return {
-
+				id : 0,
+				TemplateById : {},
 			}
 		},
+		onLoad(args) {
+			this.id = args.id
+			this.queryTemplateById()
+			console.log(args)
+		},
 		methods: {
-
+			// 根据id获取工单详情
+			queryTemplateById(){
+				this.$api('queryTemplateById', {
+					templateId : this.id
+				}, res =>{
+					if(res.code == 200){
+						this.TemplateById = res.result
+					}
+				})
+				
+			},
+	
+	
 		}
 	}
 </script>
@@ -113,11 +130,13 @@
 				font-size: 35rpx;
 			
 			}
+		
 			
 			.work-boxx {
 				padding: 0rpx 30rpx;
 				margin: 15rpx 0rpx;
 				display: flex;
+				  flex-wrap: wrap;
 				font-size: 35rpx;
 			
 				.indexx {
@@ -147,7 +166,7 @@
 		}
 		.modify{
 			text-align: center;
-			margin-top: 380rpx;
+			margin-top: 150rpx;
 			
 			display: flex;
 			align-items: center;
diff --git a/pages_order/order/Worknotice.vue b/pages_order/order/Worknotice.vue
index cd0fe7a..8196f32 100644
--- a/pages_order/order/Worknotice.vue
+++ b/pages_order/order/Worknotice.vue
@@ -22,8 +22,10 @@
 		onLoad(args) {
 			this.id = args.id
 			this.queryNewsById()
+			
 		},
 		methods: {
+			//公告信息-根据id查询公告信息
 			queryNewsById(){
 				this.$api('queryNewsById', {
 					newsId : this.id
diff --git a/pages_order/order/memberList.vue b/pages_order/order/memberList.vue
index bfba503..19fbc02 100644
--- a/pages_order/order/memberList.vue
+++ b/pages_order/order/memberList.vue
@@ -8,39 +8,32 @@
 			<uv-search placeholder="输入员工姓名进行搜索" bgColor="#fff" height="80"></uv-search>
 		</view>
 
-		<view class="Memberinformation">
-			<view class="box" v-for="(item,index) in 10 ">
+		<view class="Memberinformation" >
+			<view class="box" v-for="(item,index) in list" :key="index">
 				<view class="Top">
-					<view class="userName">
-						李晓春
+					<view class="userName" >
+						{{item.name}}
 					</view>
-					<view class="modify"
-					@click="$utils.navigateTo('/pages_order/order/ModifyMembers')">
+					<view class="modify" @click="$utils.navigateTo('/pages_order/order/ModifyMembers')">
 						修改
 					</view>
 				</view>
 				<view class="AccountPassword">
 					<view class="Account">
-						账号：李小春
+						账号：{{item.name}}
 					</view>
 					<view class="password">
-						密码：123456lixiaochun
+						密码：{{item.password}}
 					</view>
 				</view>
 
 				<view class="item">
 					<view class="itemm">
-						创建时间：2024.11.23
+						创建时间：{{item.createTime}}
 					</view>
-
 				</view>
 			</view>
-
-
-
 		</view>
-
-
 	</view>
 
 
@@ -49,13 +42,29 @@
 </template>
 
 <script>
+	import mixinsList from '@/mixins/list.js'
+	import {
+			mapGetters
+		} from 'vuex'
+		
 	export default {
+		mixins: [mixinsList],
 		data() {
 			return {
-
+				mixinsListApi : 'queryUserList',
 			}
 		},
+		onLoad() {
+			this.queryUserList()
+		},
 		methods: {
+			queryUserList() {
+				this.$api('queryUserList', res => {
+					if (res.code == 200) {
+						this.item = res.result.records
+					}
+				})
+			},
 
 		}
 	}
@@ -101,6 +110,7 @@
 
 				.AccountPassword {
 					margin-top: 40rpx;
+
 					.password {
 						margin-top: 20rpx;
 					}