From 3e85c7771c1b0a138c4a7756634d5ae2480862f9 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 27 Mar 2023 12:39:52 +0800
Subject: [PATCH] =?UTF-8?q?refector:=20=E6=96=87=E5=AD=97=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/rpm/rpj_show.vue | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/views/rpm/rpj_show.vue b/src/views/rpm/rpj_show.vue
index fd107868..5d3a94b8 100644
--- a/src/views/rpm/rpj_show.vue
+++ b/src/views/rpm/rpj_show.vue
@@ -9,14 +9,14 @@
 						<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.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>
 					<el-button  type="primary" size="small"
 						v-if="form.state==30||form.state==40"
-						@click="addWorker()">添加人员
+						@click="addWorker()">添加成员
 					</el-button>
 				</el-card>
 				<el-card style="margin-top:8px" shadow="hover">
@@ -83,8 +83,8 @@
 						</el-table-column>
 						<el-table-column label="变动类型" prop="operation">
 							<template #default="scope">
-								<el-space v-if="scope.row.operation === 'member_leave'">离厂</el-space>
-								<el-space v-else>进厂</el-space>
+								<el-space v-if="scope.row.operation === 'member_leave'">提前离厂</el-space>
+								<el-space v-else>新入厂</el-space>
 							</template>
 						</el-table-column>
 						<el-table-column label="变动时间" prop="create_time"></el-table-column>
@@ -99,7 +99,7 @@
 			<ScBind v-model="showBindBlt" :bindBtl="bindBtl" :bindType="bindType" :bindName="bindName"
 				:bindEmployee="bindEmployee" @success="showBindBltSuccess" @closed="showBindBltClose"
 			></ScBind>
-			<el-dialog title="离厂" v-model="leaveVisible" width="30%" >
+			<el-dialog title="提前离厂" v-model="leaveVisible" width="30%" >
 				<el-form
 						ref="dialogForm"
 						label-width="80px"
@@ -113,16 +113,16 @@
 					<el-button type="primary" @click="preLeave" :loading="btnloading" :disabled="btnloading">确 定</el-button>
 				</template>
 			</el-dialog>
-			<el-dialog v-model="workerVisible" title="添加项目人员">
+			<el-dialog v-model="workerVisible" title="添加项目成员">
 				<el-form ref="workerForm" :model="formworker" label-width="120px">
 				<el-row>
 					<el-col :md="24" :sm="12" :xs="24">
-						<el-form-item label="项目人员">
+						<el-form-item label="项目成员">
 							<el-select
 								v-model="formworker.remployee"
 								@change="selectWorker"
 								filterable
-								placeholder="选择项目人员"
+								placeholder="选择项目成员"
 							>
 								<el-option
 									v-for="item in remployeeoptions"
@@ -166,6 +166,15 @@
 							</el-select>
 						</el-form-item>
 					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-form-item label="原因">
+							<el-input
+							v-model="formworker.reason"
+							type="text"
+							clearable
+							></el-input>
+						</el-form-item>
+					</el-col>
 				</el-row>
 				</el-form>
 				<template #footer>
@@ -283,27 +292,27 @@ export default {
 				this.rpjFileList = res;
 			});
 		},
-		//作业人员列表
+		//作业成员列表
 		getMemberList() {
 			this.$API.rpm.member.list.req({ rpj: this.form.id, page: 0 }).then((res) => {
 				this.memeberList = res;
 				// console.log(res);
 			});
 		},
-		//人员变动操作日志
+		//成员变动操作日志
 		getLogs(){
 			this.$API.rpm.rpj.logs.req({ rpj: this.form.id, page: 0 }).then((res) => {
 				debugger;
 				this.logLists = res;
 			});
 		},
-		//调出项目人员列表
+		//调出项目成员列表
 		getremployee() {
 			this.$API.rpm.remployee.list.req({ page: 0, rparty: this.form.rparty }).then((res) => {
 				this.remployeeoptions = res;
 			});
 		},
-		//选择人员后，调出该人员的所有证书
+		//选择成员后，调出该成员的所有证书
 		selectWorker() {
 			this.$API.rpm.rcertificate.list
 				.req({ remployee: this.formworker.remployee, page: 0 })
@@ -315,7 +324,7 @@ export default {
 			this.getremployee();
 			this.workerVisible = true;
 		},
-		 //提交作业人员信息
+		 //提交作业成员信息
 		 submitWorker() {
 			this.btnloading = true;
 			this.formworker.rpj = this.form.id;
@@ -323,7 +332,7 @@ export default {
 				this.$API.rpm.member.create
 				.req(this.formworker)
 				.then((res) => {
-					this.$message.success("项目人员添加成功");
+					this.$message.success("项目成员添加成功");
 					this.workerVisible = false;
 					this.btnloading = false;
 					this.getMemberList();