From 14ef12774477c71ecb693050383e1bbfb00249ee Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 15 Jul 2022 17:16:08 +0800
Subject: [PATCH] rpjdetail

---
 src/config/route.js          |   2 +-
 src/views/rpm/rpj.vue        |  14 ++--
 src/views/rpm/rpj_show.vue   | 123 +++++++++++++++++++++++++----------
 src/views/wf/allwork.vue     |  29 +++++----
 src/views/wf/ccwork.vue      |  22 +++----
 src/views/wf/dutywork.vue    |  33 +++-------
 src/views/wf/ownerwork.vue   |  22 +++----
 src/views/wf/visitdetail.vue |  64 ++++++++++++++----
 src/views/wf/worked.vue      |  22 +++----
 9 files changed, 205 insertions(+), 126 deletions(-)

diff --git a/src/config/route.js b/src/config/route.js
index 24a9a49b..fb314cb6 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -222,7 +222,7 @@ const routes = [
         "name": "visitdetail",
         "path": "/wf/visitdetail",
         "meta": {
-          "title": "访客工单详情",
+          "title": "工单详情",
           "icon": "el-icon-menu",
           "hidden": true
         },
diff --git a/src/views/rpm/rpj.vue b/src/views/rpm/rpj.vue
index bb400172..43299d51 100644
--- a/src/views/rpm/rpj.vue
+++ b/src/views/rpm/rpj.vue
@@ -90,10 +90,11 @@
 					prop="create_time"
 					width="180"
 				></el-table-column>
-				<el-table-column label="操作" fixed="right" align="left" width="170">
+				<el-table-column label="操作" fixed="right" align="center" width="170">
 					<template #default="scope">
 						<el-button-group>
 							<el-button
+								v-if="scope.row.state===10"
 								text
 								type="primary"
 								size="small"
@@ -108,13 +109,13 @@
 								@click="table_show(scope.row, scope.$index)"
 							>查看
 							</el-button>
-							<el-button
+							<!--<el-button
 								text
 								type="warning"
 								size="small"
 								@click="table_edit(scope.row, scope.$index)"
 							>编辑
-							</el-button>
+							</el-button>-->
 							<el-popconfirm
 								title="确定删除吗？"
 								@confirm="table_del(scope.row, scope.$index)"
@@ -139,7 +140,6 @@
 	<show-dialog
 		v-if="dialog.show"
 		ref="showDialog"
-		:rpjId="rpjId"
 		@closed="dialog.show = false"
 	></show-dialog>
 </template>
@@ -182,7 +182,6 @@
 					40: "进行中",
 					50: "已完成",
 				},
-				rpjId:''
 			};
 		},
 		methods: {
@@ -202,8 +201,11 @@
 			},
 			//查看
 			table_show(row) {
-				this.rpjId = row.id;
+				debugger;
 				this.dialog.show = true;
+				this.$nextTick(() => {
+					this.$refs.showDialog.open().setData(row);
+				});
 			},
 
 			//权限设置
diff --git a/src/views/rpm/rpj_show.vue b/src/views/rpm/rpj_show.vue
index 284101a2..fe56daa7 100644
--- a/src/views/rpm/rpj_show.vue
+++ b/src/views/rpm/rpj_show.vue
@@ -1,31 +1,31 @@
 <template>
 	<el-drawer
-		:title="form.name"
+		title="查看"
 		v-model="visible"
 		:size="1000"
 		destroy-on-close
+		@closed="$emit('closed')"
 	>
 		<el-container v-loading="loading">
 			<el-main style="padding: 0 20px 20px 20px">
 				<el-descriptions direction="vertical" :column="3" border>
-					<!--<el-descriptions-item label="入厂项目:">{{form.name }}</el-descriptions-item>-->
+					<el-descriptions-item label="入厂项目:">{{form.name }}</el-descriptions-item>
 					<el-descriptions-item label="项目类型:">{{types_[form.type]}}</el-descriptions-item>
 					<el-descriptions-item label="合同编号:">{{form.contract_number}}</el-descriptions-item>
 					<el-descriptions-item label="状态:">{{state_[form.state]}}</el-descriptions-item>
 					<el-descriptions-item label="进厂时间:">{{form.come_time}}</el-descriptions-item>
 					<el-descriptions-item label="离厂时间:">{{form.leave_time}}</el-descriptions-item>
 					<el-descriptions-item label="所属部门:">{{form.belong_dept_name}}</el-descriptions-item>
-					<!--<el-descriptions-item label="相关方:">{{form.rparty_name}}</el-descriptions-item>-->
+					<el-descriptions-item label="相关方:">{{form.rparty_name}}</el-descriptions-item>
 				</el-descriptions>
-				<!--<el-card style="margin-top:20px">
+				<el-card style="margin-top:20px">
 					<scTable
-						ref="table"
-						:data="peoplelist"
+						ref="fileTable"
+						:data="rpjFileList"
 						row-key="id"
-						height='auto'
+						hidePagination
 						stripe
 						hideDo
-						hidePagination
 					>
 						<el-table-column
 							label="#"
@@ -33,29 +33,58 @@
 							type="index"
 							width="50"
 						></el-table-column>
-
-						<el-table-column
-							label="访客姓名"
-							prop="visitor_.name"
-						></el-table-column>
-						<el-table-column
-							label="访客手机号"
-							prop="visitor_.phone"
-						></el-table-column>
-						<el-table-column
-							label="访客身份证号"
-							prop="visitor_.id_number"
-						></el-table-column>
-						<el-table-column label="是否重要访客" prop="is_main">
-							<template #default="scope"
-							>
-								<el-space v-if="scope.row.is_main == true">是</el-space>
+						<el-table-column label="资质内容" prop="name">
+							<template #default="scope">
+								{{ scope.row.file_cate_.name }}
+							</template>
+						</el-table-column>
+						<el-table-column label="文件资料" prop="name">
+							<template #default="scope">
+								<div v-for="(item, index) in scope.row.files_" :key="index">
+									<el-link :href="item.file">
+										{{ item.name }}
+									</el-link>
+								</div>
+							</template>
+						</el-table-column>
+					</scTable>
+				</el-card>
+				<el-card style="margin-top:20px">
+					<scTable
+						ref="table"
+						:data="memeberList"
+						row-key="id"
+						height='auto'
+						stripe
+						hideDo
+						hidePagination
+					>
+						<el-table-column label="#" fixed="left" type="index" width="50"></el-table-column>
+						<el-table-column label="姓名" prop="remployee_.name">
+							<template #default="scope">
+								{{ scope.row.remployee_.name }}
+							</template>
+						</el-table-column>
+						<el-table-column label="工作职责" prop="duty"></el-table-column>
+						<el-table-column label="证书" prop="rcertificates">
+							<template #default="scope">
+								<el-tag
+									v-for="item in scope.row.rcertificates_"
+									:key="item.number"
+									:label="item.name"
+									:value="item.number"
+								>{{ item.name }}
+								</el-tag>
+							</template>
+						</el-table-column>
+						<el-table-column label="是否负责人" prop="is_manager">
+							<template #default="scope">
+								<el-space v-if="scope.row.is_manager === true">是</el-space>
 								<el-space v-else>否</el-space>
 							</template>
 						</el-table-column>
-						<el-table-column label="创建时间" prop="create_time"></el-table-column>
 					</scTable>
-				</el-card>-->
+				</el-card>
 			</el-main>
 		</el-container>
 	</el-drawer>
@@ -70,7 +99,12 @@
 		components: {
 			selectUser,
 		},
-		props:{rpjId: { type: String, default: "" }},
+		props: {
+			rpjId: {
+				type: String,
+				default: ""
+			}
+		},
 		data() {
 			return {
 				loading: false,
@@ -89,20 +123,43 @@
 					30: "保安保洁服务",
 					40: "其他",
 				},
-				receptionistoptions: [],
-				peoplelist: [],
+				form:{},
+				rpjFileList: [],
+				memeberList: [],
 			};
 		},
 		mounted() {
-			this.getFormData();
+		/*	this.getRpjfileList();
+			this.getMemberList();*/
 		},
 		methods: {
-			getFormData(){
-				this.$API.rpm.rpj.item.req(this.rpjId).then((res) => {
+			//显示
+			open() {
+				this.visible = true;
+				return this;
+			},
+			//表单注入数据
+			setData(data) {
+				this.$API.rpm.rpj.item.req(data.id).then((res) => {
 					this.form = res;
+					this.getRpjfileList();
+					this.getMemberList();
 					this.visible = true;
 				});
 			},
+			//文件列表加载
+			getRpjfileList() {
+				this.$API.rpm.rpjfile.list.req({page: 0, rpj: this.form.id}).then((res) => {
+					this.rpjFileList = res;
+				});
+			},
+			//作业人员列表
+			getMemberList() {
+				this.$API.rpm.member.list.req({rpj: this.form.id, page: 0}).then((res) => {
+					this.memeberList = res;
+					console.log(res);
+				});
+			},
 		},
 	};
 </script>
diff --git a/src/views/wf/allwork.vue b/src/views/wf/allwork.vue
index 08e85ba8..4cd53bfb 100644
--- a/src/views/wf/allwork.vue
+++ b/src/views/wf/allwork.vue
@@ -82,19 +82,22 @@
 				this.list = res;
 			},
 			handleShow(row) {
-				var catetype = row.workflow_.key;
-				switch (catetype) {
-					case 'visit':
-						this.$router.push({
-							name: "visitdetail",
-							query: {
-								id: row.id,
-								type: 'show',
-								visitID: row.ticket_data.visit
-							},
-						});
-						break;
-				}
+				let workflowKey = row.workflow_.key;
+				let catetype = '';
+				if(workflowKey==='visit'){
+					catetype = row.workflow_.key
+				}else if(workflowKey==='rparty'){
+					catetype = row.workflow_.key
+				}else{}
+				this.$router.push({
+					name: "visitdetail",
+					query: {
+						id: row.id,
+						type: 'show',
+						projectId: row.ticket_data.visit,
+						catetype:catetype
+					},
+				});
 			},
 			handleAccept(row) {
 				this.$API.wf.ticket.ticketAccept.req(row.id, {}).then(res => {
diff --git a/src/views/wf/ccwork.vue b/src/views/wf/ccwork.vue
index b2e00e89..eb07b730 100644
--- a/src/views/wf/ccwork.vue
+++ b/src/views/wf/ccwork.vue
@@ -75,19 +75,15 @@ export default {
       this.list = res;
     },
 	  handleShow(row) {
-		  var catetype = row.workflow_.key;
-		  switch (catetype) {
-			  case 'visit':
-				  this.$router.push({
-					  name: "visitdetail",
-					  query: {
-						  id: row.id,
-						  type: 'show',
-						  visitID: row.ticket_data.visit
-					  },
-				  });
-				  break;
-		  }
+		  this.$router.push({
+			  name: "visitdetail",
+			  query: {
+				  id: row.id,
+				  type: 'show',
+				  projectId: row.ticket_data.visit,
+				  catetype : row.workflow_.key
+			  },
+		  });
 	  },
   },
 };
diff --git a/src/views/wf/dutywork.vue b/src/views/wf/dutywork.vue
index 4db80452..da7093b9 100644
--- a/src/views/wf/dutywork.vue
+++ b/src/views/wf/dutywork.vue
@@ -124,32 +124,19 @@
 				console.log(res);
 				this.list = res;
 			},
+			//处理
 			handleDetail(row){
-				let catetype = row.workflow_.key;
-				switch (catetype) {
-					case 'visit':
-						this.$router.push({
-							name: "visitdetail",
-							query: {
-								id: row.id,
-								visitID:row.ticket_data.visit
-							},
-						});
-						break;
-					case 'rparty':
-						this.$router.push({
-							name: "visitdetail",
-							query: {
-								id: row.id,
-								visitID:row.ticket_data.visit
-							},
-						});
-						break;
-				}
+				this.$router.push({
+					name: "visitdetail",
+					query: {
+						id: row.id,
+						projectId:row.ticket_data.visit,
+						catetype:row.workflow_.key
+					},
+				});
 			},
+			//获取日志
 			handleLogs(row) {
-				debugger;
-				console.log(row)
 				let that = this;
 				let id = row.id;
 				this.ticketId = row.id;
diff --git a/src/views/wf/ownerwork.vue b/src/views/wf/ownerwork.vue
index 79466074..fcc1d91f 100644
--- a/src/views/wf/ownerwork.vue
+++ b/src/views/wf/ownerwork.vue
@@ -105,19 +105,15 @@
 		},
 		methods: {
 			handleShow(row) {
-				var catetype = row.workflow_.key;
-				switch (catetype) {
-					case 'visit':
-						this.$router.push({
-							name: "visitdetail",
-							query: {
-								id: row.id,
-								type: 'show',
-								visitID: row.ticket_data.visit
-							},
-						});
-						break;
-				}
+				this.$router.push({
+					name: "visitdetail",
+					query: {
+						id: row.id,
+						type: 'show',
+						projectId: row.ticket_data.visit,
+						catetype:row.workflow_.key
+					},
+				});
 			},
 			async getList() {
 				let res = await this.$API.wf.ticket.list.req({category: "owner", page: 0});
diff --git a/src/views/wf/visitdetail.vue b/src/views/wf/visitdetail.vue
index 652f4946..fba83349 100644
--- a/src/views/wf/visitdetail.vue
+++ b/src/views/wf/visitdetail.vue
@@ -4,7 +4,7 @@
 			<el-card style="margin-bottom: 10px">
 				<work-step ref="workStep"></work-step>
 			</el-card>
-			<el-card style="margin-left: 10px; margin-bottom: 10px">
+			<el-card style="margin-left: 10px; margin-bottom: 10px" v-if="cateType==='visit'">
 				<el-descriptions title="来访信息" :column="3">
 					<el-descriptions-item label="工单流水号:">
 						{{ticketDetail.sn }}
@@ -43,6 +43,39 @@
 					</el-descriptions-item>
 				</el-descriptions>
 			</el-card>
+			<el-card style="margin-left: 10px; margin-bottom: 10px" v-if="cateType==='rparty'">
+				<el-descriptions title="来访信息" :column="3">
+					<el-descriptions-item label="工单流水号:">
+						<!--{{ticketDetail.sn }}-->
+					</el-descriptions-item>
+					<el-descriptions-item label="相关方:">
+						<!--{{rpjDetail.name }}-->
+					</el-descriptions-item>
+					<el-descriptions-item label="入厂项目:">
+						<!--{{rpjDetail.company }}-->
+					</el-descriptions-item>
+					<el-descriptions-item label="项目类型:">
+						<!--<el-tag size="small">{{ rpjDetail.count_people }}人</el-tag>-->
+					</el-descriptions-item>
+					<el-descriptions-item label="合同编号:">
+						<!--<el-tag v-for="item in rpjDetail.visitors_" :key='item.id' size="small">
+							&lt;!&ndash;{{ item.visitor_.name }}&ndash;&gt;
+						</el-tag>-->
+					</el-descriptions-item>
+					<el-descriptions-item label="状态:">
+						<!--{{state_[rpjDetail.state] }}-->
+					</el-descriptions-item>
+					<el-descriptions-item label="进厂时间:">
+						<!--{{rpjDetail.visit_time }}-->
+					</el-descriptions-item>
+					<el-descriptions-item label="离厂时间:">
+						<!--{{rpjDetail.leave_time }}-->
+					</el-descriptions-item>
+					<el-descriptions-item label="所属部门:">
+						<!--{{purpose_[rpjDetail.purpose] }}-->
+					</el-descriptions-item>
+				</el-descriptions>
+			</el-card>
 			<el-card style="margin-left: 10px; margin-bottom: 10px" v-if="type!=='show'">
 				<scTitle title="处理"></scTitle>
 				<el-form :model="form" ref="addForm" label-width="100px" label-position="left">
@@ -115,9 +148,10 @@
 		name: "visitdetail",
 		data() {
 			return {
-				ticketId: "",
-				visitId: "",
+				ticketId: "",//工单id
+				projectId: "",//对应项目的id
 				userName: "",
+				rpjDetail: {},
 				ticketDetail: [],
 				visitDetail: [],
 				employeeLists: [],
@@ -154,11 +188,12 @@
 		created(){
 			this.ticketId = this.$route.query.id;
 			this.type = this.$route.query.type;
+			this.cateType = this.$route.query.catetype;
 		},
 		mounted() {
 			this.ticketId = this.$route.query.id;
 			this.type = this.$route.query.type;
-			this.visitId = this.$route.query.visitID;
+			this.projectId = this.$route.query.projectId;
 			this.getticketItem();
 			this.getVisit();
 			this.getBtns();
@@ -169,10 +204,9 @@
 			getticketItem() {
 				this.$API.wf.ticket.ticketItem.req(this.ticketId).then((res) => {
 					this.ticketDetail = res;
-					debugger;
-					console.log(res);
 				});
 			},
+			//获取应有的流转
 			getBtns(){
 				this.$API.wf.ticket.ticketTransitions.req(this.ticketId).then(res=>{
 					this.operationBtn = res;
@@ -181,21 +215,26 @@
 
 			//访客详情
 			getVisit() {
-				this.$API.vm.visit.read.req(this.visitId).then((res) => {
+				this.$API.vm.visit.read.req(this.projectId).then((res) => {
 					this.visitDetail = res;
 				});
 			},
 
-			addNodeHandlerSubmit(data) {
-				this.addForm.toadd_user=data.id;
-				this.userName=data.name;
+			//入厂项目详情
+			getRpj(){
+
 			},
+			//加签处理-start
 			addNode(){
 				this.limitedAdd = true;
 			},
 			addCancel(){
 				this.limitedAdd = false;
 			},
+			addNodeHandlerSubmit(data) {
+				this.addForm.toadd_user=data.id;
+				this.userName=data.name;
+			},
 			addNodeHandler(index){
 				let res = null;
 				if(index==='1'){
@@ -208,7 +247,8 @@
 					this.$router.push("dutywork");
 				}
 			},
-
+			//加签处理-end
+			//转交处理-start
 			deliverNode(){
 				this.limitedDeliver = true;
 			},
@@ -227,6 +267,8 @@
 					}
 				})
 			},
+			//转交处理-end
+			//流转按钮触发
 			operationSubmit(id){
 				let params = new Object();
 				params.transition = id;
diff --git a/src/views/wf/worked.vue b/src/views/wf/worked.vue
index 5476839d..3461d40f 100644
--- a/src/views/wf/worked.vue
+++ b/src/views/wf/worked.vue
@@ -75,19 +75,15 @@
 				this.list = res;
 			},
 			handleShow(row) {
-				var catetype = row.workflow_.key;
-				switch (catetype) {
-					case 'visit':
-						this.$router.push({
-							name: "visitdetail",
-							query: {
-								id: row.id,
-								type: 'show',
-								visitID: row.ticket_data.visit
-							},
-						});
-						break;
-				}
+				this.$router.push({
+					name: "visitdetail",
+					query: {
+						id: row.id,
+						type: 'show',
+						projectId: row.ticket_data.visit,
+						catetype: row.workflow_.key
+					},
+				});
 			},
 		},
 	};