From 5debe2b848ef26e7f76eaabdf300e1ad1bc19bc8 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Wed, 1 Nov 2023 09:34:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=A1=A8=E5=90=88=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quality/qcIncome/checkProjectType.vue     |  1 +
 src/views/quality/qcIncome/index.vue          |  7 ++
 src/views/quality/qcProduce/index.vue         | 65 ++++++++++---------
 src/views/quality/qcWarehousing/index.vue     |  8 ++-
 src/views/quality/unqualified/index.vue       | 12 +---
 5 files changed, 52 insertions(+), 41 deletions(-)

diff --git a/src/views/quality/qcIncome/checkProjectType.vue b/src/views/quality/qcIncome/checkProjectType.vue
index 83cdb18..b5a91ec 100644
--- a/src/views/quality/qcIncome/checkProjectType.vue
+++ b/src/views/quality/qcIncome/checkProjectType.vue
@@ -143,6 +143,7 @@ export default {
       this.data=rowdata;
       this.queryParams.belongTo = this.data.recordId;
       this.typeCode = typeCode;
+      this.checkType = this.data.checkType;
       this.getList();
     },
 
diff --git a/src/views/quality/qcIncome/index.vue b/src/views/quality/qcIncome/index.vue
index ad0a299..3cfe9c6 100644
--- a/src/views/quality/qcIncome/index.vue
+++ b/src/views/quality/qcIncome/index.vue
@@ -131,6 +131,7 @@
 		<el-table v-loading="loading" :data="incomeList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
 			<el-table-column label="recordId" align="center" prop="recordId" v-if="false"/>
+			<el-table-column label="checkType" align="center" prop="checkType" v-if="false"/>
 			<el-table-column label="检验任务编号" align="center" prop="checkNo" width="120"/>
 			<el-table-column label="来料批次号" align="center" prop="incomeBatchNo" width="120"/>
 			<el-table-column label="订单号" align="center" prop="orderNo" width="120"/>
@@ -636,6 +637,12 @@ export default {
 		},
 		//检验项目弹窗
 		handleCheckProject(row){
+
+            if(row.checkStatus != '0'){
+                 this.$modal.msgSuccess("已经完成检验");
+				 return
+			}
+
 			this.$refs.itemSelectProject.showFlag = true;
 			this.$refs.itemSelectProject.init(row,'material');
 		},
diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index 3a06a6e..b4c92d0 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -41,9 +41,9 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="车间名称" prop="carName">
+			<el-form-item label="车间名称" prop="supplierName">
 				<el-input
-					v-model="queryParams.carName"
+					v-model="queryParams.supplierName"
 					placeholder="请输入所属车间名称"
 					clearable
 					@keyup.enter.native="handleQuery"
@@ -51,9 +51,9 @@
 			</el-form-item>
 
 
-			<el-form-item label="生产时间" prop="produceDateArray">
+			<el-form-item label="生产时间" prop="incomeTimeArray">
                 <el-date-picker
-				v-model="queryParams.produceDateArray"
+				v-model="queryParams.incomeTimeArray"
 				format="yyyy-MM-dd HH:mm:ss"
 				type="datetimerange"
 				range-separator="至"
@@ -159,6 +159,7 @@
 		<el-table v-loading="loading" :data="qcProduceList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
 			<el-table-column label="id" align="center" prop="recordId" v-if="false"/>
+			<el-table-column label="checkType" align="center" prop="checkType" v-if="false"/>
 			<el-table-column label="任务编号" align="center" prop="checkNo" width="120"/>
 			<el-table-column label="批次号" align="center" prop="batchNo" width="120"/>
 			<el-table-column label="订单号" align="center" prop="orderNo" width="120"/>
@@ -166,11 +167,11 @@
 			<el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
 			<el-table-column label="数量" align="center" prop="quality" />
 			<el-table-column label="单位" align="center" prop="unit" />
-			<el-table-column label="车间编码" align="center" prop="carCode" width="120"/>
-			<el-table-column label="车间名称" align="center" prop="carName" width="240"/>
-			<el-table-column label="生产时间" align="center" prop="produceDate" width="180">
+			<el-table-column label="车间编码" align="center" prop="supplierCode" width="120"/>
+			<el-table-column label="车间名称" align="center" prop="supplierName" width="240"/>
+			<el-table-column label="生产时间" align="center" prop="incomeTime" width="180">
 				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.produceDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+					<span>{{ parseTime(scope.row.incomeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
 				</template>
 			</el-table-column>
 			<el-table-column label="检测地点" align="center" prop="checkLoc" width="120"/>
@@ -297,21 +298,21 @@
 				</el-row>
 				<el-row>
 					<el-col :span="8">
-						<el-form-item label="车间名称" prop="carName">
-							<el-input v-model="form.carName" placeholder="请输入所属车间名称" >
+						<el-form-item label="车间名称" prop="supplierName">
+							<el-input v-model="form.supplierName" placeholder="请输入所属车间名称" >
 							<el-button slot="append" @click="handleSelectWorkCenter" icon="el-icon-search"></el-button>
 							</el-input>
 						</el-form-item>
 					</el-col>
 				   <el-col :span="8">
-						<el-form-item label="车间编码" prop="carCode">
-							<el-input v-model="form.carCode" placeholder="请输入所属车间编码" disabled/>
+						<el-form-item label="车间编码" prop="supplierCode">
+							<el-input v-model="form.supplierCode" placeholder="请输入所属车间编码" disabled/>
 						</el-form-item>
                     </el-col>
 					<el-col :span="8">
-						<el-form-item label="生产时间" prop="produceDate">
+						<el-form-item label="生产时间" prop="incomeTime">
 							<el-date-picker clearable
-								v-model="form.produceDate"
+								v-model="form.incomeTime"
 								type="datetime"
 								value-format="yyyy-MM-dd HH:mm:ss"
 								placeholder="请选择生产时间">
@@ -400,7 +401,7 @@ export default {
 			open: false,
 			// 查询参数
 			queryParams: {
-				produceDateArray: [],
+				incomeTimeArray: [],
 				checkTimeArray: [],
 				pageNum: 1,
 				pageSize: 10,
@@ -411,9 +412,9 @@ export default {
 				materialName: null,
 				quality: null,
 				unit: null,
-				carCode: null,
-				carName: null,
-				produceDate: null,
+				supplierCode: null,
+				supplierName: null,
+				incomeTime: null,
 				checkLoc: null,
 				checkStatus: null,
 				checkManCode: null,
@@ -449,10 +450,10 @@ export default {
 				unit: [
 					{ required: true, message: "单位不能为空", trigger: "blur" }
 				],
-				carName: [
+				supplierName: [
 					{ required: true, message: "车间不能为空", trigger: "blur" }
 				],
-				produceDate: [
+				incomeTime: [
 					{ required: true, message: "生产时间不能为空", trigger: "blur" }
 				],
 				checkManName: [
@@ -483,7 +484,7 @@ export default {
 		getDate() {
 			let start = this.Fungetdate (0)
 			let end = this.Fungetdate (1)
-			this.queryParams.produceDateArray.push(start,end)
+			this.queryParams.incomeTimeArray.push(start,end)
 			//this.queryParams.checkTimeArray.push(start,end)
 		},
 		Fungetdate (num) {
@@ -499,9 +500,9 @@ export default {
 		getList() {
 			this.loading = true;
 
-			if(this.queryParams.produceDateArray.length>0){
-				this.queryParams.produceDateStart = moment(this.queryParams.produceDateArray[0]).format('YYYY-MM-DD HH:mm:ss');
-				this.queryParams.produceDateEnd = moment(this.queryParams.produceDateArray[1]).format('YYYY-MM-DD HH:mm:ss');
+			if(this.queryParams.incomeTimeArray.length>0){
+				this.queryParams.incomeTimeStart = moment(this.queryParams.incomeTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
+				this.queryParams.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
 			}
 
 			if(this.queryParams.checkTimeArray.length>0){
@@ -531,9 +532,9 @@ export default {
 				materialName: null,
 				quality: null,
 				unit: null,
-				carCode: null,
-				carName: null,
-				produceDate: null,
+				supplierCode: null,
+				supplierName: null,
+				incomeTime: null,
 				checkLoc: null,
 				checkStatus: null,
 				checkManCode: null,
@@ -650,8 +651,8 @@ export default {
 		},
 		//工作中心选择确认
 		onSelectWorkCenter(obj) {
-           this.form.carCode = obj.code;
-		   this.form.carName = obj.name;
+           this.form.supplierCode = obj.code;
+		   this.form.supplierName = obj.name;
 		},
 
 		/**人员选择弹出框**/
@@ -665,6 +666,12 @@ export default {
 		},
 		//检验项目弹窗
 		handleCheckProject(row){
+
+            if(row.checkStatus != '0'){
+                 this.$modal.msgSuccess("已经完成检验");
+				 return
+			}
+
 			this.$refs.itemSelectProject.showFlag = true;
 			this.$refs.itemSelectProject.init(row,'produce');
 		},
diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue
index fa7909d..ea5389f 100644
--- a/src/views/quality/qcWarehousing/index.vue
+++ b/src/views/quality/qcWarehousing/index.vue
@@ -59,7 +59,6 @@
 				end-placeholder="结束日期">
 				</el-date-picker>
 			</el-form-item>
-
 			<el-form-item label="检测地点" prop="checkLoc">
 				<el-input
 					v-model="queryParams.checkLoc"
@@ -156,6 +155,7 @@
 		<el-table v-loading="loading" :data="warehousingList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
 			<el-table-column label="id" align="center" prop="recordId" v-if="false"/>
+			<el-table-column label="checkType" align="center" prop="checkType" v-if="false"/>
 			<el-table-column label="检验任务编号" align="center" prop="checkNo" width="120"/>
 			<el-table-column label="批次号" align="center" prop="batchNo" width="120"/>
 			<el-table-column label="订单号" align="center" prop="orderNo" width="120"/>
@@ -659,6 +659,12 @@ export default {
 		},
 		//检验项目弹窗
 		handleCheckProject(row){
+
+            if(row.checkStatus != '0'){
+                 this.$modal.msgSuccess("已经完成检验");
+				 return
+			}
+
 			this.$refs.itemSelectProject.showFlag = true;
 			this.$refs.itemSelectProject.init(row,'product');
 		},
diff --git a/src/views/quality/unqualified/index.vue b/src/views/quality/unqualified/index.vue
index bd29394..77f1e65 100644
--- a/src/views/quality/unqualified/index.vue
+++ b/src/views/quality/unqualified/index.vue
@@ -117,14 +117,7 @@
 						icon="el-icon-edit"
 						@click="handleUpdate(scope.row)"
 						v-hasPermi="['quality:unqualified:edit']"
-					>修改</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-delete"
-						@click="handleDelete(scope.row)"
-						v-hasPermi="['quality:unqualified:remove']"
-					>删除</el-button>
+					>处理</el-button>
 				</template>
 			</el-table-column>
 		</el-table>
@@ -224,9 +217,6 @@ export default {
 			form: {},
 			// 表单校验
 			rules: {
-				factoryCode: [
-					{ required: true, message: "工厂编码不能为空", trigger: "blur" }
-				],
 			}
 		};
 	},

From 7fbaca46bf8b953d40985cd5f39ba6ac53312635 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 1 Nov 2023 14:10:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=BE=E5=A4=87=20=E6=8A=A5=E4=BF=AE=20?=
 =?UTF-8?q?=E7=BB=B4=E4=BF=AE=20=E8=AE=BE=E5=A4=87=E7=8F=AD=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/device/equTeam.js                     |   44 +
 src/api/device/faultReport.js                 |    4 +-
 src/api/device/repairOrder.js                 |   18 +
 src/views/device/equTeam/index.vue            |  442 ++++
 .../device/equTeam/selectSinglePerson.vue     |  182 ++
 .../device/faultReport/selectSinglePerson.vue |    4 +-
 src/views/device/repairOrder/index.vue        | 1816 +++++++++++------
 .../device/repairOrder/selectSinglePerson.vue |   11 +-
 .../device/repairOrder/selectSpareParts.vue   |  335 +++
 9 files changed, 2224 insertions(+), 632 deletions(-)
 create mode 100644 src/api/device/equTeam.js
 create mode 100644 src/views/device/equTeam/index.vue
 create mode 100644 src/views/device/equTeam/selectSinglePerson.vue
 create mode 100644 src/views/device/repairOrder/selectSpareParts.vue

diff --git a/src/api/device/equTeam.js b/src/api/device/equTeam.js
new file mode 100644
index 0000000..1bd5d5d
--- /dev/null
+++ b/src/api/device/equTeam.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询设备班组维护列表
+export function listEquTeam(query) {
+	return request({
+		url: '/device/equTeam/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 查询设备班组维护详细
+export function getEquTeam(id) {
+	return request({
+		url: '/device/equTeam/' + id,
+		method: 'get'
+		});
+}
+
+// 新增设备班组维护
+export function addEquTeam(data) {
+	return request({
+		url: '/device/equTeam',
+		method: 'post',
+		data: data
+	});
+}
+
+// 修改设备班组维护
+export function updateEquTeam(data) {
+	return request({
+		url: '/device/equTeam',
+		method: 'put',
+		data: data
+	});
+}
+
+// 删除设备班组维护
+export function delEquTeam(id) {
+	return request({
+		url: '/device/equTeam/' + id,
+		method: 'delete'
+	});
+}
diff --git a/src/api/device/faultReport.js b/src/api/device/faultReport.js
index 81cb245..a89c5ea 100644
--- a/src/api/device/faultReport.js
+++ b/src/api/device/faultReport.js
@@ -70,9 +70,9 @@ export function checkFaultReport(data) {
 }
 
 // 查询报修人员列表
-export function getPersonList(query) {
+export function getRepairPersonList(query) {
   return request({
-    url: '/device/faultReport/getPersonList',
+    url: '/device/faultReport/getRepairPersonList',
     method: 'get',
     params: query
   });
diff --git a/src/api/device/repairOrder.js b/src/api/device/repairOrder.js
index c096c36..42ef4d8 100644
--- a/src/api/device/repairOrder.js
+++ b/src/api/device/repairOrder.js
@@ -52,4 +52,22 @@ export function applyOutsource(data) {
   });
 }
 
+//填写维修记录
+export function writeRepairOrder(data) {
+  return request({
+    url: '/device/repairOrder/write',
+    method: 'post',
+    data: data
+  });
+}
+
+// 查询维修人员列表
+export function getMaintenancePersonList(query) {
+  return request({
+    url: '/device/repairOrder/getMaintenancePersonList',
+    method: 'get',
+    params: query
+  });
+}
+
 
diff --git a/src/views/device/equTeam/index.vue b/src/views/device/equTeam/index.vue
new file mode 100644
index 0000000..e55295c
--- /dev/null
+++ b/src/views/device/equTeam/index.vue
@@ -0,0 +1,442 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="班组编号" prop="teamCode">
+        <el-input
+          v-model="queryParams.teamCode"
+          placeholder="请输入班组编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="班组名称" prop="teamName">
+        <el-input
+          v-model="queryParams.teamName"
+          placeholder="请输入班组名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="班组类型" prop="teamType">
+        <el-select
+          v-model="queryParams.teamType"
+          placeholder="请选择班组类型"
+          @change="$forceUpdate()"
+          clearable
+          style="width: 200px"
+          @keyup.enter.native="handleQuery"
+        >
+          <el-option
+            v-for="item in teamTypeOption"
+            :key="item.teamType"
+            :label="item.label"
+            :value="item.teamType"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['device:equTeam:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['device:equTeam:edit']"
+          >修改</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['device:equTeam:remove']"
+          >删除</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['device:equTeam:export']"
+          >导出</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="equTeamList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="班组编号" align="center" prop="teamCode" />
+      <el-table-column label="班组名称" align="center" prop="teamName" />
+      <el-table-column label="班组类型" align="center" prop="teamType" />
+      <el-table-column label="班组人员" align="center" prop="teamPerson" width="250"/>
+      <el-table-column label="工厂号" align="center" prop="factoryCode" />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['device:equTeam:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['device:equTeam:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改设备班组维护对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-col :span="12">
+          <el-form-item label="班组编号" prop="teamCode">
+            <el-input
+              v-model="form.teamCode"
+              placeholder="请输入班组编号"
+              style="width: 300px"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="班组名称" prop="teamName">
+            <el-input
+              v-model="form.teamName"
+              placeholder="请输入班组名称"
+              style="width: 300px"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="班组类型" prop="teamType">
+            <el-select
+              v-model="form.teamType"
+              placeholder="请选择班组类型"
+              @change="$forceUpdate()"
+              clearable
+              style="width: 300px"
+            >
+              <el-option
+                v-for="item in teamTypeOption"
+                :key="item.teamType"
+                :label="item.label"
+                :value="item.teamType"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="工厂号" prop="factoryCode">
+            <el-input
+              v-model="form.factoryCode"
+              placeholder="请输入工厂号"
+              style="width: 300px"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="班组人员" prop="teamPerson">
+            <el-input
+              v-model="form.teamPerson"
+              placeholder="请选择班组人员"
+              style="width: 680px"
+            >
+              <el-button
+                slot="append"
+                @click="handleSelectPerson"
+                icon="el-icon-search"
+              ></el-button>
+            </el-input>
+            <ItemSelectPerson
+              ref="itemSelectPerson"
+              @onSelected="onItemSelectedPerson"
+            >
+            </ItemSelectPerson>
+          </el-form-item>
+        </el-col>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listEquTeam,
+  getEquTeam,
+  delEquTeam,
+  addEquTeam,
+  updateEquTeam,
+} from "@/api/device/equTeam";
+import ItemSelectPerson from "./selectSinglePerson.vue";
+
+export default {
+  name: "EquTeam",
+  components: { ItemSelectPerson },
+  data() {
+    return {
+      //人员回显
+      checkTeamPerson: null,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备班组维护表格数据
+      equTeamList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        teamCode: null,
+        teamName: null,
+        teamType: null,
+        teamPerson: null,
+        factoryCode: null,
+      },
+      teamTypeOption: [
+        {
+          teamType: "维修班组",
+          label: "维修班组",
+        },
+        {
+          teamType: "点检班组",
+          label: "点检班组",
+        },
+        {
+          teamType: "巡检班组",
+          label: "巡检班组",
+        },
+        {
+          teamType: "保养班组",
+          label: "保养班组",
+        },
+      ],
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    //人员选择
+    handleSelectPerson() {
+      this.$refs.itemSelectPerson.showFlag = true;
+    },
+    //人员选择
+    onItemSelectedPerson(obj) {
+      this.form.workPerson = obj;
+    },
+    /** 查询设备班组维护列表 */
+    getList() {
+      this.loading = true;
+      listEquTeam(this.queryParams).then((response) => {
+        this.equTeamList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        teamCode: null,
+        teamName: null,
+        teamType: null,
+        teamPerson: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        delFlag: null,
+        factoryCode: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加设备班组维护";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getEquTeam(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改设备班组维护";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateEquTeam(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addEquTeam(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    //人员选择
+    onItemSelectedPerson(obj) {
+      if (this.form.teamPerson == null || this.form.teamPerson == "") {
+        this.form.teamPerson = obj;
+      } else {
+        if (obj != undefined && obj != null && obj != "") {
+          const a = obj.split(",");
+          const len = obj.split(",").length;
+          a.forEach((item) => {
+            this.checkTeamPerson = this.form.teamPerson.search(item) != -1;
+            if (this.checkTeamPerson == true) {
+              Message.warning("您已经添加过该人员,请勿重复添加！！！");
+            } else if (this.checkTeamPerson == false) {
+              this.form.teamPerson = this.form.teamPerson + "," + item;
+            }
+          });
+        }
+      }
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除设备班组维护编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delEquTeam(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "device/equTeam/export",
+        {
+          ...this.queryParams,
+        },
+        `equTeam_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>
diff --git a/src/views/device/equTeam/selectSinglePerson.vue b/src/views/device/equTeam/selectSinglePerson.vue
new file mode 100644
index 0000000..34ade19
--- /dev/null
+++ b/src/views/device/equTeam/selectSinglePerson.vue
@@ -0,0 +1,182 @@
+<template>
+  <el-dialog title="人员选择"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal= false
+    width="800px"
+    center
+    :before-close="cancelEquipmentForm"
+  >
+    <el-row :gutter="20">
+      <!--人员数据-->
+      <el-col :span="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="人员编码" prop="itemCode">
+            <el-input
+              v-model="queryParams.itemCode"
+              placeholder="请输入人员编码"
+              clearable
+              style="width: 150px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="人员名称" prop="itemName">
+            <el-input
+              v-model="queryParams.itemName"
+              placeholder="请输入人员名称"
+              clearable
+              style="width: 150px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+        <el-table v-loading="loading" :data="itemList" @selection-change="handleEquipmentSelectionChange" ref="myTable">
+          <el-table-column width="50" align="center" type="selection"></el-table-column>
+          <!-- 序号 -->
+          <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column>
+          <el-table-column label="人员编码" align="center" key="itemCode" prop="userName" v-if="columns[0].visible" ></el-table-column>
+          <el-table-column label="人员名称"  align="left" key="itemName" prop="nickName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="部门编码" align="center"  prop="postCode" v-if="columns[2].visible" ></el-table-column>
+          <el-table-column label="部门名称" align="center" prop="postName" v-if="columns[3].visible" ></el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+    <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitPersonForm">确 定</el-button>
+        <el-button @click="cancelEquipmentForm">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getMaintenancePersonList} from "@/api/device/repairOrder";
+import { Message } from 'element-ui'
+
+export default {
+  name: "MdItemSingle",
+  data() {
+    return {
+      treeData1:[],
+      showFlag:false,
+      // 选中数组
+      selectedItemId: undefined,
+      selectedRows: undefined,
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total:0,
+      // 人员表格数据
+      itemList: null,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        itemName: undefined,
+        itemCodeGet: '',
+        itemCode : undefined,
+      },
+      // 列信息
+      columns: [
+        { key: 0, label: `人员编码`, visible: true },
+        { key: 1, label: `人员名称`, visible: true },
+        { key: 2, label: `部门编码`, visible: true },
+        { key: 3, label: `部门名称`, visible: true },
+      ]
+    };
+  },
+  created() {
+    this.getList();
+  },
+
+  methods: {
+      // 表单重置
+      reset() {
+        this.form = {
+          itemId: null,
+          itemCode: this.processId,
+          itemType: null,
+        };
+        this.resetForm("form");
+      },
+
+    handleEquipmentSelectionChange (val) {
+       this.itemList = val;
+    },
+
+  	 // 生成表头序号
+        indexMethod(index){
+          return index+1 ;
+        },
+    //
+
+    /** 查询设备编码列表*/
+    getList() {
+      this.loading = true;
+      getMaintenancePersonList(this.queryParams).then(response => {
+          this.itemList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+
+    // 节点单击事件
+    handleNodeClick(data) {
+      console.log('id',data.id);
+      this.queryParams.equipmentTypeCode = data.equipmentTypeCode;
+      console.log(this.equipmentTypeCode);
+      this.handleQuery();
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams.equipmentTypeCode = null;
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+
+    // 多选框选中数据
+		handleEquipmentSelectionChange(selection) {
+			this.ids = selection.map(item => item.nickName);
+			this.single = selection.length!==1;
+			this.multiple = !selection.length;
+			console.log("多选框",this.ids);
+		},
+
+    submitPersonForm() {
+      const data = this.ids;
+      const nickName = data.toString();
+      if(this.queryParams.itemCodeGet == ""){
+        this.queryParams.itemCodeGet = nickName;
+      }
+        this.selectedRows = this.queryParams.itemCodeGet;
+        this.$emit('onSelected', this.selectedRows);
+        this.getList();
+        this.showFlag = false;
+        this.queryParams.itemCodeGet = "";
+    }
+  }
+};
+</script>
diff --git a/src/views/device/faultReport/selectSinglePerson.vue b/src/views/device/faultReport/selectSinglePerson.vue
index 68cf559..05f59b1 100644
--- a/src/views/device/faultReport/selectSinglePerson.vue
+++ b/src/views/device/faultReport/selectSinglePerson.vue
@@ -60,7 +60,7 @@
 </template>
 
 <script>
-import { getPersonList} from "@/api/device/faultReport";
+import { getRepairPersonList} from "@/api/device/faultReport";
 import { Message } from 'element-ui'
 
 export default {
@@ -125,7 +125,7 @@ export default {
     /** 查询设备编码列表*/
     getList() {
       this.loading = true;
-      getPersonList(this.queryParams).then(response => {
+      getRepairPersonList(this.queryParams).then(response => {
           this.itemList = response.rows;
           this.total = response.total;
           this.loading = false;
diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue
index 5dfe8a5..d3062b1 100644
--- a/src/views/device/repairOrder/index.vue
+++ b/src/views/device/repairOrder/index.vue
@@ -1,646 +1,1191 @@
 <template>
-	<div class="app-container">
-		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px">
-			<el-form-item label="维修单号" prop="workCode">
-				<el-input
-					v-model="queryParams.workCode"
-					placeholder="请输入维修单号"
-					clearable
-					style="width:200px"
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="报修单号" prop="orderCode">
-				<el-input
-					v-model="queryParams.orderCode"
-					placeholder="请输入报修单号"
-					style="width:200px"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="设备编码" prop="equipmentCode">
-				<el-input
-					v-model="queryParams.equipmentCode"
-					placeholder="请输入设备编码"
-					clearable
-					style="width:200px"
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="是否停机维修" prop="workDownMachine">
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="98px"
+    >
+      <el-form-item label="维修单号" prop="workCode">
+        <el-input
+          v-model="queryParams.workCode"
+          placeholder="请输入维修单号"
+          clearable
+          style="width: 200px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="报修单号" prop="orderCode">
+        <el-input
+          v-model="queryParams.orderCode"
+          placeholder="请输入报修单号"
+          style="width: 200px"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备编码" prop="equipmentCode">
+        <el-input
+          v-model="queryParams.equipmentCode"
+          placeholder="请输入设备编码"
+          clearable
+          style="width: 200px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否停机维修" prop="workDownMachine">
         <el-select
           v-model="queryParams.workDownMachine"
           placeholder="请选择是否停机"
           @change="$forceUpdate()"
           clearable
-          style="width:200px"
-          @keyup.enter.native="handleQuery">
-          <el-option v-for="item in workDownMachineOption" :key="item.workDownMachine" :label="item.label" :value="item.workDownMachine"></el-option>
+          style="width: 200px"
+          @keyup.enter.native="handleQuery"
+        >
+          <el-option
+            v-for="item in workDownMachineOption"
+            :key="item.workDownMachine"
+            :label="item.label"
+            :value="item.workDownMachine"
+          ></el-option>
         </el-select>
-			</el-form-item>
-			<el-form-item label="计划维修时间" prop="workPlanTime">
-				<el-date-picker clearable
-					v-model="queryParams.workPlanTime"
-					type="date"
-					value-format="yyyy-MM-dd HH:mm:ss"
-					placeholder="请选择计划维修时间">
-				</el-date-picker>
-			</el-form-item>
-			<el-form-item label="计划停机时间" prop="workPlanDownTime">
-				<el-date-picker clearable
-					v-model="queryParams.workPlanDownTime"
-					type="date"
-					value-format="yyyy-MM-dd HH:mm:ss"
-					placeholder="请选择计划停机时间">
-				</el-date-picker>
-			</el-form-item>
-			<el-form-item label="维修人员" prop="workPerson">
-				<el-input
-					v-model="queryParams.workPerson"
-					placeholder="请输入维修人员"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="维修组" prop="workTeam">
-				<el-input
-					v-model="queryParams.workTeam"
-					placeholder="请输入维修组"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="是否委外" prop="workOutsource">
+      </el-form-item>
+      <el-form-item label="计划维修时间" prop="workPlanTime">
+        <el-date-picker
+          clearable
+          v-model="queryParams.workPlanTime"
+          type="date"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="请选择计划维修时间"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="计划停机时间" prop="workPlanDownTime">
+        <el-date-picker
+          clearable
+          v-model="queryParams.workPlanDownTime"
+          type="date"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="请选择计划停机时间"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="维修人员" prop="workPerson">
+        <el-input
+          v-model="queryParams.workPerson"
+          placeholder="请输入维修人员"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="维修组" prop="workTeam">
+        <el-input
+          v-model="queryParams.workTeam"
+          placeholder="请输入维修组"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否委外" prop="workOutsource">
         <el-select
           v-model="queryParams.workOutsource"
           placeholder="请选择是否委外"
           @change="$forceUpdate()"
           clearable
-          style="width:220px"
-          @keyup.enter.native="handleQuery">
-          <el-option v-for="item in workOutsourceOption" :key="item.workOutsource" :label="item.label" :value="item.workOutsource"></el-option>
+          style="width: 220px"
+          @keyup.enter.native="handleQuery"
+        >
+          <el-option
+            v-for="item in workOutsourceOption"
+            :key="item.workOutsource"
+            :label="item.label"
+            :value="item.workOutsource"
+          ></el-option>
         </el-select>
-			</el-form-item>
+      </el-form-item>
 
-			<el-form-item label="委外工单编码" prop="outWorkCode">
-				<el-input
-					v-model="queryParams.outWorkCode"
-					placeholder="请输入委外工单编码"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item>
-				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-			</el-form-item>
-		</el-form>
+      <el-form-item label="委外工单编码" prop="outWorkCode">
+        <el-input
+          v-model="queryParams.outWorkCode"
+          placeholder="请输入委外工单编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
 
-		<el-row :gutter="10" class="mb8">
-			<el-col :span="1.5">
-				<el-button
-					type="primary"
-					plain
-					icon="el-icon-plus"
-					size="mini"
-					@click="handleAdd"
-					v-hasPermi="['device: repairOrder:add']"
-				>快速工单</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="success"
-					plain
-					icon="el-icon-edit"
-					size="mini"
-					:disabled="single"
-					@click="handleUpdate"
-					v-hasPermi="['device: repairOrder:edit']"
-				>修改</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="danger"
-					plain
-					icon="el-icon-delete"
-					size="mini"
-					:disabled="multiple"
-					@click="handleDelete"
-					v-hasPermi="['device: repairOrder:remove']"
-				>删除</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="warning"
-					plain
-					icon="el-icon-download"
-					size="mini"
-					@click="handleExport"
-					v-hasPermi="['device: repairOrder:export']"
-				>导出</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="success"
-					:disabled="single"
-					plain
-					icon="el-icon-document-add"
-					size="mini"
-					@click="handleApply"
-					v-hasPermi="['device: repairOrder:apply']"
-				>委外申请</el-button>
-			</el-col>
-			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-		</el-row>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['device: repairOrder:add']"
+          >快速工单</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['device: repairOrder:edit']"
+          >修改</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['device: repairOrder:remove']"
+          >删除</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['device: repairOrder:export']"
+          >导出</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          :disabled="single"
+          plain
+          icon="el-icon-document-add"
+          size="mini"
+          @click="handleApply"
+          v-hasPermi="['device: repairOrder:apply']"
+          >委外申请</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          :disabled="single"
+          @click="handleWrite"
+          v-hasPermi="['device: repairOrder:write']"
+          >填写维修记录</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
 
-		<el-table v-loading="loading" :data=" repairOrderList" @selection-change="handleSelectionChange">
-			<el-table-column type="selection" width="55" align="center" />
-			<el-table-column label="维修单号" align="center" prop="workCode" width="180"/>
-			<el-table-column label="报修单号" align="center" prop="orderCode" width="180"/>
-			<el-table-column label="设备编码" align="center" prop="equipmentCode" />
-			<el-table-column label="计划维修时间" align="center" prop="workPlanTime" width="180">
-				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.workPlanTime) }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column label="是否停机维修" align="center" prop="workDownMachine" width="180">
-			  <template slot-scope="scope">
+    <el-table
+      v-loading="loading"
+      :data="repairOrderList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="维修单号"
+        align="center"
+        prop="workCode"
+        width="180"
+      />
+      <el-table-column
+        label="报修单号"
+        align="center"
+        prop="orderCode"
+        width="180"
+      />
+      <el-table-column label="设备编码" align="center" prop="equipmentCode" />
+      <el-table-column
+        label="故障描述"
+        align="center"
+        prop="workFaultDesc"
+        width="300"
+      />
+      <el-table-column
+        label="计划维修时间"
+        align="center"
+        prop="workPlanTime"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.workPlanTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="是否停机维修"
+        align="center"
+        prop="workDownMachine"
+        width="180"
+      >
+        <template slot-scope="scope">
           {{ scope.row.workDownMachine == "1" ? "停机" : "不停机" }}
         </template>
       </el-table-column>
-			<el-table-column label="计划停机时间" align="center" prop="workPlanDownTime" width="180">
-				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.workPlanDownTime) }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column label="维修人员" align="center" prop="workPerson" />
-			<el-table-column label="维修组" align="center" prop="workTeam" />
-			<el-table-column label="是否委外" align="center" prop="workOutsource" >
-				<template slot-scope="scope">
+      <el-table-column
+        label="计划停机时间"
+        align="center"
+        prop="workPlanDownTime"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.workPlanDownTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="维修人员" align="center" prop="workPerson" />
+      <el-table-column label="维修组" align="center" prop="workTeam" />
+      <el-table-column label="是否委外" align="center" prop="workOutsource">
+        <template slot-scope="scope">
           {{ scope.row.workOutsource == "1" ? "转委外" : "不委外" }}
         </template>
-			</el-table-column>
-      <el-table-column label="委外工单编码" align="center" prop="outWorkCode" width="180"/>
-			<el-table-column label="原因分析" align="center" prop="workReason" />
-			<el-table-column label="故障描述" align="center" prop="workFaultDesc" />
-			<el-table-column label="维修用时" align="center" prop="workCostTime" width="180">
-				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.workCostTime) }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column label="维修费用" align="center" prop="workCost" />
-			<el-table-column label="工厂编码" align="center" prop="factoryCode" />
-			<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
-				<template slot-scope="scope">
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-edit"
-						@click="handleUpdate(scope.row)"
-						v-hasPermi="['device: repairOrder:edit']"
-					>修改</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-delete"
-						@click="handleDelete(scope.row)"
-						v-hasPermi="['device: repairOrder:remove']"
-					>删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
+      </el-table-column>
+      <el-table-column
+        label="委外工单编码"
+        align="center"
+        prop="outWorkCode"
+        width="180"
+      />
+      <el-table-column
+        label="原因分析"
+        align="center"
+        prop="workReason"
+        width="300"
+      />
+      <el-table-column
+        label="维修用时"
+        align="center"
+        prop="workCostTime"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.workCostTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="维修开始时间"
+        align="center"
+        prop="workStartTime"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.workStartTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="维修结束时间"
+        align="center"
+        prop="workEndTime"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.workEndTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="维修费用" align="center" prop="workCost" />
+      <el-table-column label="工厂编码" align="center" prop="factoryCode" />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['device: repairOrder:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['device: repairOrder:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
 
-		<pagination
-			v-show="total>0"
-			:total="total"
-			:page.sync="queryParams.pageNum"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList"
-		/>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
-		<!-- 快速维修工单对话框 -->
-		<el-dialog :title="title" :visible.sync="openAdd" width="500px" append-to-body>
-			<el-form ref="form" :model="form" :rules="rules" label-width="120px">
-				<el-form-item label="报修单号" prop="orderCode">
-					<el-input v-model="form.orderCode" placeholder="请输入报修单号" style="width:250px"/>
-				</el-form-item>
-				<el-form-item label="设备编码" prop="equipmentCode">
-        	<el-input v-model="form.equipmentCode" placeholder="请输入设备编码" style="width:250px">
-        	                <el-button
-                            slot="append"
-                            @click="handleSelectEquipment"
-                            icon="el-icon-search"
-                          ></el-button>
-                        </el-input>
-                        <ItemSelect
-                          ref="itemSelect"
-                          @onSelected="onItemSelectedEquipment"
-                        >
-                        </ItemSelect>
+    <!-- 快速维修工单对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="openAdd"
+      width="500px"
+      append-to-body
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="报修单号" prop="orderCode">
+          <el-input
+            v-model="form.orderCode"
+            placeholder="请输入报修单号"
+            style="width: 250px"
+          />
         </el-form-item>
-				<el-form-item label="计划维修时间" prop="workPlanTime">
-					<el-date-picker clearable
-						v-model="form.workPlanTime"
-						type="datetime"
-						value-format="yyyy-MM-dd HH:mm:ss"
-						style="width:250px"
-						placeholder="请选择计划维修时间">
-					</el-date-picker>
-				</el-form-item>
-				<el-form-item label="计划停机时间" prop="workPlanDownTime">
-					<el-date-picker clearable
-						v-model="form.workPlanDownTime"
-						type="datetime"
-						style="width:250px"
-						value-format="yyyy-MM-dd HH:mm:ss"
-						placeholder="请选择计划停机时间">
-					</el-date-picker>
-				</el-form-item>
-				<el-form-item label="维修人员" prop="workPerson" >
-					<el-input v-model="form.workPerson" placeholder="请输入维修人员" style="width:250px">
-					                <el-button
-                            slot="append"
-                            @click="handleSelectPerson"
-                            icon="el-icon-search"
-                          ></el-button>
-                        </el-input>
-                        <ItemSelectPerson
-                          ref="itemSelectPerson"
-                          @onSelected="onItemSelectedPerson"
-                        >
-                        </ItemSelectPerson>
-				</el-form-item>
-				<el-form-item label="维修组" prop="workTeam" style="width:250px">
-					<el-input v-model="form.workTeam" placeholder="请输入维修组" style="width:250px"/>
-				</el-form-item>
-			</el-form>
-			<div slot="footer" class="dialog-footer">
-				<el-button type="primary" @click="submitForm">确 定</el-button>
-				<el-button @click="cancelAddForm">取 消</el-button>
-			</div>
-		</el-dialog>
+        <el-form-item label="设备编码" prop="equipmentCode">
+          <el-input
+            v-model="form.equipmentCode"
+            placeholder="请输入设备编码"
+            style="width: 250px"
+          >
+            <el-button
+              slot="append"
+              @click="handleSelectEquipment"
+              icon="el-icon-search"
+            ></el-button>
+          </el-input>
+          <ItemSelect ref="itemSelect" @onSelected="onItemSelectedEquipment">
+          </ItemSelect>
+        </el-form-item>
+        <el-form-item label="计划维修时间" prop="workPlanTime">
+          <el-date-picker
+            clearable
+            v-model="form.workPlanTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            style="width: 250px"
+            placeholder="请选择计划维修时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="计划停机时间" prop="workPlanDownTime">
+          <el-date-picker
+            clearable
+            v-model="form.workPlanDownTime"
+            type="datetime"
+            style="width: 250px"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择计划停机时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="维修人" prop="workPerson">
+          <el-input
+            v-model="form.workPerson"
+            placeholder="请选择维修人"
+            style="width: 250px"
+          >
+            <el-button
+              slot="append"
+              @click="handleSelectPerson"
+              icon="el-icon-search"
+            ></el-button>
+          </el-input>
+          <ItemSelectPerson
+            ref="itemSelectPerson"
+            @onSelected="onItemSelectedPerson"
+          >
+          </ItemSelectPerson>
+        </el-form-item>
+        <el-form-item label="维修组" prop="workTeam" style="width: 250px">
+          <el-input
+            v-model="form.workTeam"
+            placeholder="请输入维修组"
+            style="width: 250px"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancelAddForm">取 消</el-button>
+      </div>
+    </el-dialog>
 
-		<!-- 修改维修工单对话框 -->
-    		<el-dialog :title="title" :visible.sync="openUpdate" width="500px" append-to-body>
-    			<el-form ref="form" :model="form" :rules="rules" label-width="120px">
-    				<el-form-item label="报修单号" prop="orderCode">
-    					<el-input v-model="form.orderCode" placeholder="请输入报修单号" style="width:250px" disabled/>
-    				</el-form-item>
-    				<el-form-item label="设备编码" prop="equipmentCode">
-            	<el-input v-model="form.equipmentCode" placeholder="请输入设备编码" style="width:250px" disabled/>
+    <!-- 修改维修工单对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="openUpdate"
+      width="500px"
+      append-to-body
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="报修单号" prop="orderCode">
+          <el-input
+            v-model="form.orderCode"
+            placeholder="请输入报修单号"
+            style="width: 250px"
+            disabled
+          />
+        </el-form-item>
+        <el-form-item label="设备编码" prop="equipmentCode">
+          <el-input
+            v-model="form.equipmentCode"
+            placeholder="请输入设备编码"
+            style="width: 250px"
+            disabled
+          />
+        </el-form-item>
+        <el-form-item label="计划维修时间" prop="workPlanTime">
+          <el-date-picker
+            clearable
+            v-model="form.workPlanTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            style="width: 250px"
+            placeholder="请选择计划维修时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="计划停机时间" prop="workPlanDownTime">
+          <el-date-picker
+            clearable
+            v-model="form.workPlanDownTime"
+            type="datetime"
+            style="width: 250px"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择计划停机时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="维修人" prop="workPerson">
+          <el-input
+            v-model="form.workPerson"
+            placeholder="请选择维修人"
+            style="width: 250px"
+          >
+            <el-button
+              slot="append"
+              @click="handleSelectPerson"
+              icon="el-icon-search"
+            ></el-button>
+          </el-input>
+          <ItemSelectPerson
+            ref="itemSelectPerson"
+            @onSelected="onItemSelectedPerson"
+          >
+          </ItemSelectPerson>
+        </el-form-item>
+        <el-form-item label="维修组" prop="workTeam" style="width: 250px">
+          <el-input
+            v-model="form.workTeam"
+            placeholder="请输入维修组"
+            style="width: 250px"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancelUpdateForm">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 委外申请 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="openApply"
+      width="1000px"
+      append-to-body
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="8">
+            <el-form-item label="设备编码" prop="equipmentCode">
+              <el-input
+                v-model="form.equipmentCode"
+                style="width: 195px"
+                disabled
+              >
+              </el-input>
             </el-form-item>
-    				<el-form-item label="计划维修时间" prop="workPlanTime">
-    					<el-date-picker clearable
-    						v-model="form.workPlanTime"
-    						type="datetime"
-    						value-format="yyyy-MM-dd HH:mm:ss"
-    						style="width:250px"
-    						placeholder="请选择计划维修时间">
-    					</el-date-picker>
-    				</el-form-item>
-    				<el-form-item label="计划停机时间" prop="workPlanDownTime">
-    					<el-date-picker clearable
-    						v-model="form.workPlanDownTime"
-    						type="datetime"
-    						style="width:250px"
-    						value-format="yyyy-MM-dd HH:mm:ss"
-    						placeholder="请选择计划停机时间">
-    					</el-date-picker>
-    				</el-form-item>
-    				<el-form-item label="维修人员" prop="workPerson" >
-    					<el-input v-model="form.workPerson" placeholder="请输入维修人员" style="width:250px"/>
-    				</el-form-item>
-    				<el-form-item label="维修组" prop="workTeam" style="width:250px">
-    					<el-input v-model="form.workTeam" placeholder="请输入维修组" style="width:250px"/>
-    				</el-form-item>
-    			</el-form>
-    			<div slot="footer" class="dialog-footer">
-    				<el-button type="primary" @click="submitForm">确 定</el-button>
-    				<el-button @click="cancelUpdateForm">取 消</el-button>
-    			</div>
-    		</el-dialog>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input
+                v-model="form.equipmentName"
+                style="width: 195px"
+                disabled
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备类型" prop="equipmentTypeName">
+              <el-input
+                v-model="form.equipmentTypeName"
+                style="width: 195px"
+                disabled
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="8">
+            <el-form-item label="规格型号" prop="equipmentSpec">
+              <el-input
+                v-model="form.equipmentSpec"
+                style="width: 195px"
+                disabled
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="所在部门" prop="department">
+              <el-input v-model="form.department" style="width: 195px" disabled>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="所在位置" prop="equipmentLocation">
+              <el-input
+                v-model="form.equipmentLocation"
+                style="width: 195px"
+                disabled
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item prop="workOutsourcingUnit" label="委外单位">
+              <el-input
+                v-model="form.workOutsourcingUnit"
+                placeholder="请填写委外单位"
+                style="width: 195px"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="outSourcePerson" label="委外维修人员">
+              <el-input
+                v-model="form.outSourcePerson"
+                placeholder="请填写委外维修人员"
+                style="width: 195px"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="workConnection" label="联系方式">
+              <el-input
+                v-model="form.workConnection"
+                placeholder="请填写委外联系方式"
+                style="width: 195px"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item prop="outSourceReason" label="委外原因">
+              <el-input
+                v-model="form.outSourceReason"
+                placeholder="请输入委外原因"
+                type="textarea"
+                :autosize="{ minRows: 2, maxRows: 4 }"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitApplyForm">确 定</el-button>
+        <el-button @click="cancelApplyForm">返 回</el-button>
+      </div>
+    </el-dialog>
 
-                <!-- 委外申请 -->
-                <el-dialog
-                  :title="title"
-                  :visible.sync="openApply"
-                  width="1000px"
-                  append-to-body
+    <!-- 填写维修记录对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="openWrite"
+      width="1000px"
+      append-to-body
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="90px">
+        <div class="step-margin">
+          <el-steps
+            :active="repairRecordSteps"
+            finish-status="success"
+            align-center
+          >
+            <el-step title="维修基本信息"></el-step>
+            <el-step title="填写处理结果"></el-step>
+            <el-step title="填写备件领用记录"></el-step>
+          </el-steps>
+        </div>
+        <!-- 维修基本信息 -->
+        <div v-if="this.repairRecordSteps == 0">
+          <div class="classification"><h3>基本信息</h3></div>
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="8">
+              <el-form-item label="设备编码" prop="equipmentCode">
+                <el-input
+                  v-model="form.equipmentCode"
+                  style="width: 195px"
+                  disabled
                 >
-                  <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-                    <el-row :gutter="10" class="mb8">
-                      <el-col :span="8">
-                        <el-form-item label="设备编码" prop="equipmentCode" >
-                          <el-input
-                            v-model="form.equipmentCode"
-                            style="width: 195px"
-                            disabled
-                          >
-                          </el-input>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="8">
-                        <el-form-item label="设备名称" prop="equipmentName" >
-                          <el-input
-                            v-model="form.equipmentName"
-                            style="width: 195px"
-                            disabled
-                          >
-                          </el-input>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="8">
-                        <el-form-item label="设备类型" prop="equipmentTypeName" >
-                          <el-input
-                            v-model="form.equipmentTypeName"
-                            style="width: 195px"
-                            disabled
-                          >
-                          </el-input>
-                        </el-form-item>
-                      </el-col>
-                    </el-row>
-                    <el-row :gutter="10" class="mb8">
-                      <el-col :span="8">
-                        <el-form-item label="规格型号" prop="equipmentSpec" >
-                          <el-input
-                            v-model="form.equipmentSpec"
-                            style="width: 195px"
-                            disabled
-                          >
-                          </el-input>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="8">
-                        <el-form-item label="所在部门" prop="department">
-                          <el-input v-model="form.department" style="width: 195px" disabled>
-                          </el-input>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="8">
-                        <el-form-item label="所在位置" prop="equipmentLocation">
-                          <el-input
-                            v-model="form.equipmentLocation"
-                            style="width: 195px"
-                            disabled
-                          >
-                          </el-input>
-                        </el-form-item>
-                      </el-col>
-                    </el-row>
-                    <el-row>
-                    <el-col :span="8">
-                      <el-form-item prop="workOutsourcingUnit" label="委外单位">
-                        <el-input v-model="form.workOutsourcingUnit" placeholder="请填写委外单位" style="width: 195px"/>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                      <el-form-item prop="outSourcePerson" label="委外维修人员">
-                        <el-input v-model="form.outSourcePerson" placeholder="请填写委外维修人员" style="width: 195px"/>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                      <el-form-item prop="workConnection" label="联系方式">
-                        <el-input v-model="form.workConnection" placeholder="请填写委外联系方式" style="width: 195px"/>
-                      </el-form-item>
-                    </el-col>
-                    </el-row>
-                    <el-row>
-                    <el-col :span="24">
-                      <el-form-item prop="outSourceReason" label="委外原因">
-                        <el-input
-                          v-model="form.outSourceReason"
-                          placeholder="请输入委外原因"
-                          type="textarea"
-                          :autosize="{ minRows: 2, maxRows: 4 }"
-                        />
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-                  </el-form>
-                  <div slot="footer" class="dialog-footer">
-                    <el-button type="primary" @click="submitApplyForm">确 定</el-button>
-                    <el-button @click="cancelApplyForm">返 回</el-button>
-                  </div>
-                </el-dialog>
-	</div>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备名称" prop="equipmentName">
+                <el-input
+                  v-model="form.equipmentName"
+                  style="width: 195px"
+                  disabled
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备类型" prop="equipmentTypeName">
+                <el-input
+                  v-model="form.equipmentTypeName"
+                  style="width: 195px"
+                  disabled
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="8">
+              <el-form-item label="规格型号" prop="equipmentSpec">
+                <el-input
+                  v-model="form.equipmentSpec"
+                  style="width: 195px"
+                  disabled
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="所在部门" prop="department">
+                <el-input
+                  v-model="form.department"
+                  style="width: 195px"
+                  disabled
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="所在位置" prop="equipmentLocation">
+                <el-input
+                  v-model="form.equipmentLocation"
+                  style="width: 195px"
+                  disabled
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="classification"><h3>故障信息</h3></div>
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="8">
+              <el-form-item label="报修单号" prop="orderCode">
+                <el-input
+                  v-model="form.orderCode"
+                  style="width: 195px"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="维修单号" prop="orderCode">
+                <el-input
+                  v-model="form.workCode"
+                  style="width: 195px"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="故障时间" prop="orderBreakdownTime">
+                <el-input
+                  v-model="form.orderBreakdownTime"
+                  style="width: 195px"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="8">
+              <el-form-item label="报修时间" prop="orderTime">
+                <el-input
+                  v-model="form.orderTime"
+                  style="width: 195px"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="报修人" prop="orderRepairman">
+                <el-input
+                  v-model="form.orderRepairman"
+                  style="width: 195px"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="联系方式" prop="orderConnection">
+                <el-input
+                  v-model="form.orderConnection"
+                  style="width: 195px"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-col :span="23">
+            <el-form-item label="故障描述" prop="orderDesc">
+              <el-input
+                v-model="form.orderDesc"
+                placeholder="请输入故障描述"
+                type="textarea"
+                :autosize="{ minRows: 2, maxRows: 4 }"
+                style="width: 840px"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </div>
+        <!-- 处理结果 -->
+        <div v-if="this.repairRecordSteps == 1" class="step-body">
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="24">
+              <el-form-item label="原因分析" prop="workReason">
+                <el-input
+                  v-model="form.workReason"
+                  placeholder="请输入故障原因分析"
+                  type="textarea"
+                  :autosize="{ minRows: 2, maxRows: 4 }"
+                  style="width: 840px"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="8">
+        <el-form-item label="维修人" prop="workPerson">
+          <el-input
+            v-model="form.workPerson"
+            placeholder="请选择维修人"
+            style="width: 195px"
+          >
+            <el-button
+              slot="append"
+              @click="handleSelectPerson"
+              icon="el-icon-search"
+            ></el-button>
+          </el-input>
+          <ItemSelectPerson
+            ref="itemSelectPerson"
+            @onSelected="onItemSelectedPerson"
+          >
+          </ItemSelectPerson>
+        </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="维修状态" prop="workStatus">
+                <el-input v-model="form.workStatus" style="width: 195px">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="维修费用" prop="workCost">
+                <el-input-number
+                  :min="0"
+                  :step="1"
+                  v-model="form.workCost"
+                  style="width: 175px"
+                />
+                <span> 元</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="8">
+              <el-form-item label="开始时间" prop="workStartTime">
+                <el-date-picker
+                  clearable
+                  v-model="form.workStartTime"
+                  type="datetime"
+                  style="width: 195px"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="请选择开始维修时间"
+                ></el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="结束时间" prop="workEndTime">
+                <el-date-picker
+                  clearable
+                  v-model="form.workEndTime"
+                  type="datetime"
+                  style="width: 195px"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="请选择结束维修时间"
+                ></el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="维修用时" prop="workCostTime">
+                <el-input v-model="form.workCostTime" style="width: 195px">
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="8">
+              <el-form-item label="是否停机" prop="workDownMachine">
+                <el-radio-group v-model="form.workDownMachine">
+                  <el-radio label="1">是</el-radio>
+                  <el-radio label="0">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="停机时长" prop="orderBreakdownTime">
+                <el-input
+                  v-model="form.orderBreakdownTime"
+                  style="width: 195px"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+        <!-- 使用备件领用记录 -->
+        <div v-if="this.repairRecordSteps == 2" class="step-body">
+          <SelectSpareParts :optType="optType"></SelectSpareParts>
+        </div>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button v-if="this.repairRecordSteps > 0" @click="stepLast"
+          >上一步</el-button
+        >
+        <el-button v-if="this.repairRecordSteps < 2" @click="stepNext"
+          >下一步</el-button
+        >
+        <el-button
+          v-if="this.repairRecordSteps == 2"
+          type="primary"
+          @click="submitForm"
+          >提 交</el-button
+        >
+        <el-button @click="cancelWriteForm">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
-<script>
-import { listRepairOrder, getRepairOrder, delRepairOrder, addRepairOrder, updateRepairOrder,applyOutsource } from "@/api/device/repairOrder";
+  <script>
+import {
+  listRepairOrder,
+  getRepairOrder,
+  delRepairOrder,
+  addRepairOrder,
+  updateRepairOrder,
+  applyOutsource,
+  writeRepairOrder,
+} from "@/api/device/repairOrder";
 import ItemSelect from "./selectSingleEquipment.vue";
 import ItemSelectPerson from "./selectSinglePerson.vue";
-import { Message } from 'element-ui'
+import { Message } from "element-ui";
+import SelectSpareParts from "./selectSpareParts.vue";
 
 export default {
-	name: " repairOrder",
-	components: { ItemSelect,ItemSelectPerson },
-	data() {
-		return {
-			// 遮罩层
-			loading: true,
-			// 选中数组
-			ids: [],
-			// 非单个禁用
-			single: true,
-			// 非多个禁用
-			multiple: true,
-			// 显示搜索条件
-			showSearch: true,
-			// 总条数
-			total: 0,
-			// 维修工单表格数据
-			 repairOrderList: [],
-			// 弹出层标题
-			title: "",
-			// 是否显示快速工单弹出层
-			openAdd: false,
-			// 是否显示修改工单弹出层
-			openUpdate: false,
-			// 是否显示委外申请弹出层
+  name: " RepairOrder",
+  components: { ItemSelect, ItemSelectPerson, SelectSpareParts },
+  data() {
+    return {
+      optType: undefined,
+      // 步骤
+      repairRecordSteps: 0,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 维修工单表格数据
+      repairOrderList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示快速工单弹出层
+      openAdd: false,
+      // 是否显示修改工单弹出层
+      openUpdate: false,
+      // 是否显示委外申请弹出层
       openApply: false,
-			// 查询参数
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				orderId: null,
-				orderCode: null,
-				workCode: null,
-				workHandle: null,
-				workPlanTime: null,
-				workPlanDownTime: null,
-				orderRelevance: null,
-				workPerson: null,
-				workTeam: null,
-				workOutsource: null,
-				workDownMachine: null,
-				equipmentCode: null,
-				workReason: null,
-				workFaultDesc: null,
-				workCostTime: null,
-				workCost: null,
-				outWorkId: null,
-				outWorkCode: null,
-				attr1: null,
-				attr2: null,
-				attr3: null,
-				factoryCode: null
-			},
-			 workOutsourceOption: [{
-                workOutsource: "1",
-                label: '转委外'
-              }, {
-                workOutsource: "0",
-                label: '不委外'
-              }],
-			 workDownMachineOption: [{
-                workDownMachine: "1",
-                label: '停机'
-              }, {
-                workDownMachine: "0",
-                label: '不停机'
-              }],
-			// 表单参数
-			form: {},
-			// 表单校验
-			rules: {
-			}
-		};
-	},
-	created() {
-		this.getList();
-	},
-	methods: {
-		/** 查询维修工单列表 */
-		getList() {
-			this.loading = true;
-			listRepairOrder(this.queryParams).then(response => {
-				this.repairOrderList = response.rows;
-				this.total = response.total;
-				this.loading = false;
-			});
-		},
-		// 新增取消按钮
-		cancelAddForm() {
-			this.openAdd = false;
-			this.reset();
-		},
-		// 更新取消按钮
-		cancelUpdateForm() {
-			this.openUpdate = false;
-			this.reset();
-		},
-		// 更新取消按钮
-		cancelApplyForm() {
-			this.openApply = false;
-			this.reset();
-		},
-		// 表单重置
-		reset() {
-			this.form = {
-				workId: null,
-				orderId: null,
-				orderCode: null,
-				workHandle: null,
-				workPlanTime: null,
-				workPlanDownTime: null,
-				orderRelevance: null,
-				workPerson: null,
-				workTeam: null,
-				workOutsource: null,
-				workDownMachine: null,
-				equipmentCode: null,
-				workReason: null,
-				workFaultDesc: null,
-				workCostTime: null,
-				workCost: null,
-				outWorkId: null,
-				outWorkCode: null,
-				attr1: null,
-				attr2: null,
-				attr3: null,
-				createBy: null,
-				createTime: null,
-				updateTime: null,
-				updateBy: null,
-				delFlag: null,
-				factoryCode: null
-			};
-			this.resetForm("form");
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNum = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm("queryForm");
-			this.handleQuery();
-		},
-		// 多选框选中数据
-		handleSelectionChange(selection) {
-			this.ids = selection.map(item => item.workId)
-			this.single = selection.length!==1
-			this.multiple = !selection.length
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.openAdd = true;
-			this.title = "快速工单";
-		},
-		/** 委外申请按钮操作 */
-		handleApply(row) {
-			this.reset();
-			const workId = row.workId || this.ids
-      getRepairOrder(workId).then(response => {
-      	this.form = response.data;
-			  this.openApply = true;
-			  this.title = "委外申请";
+      // 是否显示填写维修记录弹出层
+      openWrite: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        orderId: null,
+        orderCode: null,
+        workCode: null,
+        workHandle: null,
+        workPlanTime: null,
+        workPlanDownTime: null,
+        orderRelevance: null,
+        workPerson: null,
+        workTeam: null,
+        workOutsource: null,
+        workDownMachine: null,
+        equipmentCode: null,
+        workReason: null,
+        workFaultDesc: null,
+        workCostTime: null,
+        workCost: null,
+        outWorkId: null,
+        outWorkCode: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        factoryCode: null,
+      },
+      workOutsourceOption: [
+        {
+          workOutsource: "1",
+          label: "转委外",
+        },
+        {
+          workOutsource: "0",
+          label: "不委外",
+        },
+      ],
+      workDownMachineOption: [
+        {
+          workDownMachine: "1",
+          label: "停机",
+        },
+        {
+          workDownMachine: "0",
+          label: "不停机",
+        },
+      ],
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    // 填写维修记录步骤上一步
+    stepLast() {
+      this.repairRecordSteps--;
+    },
+    // 填写维修记录步骤下一步
+    stepNext() {
+      this.repairRecordSteps++;
+    },
+    /** 查询维修工单列表 */
+    getList() {
+      this.loading = true;
+      listRepairOrder(this.queryParams).then((response) => {
+        this.repairOrderList = response.rows;
+        this.total = response.total;
+        this.loading = false;
       });
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const workId = row.workId || this.ids
-			getRepairOrder(workId).then(response => {
-				this.form = response.data;
-				this.openUpdate = true;
-				this.title = "修改维修工单";
-			});
-		},
-
-		/** 提交委外申请 */
-		submitApplyForm() {
-			applyOutsource(this.form).then(response => {
-				this.$modal.msgSuccess("委外申请成功");
-				this.openApply = false;
-				this.getList();
-			});
-		},
-
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs["form"].validate(valid => {
-				if (valid) {
-					if (this.form.workId != null) {
-						updateRepairOrder(this.form).then(response => {
-							this.$modal.msgSuccess("修改成功");
-							this.openUpdate = false;
-							this.getList();
-						});
-					} else {
-						addRepairOrder(this.form).then(response => {
-							this.$modal.msgSuccess("新增成功");
-							this.openAdd = false;
-							this.getList();
-						});
-					}
-				}
-			});
-		},
+    },
+    // 新增-取消按钮
+    cancelAddForm() {
+      this.openAdd = false;
+      this.reset();
+    },
+    // 更新-取消按钮
+    cancelUpdateForm() {
+      this.openUpdate = false;
+      this.reset();
+    },
+    // 委外申请-取消按钮
+    cancelApplyForm() {
+      this.openApply = false;
+      this.reset();
+    },
+    // 填写维修记录-取消按钮
+    cancelWriteForm() {
+      this.openWrite = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        workId: null,
+        orderId: null,
+        orderCode: null,
+        workHandle: null,
+        workPlanTime: null,
+        workPlanDownTime: null,
+        orderRelevance: null,
+        workPerson: null,
+        workTeam: null,
+        workOutsource: null,
+        workDownMachine: null,
+        equipmentCode: null,
+        workReason: null,
+        workFaultDesc: null,
+        workCostTime: null,
+        workCost: null,
+        outWorkId: null,
+        outWorkCode: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        createBy: null,
+        createTime: null,
+        updateTime: null,
+        updateBy: null,
+        delFlag: null,
+        factoryCode: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框备品备件选中数据
+    handleSelectionSparePartsChange(selection) {
+      this.ids = selection.map((item) => item.applyId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.workId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.openAdd = true;
+      this.title = "快速工单";
+    },
+    /** 填写按钮操作 */
+    handleWrite(row) {
+      this.reset();
+      this.repairRecordSteps = 0;
+      const workId = row.workId || this.ids;
+      getRepairOrder(workId).then((response) => {
+        this.form = response.data;
+        this.openWrite = true;
+        this.title = "填写维修记录";
+      });
+    },
+    /** 委外申请按钮操作 */
+    handleApply(row) {
+      this.reset();
+      const workId = row.workId || this.ids;
+      getRepairOrder(workId).then((response) => {
+        this.form = response.data;
+        this.openApply = true;
+        this.title = "委外申请";
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const workId = row.workId || this.ids;
+      getRepairOrder(workId).then((response) => {
+        this.form = response.data;
+        this.openUpdate = true;
+        this.title = "修改维修工单";
+      });
+    },
+    /** 提交委外申请 */
+    submitApplyForm() {
+      applyOutsource(this.form).then((response) => {
+        this.$modal.msgSuccess("委外申请成功");
+        this.openApply = false;
+        this.getList();
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.workId != null) {
+            updateRepairOrder(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.openUpdate = false;
+              this.getList();
+            });
+          } else {
+            addRepairOrder(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.openAdd = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 提交填写维修记录按钮 */
+    submitWriteForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.workId != null) {
+            writeRepairOrder(this.form).then((response) => {
+              this.$modal.msgSuccess("填写维修记录成功！");
+              this.openWrite = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
     //设备选择
     handleSelectEquipment() {
       this.$refs.itemSelect.showFlag = true;
@@ -657,22 +1202,45 @@ export default {
     onItemSelectedEquipment(obj) {
       this.form.equipmentCode = obj;
     },
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const workIds = row.workId || this.ids;
-			this.$modal.confirm('是否确认删除维修工单编号为"' + workIds + '"的数据项？').then(function() {
-				return delRepairOrder(workIds);
-			}).then(() => {
-				this.getList();
-				this.$modal.msgSuccess("删除成功");
-			}).catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			this.download('device/repairOrder/export', {
-				...this.queryParams
-			}, ` repairOrder_${new Date().getTime()}.xlsx`)
-		}
-	}
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const workIds = row.workId || this.ids;
+      this.$modal
+        .confirm('是否确认删除维修工单编号为"' + workIds + '"的数据项？')
+        .then(function () {
+          return delRepairOrder(workIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "device/repairOrder/export",
+        {
+          ...this.queryParams,
+        },
+        ` repairOrder_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>
+
+<style>
+.step-margin {
+  margin-left: 10px;
+}
+
+.classification {
+  margin-left: 452px;
+}
+
+.step-body {
+  margin-top: 30px;
+}
+</style>
+
diff --git a/src/views/device/repairOrder/selectSinglePerson.vue b/src/views/device/repairOrder/selectSinglePerson.vue
index ceef074..11fe0a9 100644
--- a/src/views/device/repairOrder/selectSinglePerson.vue
+++ b/src/views/device/repairOrder/selectSinglePerson.vue
@@ -38,9 +38,10 @@
           <el-table-column width="50" align="center" type="selection"></el-table-column>
           <!-- 序号 -->
           <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column>
-          <el-table-column label="人员编码" align="center" key="itemCode" prop="userName" v-if="columns[0].visible" >
-          </el-table-column>
+          <el-table-column label="人员编码" align="center" key="itemCode" prop="userName" v-if="columns[0].visible" ></el-table-column>
           <el-table-column label="人员名称"  align="left" key="itemName" prop="nickName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="部门编码" align="center"  prop="postCode" v-if="columns[2].visible" ></el-table-column>
+          <el-table-column label="部门名称" align="center" prop="postName" v-if="columns[3].visible" ></el-table-column>
         </el-table>
 
         <pagination
@@ -60,7 +61,7 @@
 </template>
 
 <script>
-import { getPersonList} from "@/api/device/faultReport";
+import { getMaintenancePersonList} from "@/api/device/repairOrder";
 import { Message } from 'element-ui'
 
 export default {
@@ -94,6 +95,8 @@ export default {
       columns: [
         { key: 0, label: `人员编码`, visible: true },
         { key: 1, label: `人员名称`, visible: true },
+        { key: 2, label: `部门编码`, visible: true },
+        { key: 3, label: `部门名称`, visible: true },
       ]
     };
   },
@@ -125,7 +128,7 @@ export default {
     /** 查询设备编码列表*/
     getList() {
       this.loading = true;
-      getPersonList(this.queryParams).then(response => {
+      getMaintenancePersonList(this.queryParams).then(response => {
           this.itemList = response.rows;
           this.total = response.total;
           this.loading = false;
diff --git a/src/views/device/repairOrder/selectSpareParts.vue b/src/views/device/repairOrder/selectSpareParts.vue
new file mode 100644
index 0000000..9c018c2
--- /dev/null
+++ b/src/views/device/repairOrder/selectSpareParts.vue
@@ -0,0 +1,335 @@
+<template>
+	<div class="app-container">
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button
+					type="primary"
+					plain
+					icon="el-icon-plus"
+					size="mini"
+					@click="handleAdd"
+					v-hasPermi="['device:sparePartsApplicationRecord:add']"
+				>新增</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="success"
+					plain
+					icon="el-icon-edit"
+					size="mini"
+					:disabled="single"
+					@click="handleUpdate"
+					v-hasPermi="['device:sparePartsApplicationRecord:edit']"
+				>修改</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="danger"
+					plain
+					icon="el-icon-delete"
+					size="mini"
+					:disabled="multiple"
+					@click="handleDelete"
+					v-hasPermi="['device:sparePartsApplicationRecord:remove']"
+				>删除</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
+
+		<el-table v-loading="loading" :data="sparePartsApplicationRecordList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<!-- 序号 -->
+      <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"/>
+			<el-table-column label="出库单号" align="center" prop="applyCode" />
+			<el-table-column label="备品备件编码" align="center" prop="spareCode" width="120"/>
+			<el-table-column label="备品备件名称" align="center" prop="spareName" width="120"/>
+			<el-table-column label="规格型号" align="center" prop="spareModel" width="150"/>
+			<el-table-column label="数量" align="center" prop="spareQuantity" />
+			<el-table-column label="使用组线" align="center" prop="spareGroupLine" />
+			<el-table-column label="使用设备" align="center" prop="spareUseEquipment" />
+			<el-table-column label="领用时间" align="center" prop="applyTime" width="180">
+				<template slot-scope="scope">
+					<span>{{ parseTime(scope.row.applyTime) }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="申领人" align="center" prop="applyPeople" width="80"/>
+			<el-table-column label="批准人" align="center" prop="applyApprovePeople" width="80"/>
+			<el-table-column label="工厂号" align="center" prop="factoryCode" />
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template slot-scope="scope">
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-edit"
+						@click="handleUpdate(scope.row)"
+						v-hasPermi="['device:sparePartsApplicationRecord:edit']"
+					>修改</el-button>
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-delete"
+						@click="handleDelete(scope.row)"
+						v-hasPermi="['device:sparePartsApplicationRecord:remove']"
+					>删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+
+		<pagination
+			v-show="total>0"
+			:total="total"
+			:page.sync="queryParams.pageNum"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList"
+		/>
+
+		<!-- 添加或修改申领记录对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
+				<el-form-item label="出库单号" prop="applyCode">
+					<el-input v-model="form.applyCode" placeholder="请输入出库单号" />
+				</el-form-item>
+				<el-form-item label="备品备件编码" prop="spareCode">
+					<el-input v-model="form.spareCode" placeholder="请输入备品备件编码" />
+				</el-form-item>
+				<el-form-item label="备品备件名称" prop="spareName">
+					<el-input v-model="form.spareName" placeholder="请输入备品备件名称" />
+				</el-form-item>
+				<el-form-item label="规格型号" prop="spareModel">
+					<el-input v-model="form.spareModel" placeholder="请输入规格型号" />
+				</el-form-item>
+				<el-form-item label="数量" prop="spareQuantity">
+					<el-input v-model="form.spareQuantity" placeholder="请输入数量" />
+				</el-form-item>
+				<el-form-item label="使用组线" prop="spareGroupLine">
+					<el-input v-model="form.spareGroupLine" placeholder="请输入使用组线" />
+				</el-form-item>
+				<el-form-item label="使用设备" prop="spareUseEquipment">
+					<el-input v-model="form.spareUseEquipment" placeholder="请输入使用设备" />
+				</el-form-item>
+				<el-form-item label="领用时间" prop="applyTime">
+					<el-date-picker clearable
+						v-model="form.applyTime"
+						type="date"
+						value-format="yyyy-MM-dd"
+						placeholder="请选择领用时间">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="申领人" prop="applyPeople">
+					<el-input v-model="form.applyPeople" placeholder="请输入申领人" />
+				</el-form-item>
+				<el-form-item label="批准人" prop="applyApprovePeople">
+					<el-input v-model="form.applyApprovePeople" placeholder="请输入批准人" />
+				</el-form-item>
+				<el-form-item label="工厂号" prop="factoryCode">
+					<el-input v-model="form.factoryCode" placeholder="请输入工厂号" />
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+import { listSparePartsApplicationRecord, getSparePartsApplicationRecord, delSparePartsApplicationRecord, addSparePartsApplicationRecord, updateSparePartsApplicationRecord } from "@/api/device/sparePartsApplicationRecord";
+
+export default {
+	name: "SelectSpareParts",
+	data() {
+		return {
+			// 遮罩层
+			loading: true,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 申领记录表格数据
+			sparePartsApplicationRecordList: [],
+			// 弹出层标题
+			title: "",
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNum: 1,
+				pageSize: 10,
+				applyCode: null,
+				spareCode: null,
+				spareName: null,
+				spareModel: null,
+				spareQuantity: null,
+				spareGroupLine: null,
+				spareUseEquipment: null,
+				applyTime: null,
+				applyPeople: null,
+				applyApprovePeople: null,
+				attr1: null,
+				attr2: null,
+				attr3: null,
+				factoryCode: null,
+				applyTimeArray: []
+			},
+      // 日期范围选择快捷
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
+			// 表单参数
+			form: {},
+			// 表单校验
+			rules: {
+			}
+		};
+	},
+	created() {
+		this.getList();
+	},
+	methods: {
+		// 生成表头序号
+    indexMethod(index) {
+      return index + 1;
+    },
+		/** 查询申领记录列表 */
+		getList() {
+			this.loading = true;
+			listSparePartsApplicationRecord(this.queryParams).then(response => {
+				this.sparePartsApplicationRecordList = response.rows;
+				this.total = response.total;
+				this.loading = false;
+			});
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				applyId: null,
+				applyCode: null,
+				spareCode: null,
+				spareName: null,
+				spareModel: null,
+				spareQuantity: null,
+				spareGroupLine: null,
+				spareUseEquipment: null,
+				applyTime: null,
+				applyPeople: null,
+				applyApprovePeople: null,
+				attr1: null,
+				attr2: null,
+				attr3: null,
+				delFlag: null,
+				createBy: null,
+				createTime: null,
+				updateBy: null,
+				updateTime: null,
+				factoryCode: null
+			};
+			this.resetForm("form");
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNum = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm("queryForm");
+			this.queryParams.applyTimeArray = [];
+			this.handleQuery();
+		},
+		// 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map(item => item.applyId)
+			this.single = selection.length!==1
+			this.multiple = !selection.length
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = "添加申领记录";
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const applyId = row.applyId || this.ids
+			getSparePartsApplicationRecord(applyId).then(response => {
+				this.form = response.data;
+				this.open = true;
+				this.title = "修改申领记录";
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs["form"].validate(valid => {
+				if (valid) {
+					if (this.form.applyId != null) {
+						updateSparePartsApplicationRecord(this.form).then(response => {
+							this.$modal.msgSuccess("修改成功");
+							this.open = false;
+							this.getList();
+						});
+					} else {
+						addSparePartsApplicationRecord(this.form).then(response => {
+							this.$modal.msgSuccess("新增成功");
+							this.open = false;
+							this.getList();
+						});
+					}
+				}
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const applyIds = row.applyId || this.ids;
+			this.$modal.confirm('是否确认删除申领记录编号为"' + applyIds + '"的数据项？').then(function() {
+				return delSparePartsApplicationRecord(applyIds);
+			}).then(() => {
+				this.getList();
+				this.$modal.msgSuccess("删除成功");
+			}).catch(() => {});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			this.download('device/sparePartsApplicationRecord/export', {
+				...this.queryParams
+			}, `sparePartsApplicationRecord_${new Date().getTime()}.xlsx`)
+		}
+	}
+};
+</script>