From 151abbb60177da72ae541e521f01e8e7e4fc6182 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Tue, 17 Oct 2023 17:51:09 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=A4=87=E5=93=81=E5=A4=87=E4=BB=B6?=
 =?UTF-8?q?=E9=A2=86=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/device/sparePartsApplicationRecord.js |  44 ++
 .../sparePartsApplicationRecord/index.vue     | 402 ++++++++++++++++++
 2 files changed, 446 insertions(+)
 create mode 100644 src/api/device/sparePartsApplicationRecord.js
 create mode 100644 src/views/device/sparePartsApplicationRecord/index.vue

diff --git a/src/api/device/sparePartsApplicationRecord.js b/src/api/device/sparePartsApplicationRecord.js
new file mode 100644
index 0000000..ed6fb54
--- /dev/null
+++ b/src/api/device/sparePartsApplicationRecord.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询申领记录列表
+export function listSparePartsApplicationRecord(query) {
+	return request({
+		url: '/device/sparePartsApplicationRecord/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 查询申领记录详细
+export function getSparePartsApplicationRecord(applyId) {
+	return request({
+		url: '/device/sparePartsApplicationRecord/' + applyId,
+		method: 'get'
+		});
+}
+
+// 新增申领记录
+export function addSparePartsApplicationRecord(data) {
+	return request({
+		url: '/device/sparePartsApplicationRecord',
+		method: 'post',
+		data: data
+	});
+}
+
+// 修改申领记录
+export function updateSparePartsApplicationRecord(data) {
+	return request({
+		url: '/device/sparePartsApplicationRecord',
+		method: 'put',
+		data: data
+	});
+}
+
+// 删除申领记录
+export function delSparePartsApplicationRecord(applyId) {
+	return request({
+		url: '/device/sparePartsApplicationRecord/' + applyId,
+		method: 'delete'
+	});
+}
diff --git a/src/views/device/sparePartsApplicationRecord/index.vue b/src/views/device/sparePartsApplicationRecord/index.vue
new file mode 100644
index 0000000..1d3646a
--- /dev/null
+++ b/src/views/device/sparePartsApplicationRecord/index.vue
@@ -0,0 +1,402 @@
+<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="applyCode">
+				<el-input
+					v-model="queryParams.applyCode"
+					placeholder="请输入出库单号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="备品备件编码" prop="spareCode">
+				<el-input
+					v-model="queryParams.spareCode"
+					placeholder="请输入备品备件编码"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="备品备件名称" prop="spareName">
+				<el-input
+					v-model="queryParams.spareName"
+					placeholder="请输入备品备件名称"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="规格型号" prop="spareModel">
+				<el-input
+					v-model="queryParams.spareModel"
+					placeholder="请输入规格型号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="数量" prop="spareQuantity">
+				<el-input
+					v-model="queryParams.spareQuantity"
+					placeholder="请输入数量"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="使用组线" prop="spareGroupLine">
+				<el-input
+					v-model="queryParams.spareGroupLine"
+					placeholder="请输入使用组线"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="使用设备" prop="spareUseEquipment">
+				<el-input
+					v-model="queryParams.spareUseEquipment"
+					placeholder="请输入使用设备"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="领用时间" prop="applyTime">
+				<el-date-picker clearable
+					v-model="queryParams.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="queryParams.applyPeople"
+					placeholder="请输入申领人"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="批准人" prop="applyApprovePeople">
+				<el-input
+					v-model="queryParams.applyApprovePeople"
+					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: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>
+			<el-col :span="1.5">
+				<el-button
+					type="warning"
+					plain
+					icon="el-icon-download"
+					size="mini"
+					@click="handleExport"
+					v-hasPermi="['device:sparePartsApplicationRecord:export']"
+				>导出</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" />
+			<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, '{y}-{m}-{d}') }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="申领人" align="center" prop="applyPeople" />
+			<el-table-column label="批准人" align="center" prop="applyApprovePeople" />
+			<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: "SparePartsApplicationRecord",
+	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
+			},
+			// 表单参数
+			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.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>

From ecd4962be991436fdd9a96f44bcafecceafa9805 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Wed, 18 Oct 2023 10:01:35 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=8F=91=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 push-op-ui-prod.bat | 27 +++++++++++++++++++++++++++
 push-op-ui-test.bat | 28 ++++++++++++++++++++++++++++
 src/views/login.vue |  4 ++--
 3 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 push-op-ui-prod.bat
 create mode 100644 push-op-ui-test.bat

diff --git a/push-op-ui-prod.bat b/push-op-ui-prod.bat
new file mode 100644
index 0000000..89edade
--- /dev/null
+++ b/push-op-ui-prod.bat
@@ -0,0 +1,27 @@
+@echo off
+echo --------------------------------�Զ������������ǰ���޸�--------------------------------------
+set imageURI=192.168.202.36:30002/op-lanju/op-ui
+::echo ��ȡ��ǰ�����ַ���
+for /f "tokens=1,2,3 delims=/- " %%a in ("%date%") do @set D=%%a%%b%%c
+::echo ��ȡ��ǰʱ���ַ���
+for /f "tokens=1,2 delims=:." %%a in ("%time%") do @set T=%%a%%b
+::echo �統ǰСʱС��10�����ո��滻Ϊ0
+set T=%T: =0%
+::echo ��ʾ�������ʱ���ַ���
+set imageVersion=%D%%T%
+::���������Ϣ
+echo ������ַ:%imageURI% 
+echo ����汾:%imageVersion% 
+echo --------------------------------ִ�д��--------------------------------
+call npm run build:prod
+
+dir
+echo --------------------------------docker login...-------------------------------
+docker login 192.168.202.36:30002 -u deploy -p Deploy@2023
+echo --------------------------------docker build...-------------------------------
+docker build -t %imageURI%:%imageVersion% .
+echo --------------------------------docker push...--------------------------------
+docker push %imageURI%:%imageVersion%
+@pause
+
+::docker pull 192.168.3.157:8001/library/nginx:1.20-alpine
\ No newline at end of file
diff --git a/push-op-ui-test.bat b/push-op-ui-test.bat
new file mode 100644
index 0000000..bae3fb2
--- /dev/null
+++ b/push-op-ui-test.bat
@@ -0,0 +1,28 @@
+@echo off
+echo --------------------------------�Զ������������ǰ���޸�--------------------------------------
+set imageURI=140.249.53.142:30002/op-lanju/ld-op-front
+::echo ��ȡ��ǰ�����ַ���
+for /f "tokens=1,2,3 delims=/- " %%a in ("%date%") do @set D=%%a%%b%%c
+::echo ��ȡ��ǰʱ���ַ���
+for /f "tokens=1,2 delims=:." %%a in ("%time%") do @set T=%%a%%b
+::echo �統ǰСʱС��10�����ո��滻Ϊ0
+set T=%T: =0%
+::echo ��ʾ�������ʱ���ַ���
+set imageVersion=%D%%T%
+::���������Ϣ
+echo ������ַ:%imageURI% 
+echo ����汾:%imageVersion% 
+echo --------------------------------ִ�д��--------------------------------
+call npm run build:prod
+
+dir
+echo --------------------------------docker login...-------------------------------
+docker logout 140.249.53.142:30002
+docker login 140.249.53.142:30002 -u deploy -p Deploy@2022
+echo --------------------------------docker build...-------------------------------
+docker build -t %imageURI%:%imageVersion% .
+echo --------------------------------docker push...--------------------------------
+docker push %imageURI%:%imageVersion%
+@pause
+
+::docker pull 192.168.3.157:8001/library/nginx:1.20-alpine
\ No newline at end of file
diff --git a/src/views/login.vue b/src/views/login.vue
index 1a7e5d8..8a26445 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -72,8 +72,8 @@ export default {
     return {
       codeUrl: "",
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: "",//admin
+        password: "",//admin123
         rememberMe: false,
         code: "",
         uuid: ""

From 4605da788dbf08da90fb0398d6efce6c790f7317 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 18 Oct 2023 14:28:34 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=A4=87=E5=93=81=E5=A4=87=E4=BB=B6?=
 =?UTF-8?q?=E9=A2=86=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sparePartsApplicationRecord/index.vue     | 61 +++++++++++++++----
 1 file changed, 48 insertions(+), 13 deletions(-)

diff --git a/src/views/device/sparePartsApplicationRecord/index.vue b/src/views/device/sparePartsApplicationRecord/index.vue
index 1d3646a..7cdbe54 100644
--- a/src/views/device/sparePartsApplicationRecord/index.vue
+++ b/src/views/device/sparePartsApplicationRecord/index.vue
@@ -57,14 +57,6 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="领用时间" prop="applyTime">
-				<el-date-picker clearable
-					v-model="queryParams.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="queryParams.applyPeople"
@@ -81,6 +73,19 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
+      <el-form-item label="领用时间" prop="applyTime">
+        <el-date-picker
+          v-model="queryParams.applyTimeArray"
+          type="daterange"
+          align="right"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+          :picker-options="pickerOptions">
+        </el-date-picker>
+      </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>
@@ -140,17 +145,17 @@
 			<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" />
+			<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, '{y}-{m}-{d}') }}</span>
+					<span>{{ parseTime(scope.row.applyTime) }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="申领人" align="center" prop="applyPeople" />
-			<el-table-column label="批准人" align="center" prop="applyApprovePeople" />
+			<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">
@@ -272,8 +277,37 @@ export default {
 				attr1: null,
 				attr2: null,
 				attr3: null,
-				factoryCode: 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: {},
 			// 表单校验
@@ -337,6 +371,7 @@ export default {
 		/** 重置按钮操作 */
 		resetQuery() {
 			this.resetForm("queryForm");
+			this.queryParams.applyTimeArray = [];
 			this.handleQuery();
 		},
 		// 多选框选中数据

From 9ed362f1dea07e7ae2fa557232ea28c65bf28895 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 18 Oct 2023 17:12:24 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=A1=86=E6=94=B9=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/technology/process/single.vue | 4 ++--
 src/views/technology/recipe/single.vue  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/technology/process/single.vue b/src/views/technology/process/single.vue
index 72dbd7e..a8d54fb 100644
--- a/src/views/technology/process/single.vue
+++ b/src/views/technology/process/single.vue
@@ -9,7 +9,7 @@
   >
     <el-row :gutter="20">
       <!--分类数据-->
-      <el-col :span="4" :xs="24">
+      <el-col :span="5" :xs="24">
         <el-card >
           <span>请选择设备类型：</span>
           <div class="head-container" style="text-align: center">
@@ -28,7 +28,7 @@
       </el-col>
 
       <!--设备数据-->
-      <el-col :span="20" :xs="24">
+      <el-col :span="19" :xs="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
diff --git a/src/views/technology/recipe/single.vue b/src/views/technology/recipe/single.vue
index 72dbd7e..a8d54fb 100644
--- a/src/views/technology/recipe/single.vue
+++ b/src/views/technology/recipe/single.vue
@@ -9,7 +9,7 @@
   >
     <el-row :gutter="20">
       <!--分类数据-->
-      <el-col :span="4" :xs="24">
+      <el-col :span="5" :xs="24">
         <el-card >
           <span>请选择设备类型：</span>
           <div class="head-container" style="text-align: center">
@@ -28,7 +28,7 @@
       </el-col>
 
       <!--设备数据-->
-      <el-col :span="20" :xs="24">
+      <el-col :span="19" :xs="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

From 0876ddee8d7836790c855aeda8214d685edb20b6 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 18 Oct 2023 18:01:47 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=95=85=E9=9A=9C?=
 =?UTF-8?q?=E6=8A=A5=E4=BF=AE=E5=88=9D=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/device/faultReport.js           |  62 +++
 src/views/device/faultReport/index.vue  | 477 ++++++++++++++++++++++++
 src/views/device/faultReport/single.vue | 279 ++++++++++++++
 3 files changed, 818 insertions(+)
 create mode 100644 src/api/device/faultReport.js
 create mode 100644 src/views/device/faultReport/index.vue
 create mode 100644 src/views/device/faultReport/single.vue

diff --git a/src/api/device/faultReport.js b/src/api/device/faultReport.js
new file mode 100644
index 0000000..cf42c1c
--- /dev/null
+++ b/src/api/device/faultReport.js
@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 查询故障报修列表
+export function listFaultReport(query) {
+	return request({
+		url: '/device/faultReport/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 查询故障报修详细
+export function getFaultReport(orderId) {
+	return request({
+		url: '/device/faultReport/' + orderId,
+		method: 'get'
+		});
+}
+
+// 新增故障报修
+export function addFaultReport(data) {
+	return request({
+		url: '/device/faultReport',
+		method: 'post',
+		data: data
+	});
+}
+
+// 修改故障报修
+export function updateFaultReport(data) {
+	return request({
+		url: '/device/faultReport',
+		method: 'put',
+		data: data
+	});
+}
+
+// 删除故障报修
+export function delFaultReport(orderId) {
+	return request({
+		url: '/device/faultReport/' + orderId,
+		method: 'delete'
+	});
+}
+
+// 查询故障报修列表
+export function getEquipmentList(query) {
+  return request({
+    url: '/device/faultReport/getEquipmentList',
+    method: 'get',
+    params: query
+  });
+}
+
+// 查询设备类型
+export function getEquipmentTypeList() {
+  return request({
+    url: '/device/faultReport/getEquipmentTypeList',
+    method: 'get'
+  });
+}
+
diff --git a/src/views/device/faultReport/index.vue b/src/views/device/faultReport/index.vue
new file mode 100644
index 0000000..8b53004
--- /dev/null
+++ b/src/views/device/faultReport/index.vue
@@ -0,0 +1,477 @@
+<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="orderCode">
+				<el-input
+					v-model="queryParams.orderCode"
+					placeholder="请输入报修单号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="设备编码" prop="equipmentCode">
+				<el-input
+					v-model="queryParams.equipmentCode"
+					placeholder="请输入设备编码"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="故障时间" prop="orderBreakdownTime">
+        <el-date-picker
+          v-model="queryParams.orderBreakdownTimeArray"
+          type="daterange"
+          align="right"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+          :picker-options="pickerOptions1">
+        </el-date-picker>
+			</el-form-item>
+			<el-form-item label="报修来源" prop="orderSource">
+        <el-select v-model="form.orderSource" style="width:195px">
+          <el-option
+            v-for="dict in dict.type.device_order_source"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+			</el-form-item>
+			<el-form-item label="报修时间" prop="orderTime">
+        <el-date-picker
+          v-model="queryParams.orderTimeArray"
+          type="daterange"
+          align="right"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+          :picker-options="pickerOptions2">
+        </el-date-picker>
+			</el-form-item>
+			<el-form-item label="报修人" prop="orderRepairman">
+				<el-input
+					v-model="queryParams.orderRepairman"
+					placeholder="请输入报修人"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="联系方式" prop="orderConnection">
+				<el-input
+					v-model="queryParams.orderConnection"
+					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:faultReport: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:faultReport: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:faultReport: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:faultReport:export']"
+				>导出</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
+
+		<el-table v-loading="loading" :data="faultReportList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="报修单号" align="center" prop="orderCode" width="120"/>
+			<el-table-column label="设备编码" align="center" prop="equipmentCode" width="100"/>
+			<el-table-column label="故障描述" align="center" prop="orderDesc" width="200"/>
+			<el-table-column label="故障时间" align="center" prop="orderBreakdownTime" width="180">
+				<template slot-scope="scope">
+					<span>{{ parseTime(scope.row.orderBreakdownTime) }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="报修来源" align="center" prop="orderSource" />
+			<el-table-column label="报修时间" align="center" prop="orderTime" width="180">
+				<template slot-scope="scope">
+					<span>{{ parseTime(scope.row.orderTime) }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="报修人" align="center" prop="orderRepairman" />
+			<el-table-column label="联系方式" align="center" prop="orderConnection" width="120"/>
+			<el-table-column label="处理状态" align="center" prop="orderStatus" />
+			<el-table-column label="关联计划" align="center" prop="orderRelevance" />
+			<el-table-column label="故障图片" align="center" prop="orderPicture" />
+			<el-table-column label="创建人" align="center" prop="craeteBy" />
+			<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:faultReport:edit']"
+					>修改</el-button>
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-delete"
+						@click="handleDelete(scope.row)"
+						v-hasPermi="['device:faultReport: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="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" placeholder="请选择辅助设备" >
+                <el-button slot="append" @click="handleSelectEquipment" icon="el-icon-search"></el-button>
+          			  </el-input>
+          				<ItemSelect ref="itemSelect" @onSelected="onItemSelectedEquipment" > </ItemSelect>
+			  		</el-form-item>
+          </el-col>
+          <el-col :span="8">
+						<el-form-item label="故障时间" prop="orderBreakdownTime">
+	            <el-date-picker
+	              clearable
+                v-model="form.orderBreakdownTime"
+                type="datetime"
+                placeholder="选择日期时间">
+              </el-date-picker>
+						</el-form-item>
+          </el-col>
+					<el-col :span="8">
+						<el-form-item label="报修来源" prop="orderSource">
+					    	<el-input v-model="form.orderSource" placeholder="请输入报修来源" />
+						</el-form-item>
+          </el-col>
+        </el-row>
+				<el-row :gutter="10" class="mb8">
+          <el-col :span="8">
+						<el-form-item label="报修时间" prop="orderTime">
+							<el-date-picker clearable
+								v-model="form.orderTime"
+								type="date"
+								value-format="yyyy-MM-dd"
+								placeholder="请选择报修时间">
+							</el-date-picker>
+						</el-form-item>
+          </el-col>
+          <el-col :span="8">
+						<el-form-item label="报修人" prop="orderRepairman">
+					    <el-input v-model="form.orderRepairman" placeholder="请输入报修人" />
+						</el-form-item>
+          </el-col>
+					<el-col :span="8">
+						<el-form-item label="联系方式" prop="orderConnection">
+							<el-input v-model="form.orderConnection" placeholder="请输入联系方式" />
+						</el-form-item>
+          </el-col>
+        </el-row>
+			  <el-row>
+					<el-form-item label="故障描述" prop="orderDesc">
+						<el-input v-model="form.orderDesc" placeholder="请输入故障描述" />
+					</el-form-item>
+				</el-row>
+				<el-form-item label="故障图片" prop="orderPicture">
+					<el-input v-model="form.orderPicture" 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 { listFaultReport, getFaultReport, delFaultReport, addFaultReport, updateFaultReport,getEquipmentList } from "@/api/device/faultReport";
+import ItemSelect  from "./single.vue";
+export default {
+	name: "FaultReport",
+	components: {ItemSelect},
+  dicts: ['device_order_source'],
+	data() {
+		return {
+		  equipmentCodeOption:[],
+			// 遮罩层
+			loading: true,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 故障报修表格数据
+			faultReportList: [],
+			// 弹出层标题
+			title: "",
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNum: 1,
+				pageSize: 10,
+				orderCode: null,
+				equipmentCode: null,
+				orderDesc: null,
+				orderBreakdownTime: null,
+				orderSource: null,
+				orderTime: null,
+				orderHandle: null,
+				orderRepairman: null,
+				orderConnection: null,
+				orderStatus: null,
+				orderRelevance: null,
+				orderPicture: null,
+				attr1: null,
+				attr2: null,
+				attr3: null,
+				craeteBy: null,
+				orderBreakdownTimeArray: [],
+				orderTimeArray: []
+			},
+      // 日期范围选择快捷
+      pickerOptions1: {
+        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]);
+          }
+        }]
+      },
+      pickerOptions2: {
+        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: {
+    //新增 设备选择弹出框
+    handleSelectEquipment(){
+      this.$refs.itemSelect.showFlag = true;
+    },
+    //新增 设备选择弹出框
+    onItemSelectedEquipment(obj){
+      this.form.equipmentCode = obj;
+    },
+		/** 查询故障报修列表 */
+		getList() {
+			this.loading = true;
+			listFaultReport(this.queryParams).then(response => {
+				this.faultReportList = response.rows;
+				this.total = response.total;
+				this.loading = false;
+			});
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				orderId: null,
+				orderCode: null,
+				equipmentCode: null,
+				orderDesc: null,
+				orderBreakdownTime: null,
+				orderSource: null,
+				orderTime: null,
+				orderHandle: null,
+				orderRepairman: null,
+				orderConnection: null,
+				orderStatus: null,
+				orderRelevance: null,
+				orderPicture: null,
+				attr1: null,
+				attr2: null,
+				attr3: null,
+				delFlag: null,
+				craeteBy: null,
+				createTime: null,
+				updateBy: null,
+				updateTime: 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.orderId)
+			this.single = selection.length!==1
+			this.multiple = !selection.length
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = "添加故障报修";
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const orderId = row.orderId || this.ids
+			getFaultReport(orderId).then(response => {
+				this.form = response.data;
+				this.open = true;
+				this.title = "修改故障报修";
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs["form"].validate(valid => {
+				if (valid) {
+					if (this.form.orderId != null) {
+						updateFaultReport(this.form).then(response => {
+							this.$modal.msgSuccess("修改成功");
+							this.open = false;
+							this.getList();
+						});
+					} else {
+						addFaultReport(this.form).then(response => {
+							this.$modal.msgSuccess("新增成功");
+							this.open = false;
+							this.getList();
+						});
+					}
+				}
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const orderIds = row.orderId || this.ids;
+			this.$modal.confirm('是否确认删除故障报修编号为"' + orderIds + '"的数据项？').then(function() {
+				return delFaultReport(orderIds);
+			}).then(() => {
+				this.getList();
+				this.$modal.msgSuccess("删除成功");
+			}).catch(() => {});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			this.download('device/faultReport/export', {
+				...this.queryParams
+			}, `faultReport_${new Date().getTime()}.xlsx`)
+		}
+	}
+};
+</script>
diff --git a/src/views/device/faultReport/single.vue b/src/views/device/faultReport/single.vue
new file mode 100644
index 0000000..534d12f
--- /dev/null
+++ b/src/views/device/faultReport/single.vue
@@ -0,0 +1,279 @@
+<template>
+  <el-dialog title="设备选择"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal= false
+    width="1100px"
+    center
+    :before-close="cancelEquipmentForm"
+  >
+    <el-row :gutter="20">
+      <!--分类数据-->
+      <el-col :span="5" :xs="24">
+        <el-card >
+          <span>请选择设备类型：</span>
+          <div class="head-container" style="text-align: center">
+              <el-tree
+                :data="treeData1"
+                :props = "{id:'equipmentTypeCode',label:'equipmentTypeName'}"
+                node-key="id"
+                :expand-on-click-node="false"
+                :filter-node-method="filterNode"
+                ref="tree"
+                default-expand-all
+                @node-click="handleNodeClick"
+              />
+            </div>
+        </el-card>
+      </el-col>
+
+      <!--设备数据-->
+      <el-col :span="19" :xs="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: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="设备名称" prop="itemName">
+            <el-input
+              v-model="queryParams.itemName"
+              placeholder="请输入设备名称"
+              clearable
+              style="width: 240px"
+              @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">
+              <!-- <template v-slot="scope">
+                  <el-radio v-model="selectedItemId" :label="scope.row.itemId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
+              </template> -->
+          </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="equipmentCode" v-if="columns[0].visible" >
+          </el-table-column>
+          <el-table-column label="设备类型编码" align="center" key="itemTypeCode" prop="equipmentTypeCode" v-if="columns[2].visible" >
+          </el-table-column>
+          <el-table-column label="设备名称"  align="left" key="itemName" prop="equipmentName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+        </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="submitEquipmentForm">确 定</el-button>
+        <el-button @click="cancelEquipmentForm">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getEquipmentList,getEquipmentTypeList} from "@/api/device/faultReport";
+import { treeselect } from "@/api/wms/equipment";
+import { Message } from 'element-ui'
+
+export default {
+  name: "MdItemSingle",
+  // components: { Treeselect },
+  data() {
+    return {
+      treeData1:[],
+      showFlag:false,
+      // 选中数组
+      selectedItemId: undefined,
+      selectedRows: undefined,
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total:0,
+      // 设备产品表格数据
+      itemList: null,
+      // 树选项
+      itemTypeOptions: undefined,
+      //树名称
+      equipmentTypeCode: undefined,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        itemName: undefined,
+        equipmentTypeCode: undefined,
+        itemTypeId: 0,
+        itemCodeGet: '',
+        itemCode : undefined,
+      },
+      // 列信息
+      columns: [
+        { key: 0, label: `设备编码`, visible: true },
+        { key: 1, label: `设备名称`, visible: true },
+        { key: 2, label: `设备类型`, visible: true },
+      ]
+    };
+  },
+  created() {
+    this.getList();
+    this.getEquipmentType();
+  },
+
+  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;
+      getEquipmentList(this.queryParams).then(response => {
+          this.itemList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+
+    /** 查询分类下拉树结构 */
+    getEquipmentType() {
+      getEquipmentTypeList().then(response => {
+        console.log(response.rows);
+        this.treeData1 = response.rows;
+        console.log(this.treeData1);
+      });
+    },
+
+    // 筛选节点
+    filterNode(value, data) {
+      console.log(value, data);
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+
+    // 节点单击事件
+    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();
+    },
+
+    // handleCurrent(row){
+    //     if(row){
+    //         this.selectedRows = row;
+    //     }
+    // },
+
+    // handleRowDbClick(row){
+    //   if(row){
+    //     this.selectedRows = row;
+    //     this.$emit('onSelected',this.selectedRows);
+    //     this.showFlag = false;
+    //   }
+    // },
+
+    // 多选框选中数据
+		handleEquipmentSelectionChange(selection) {
+			this.ids = selection.map(item => item.equipmentCode);
+			this.single = selection.length!==1;
+			this.multiple = !selection.length;
+			console.log("多选框",this.ids);
+		},
+
+    // 单选选中数据
+    // handleRowChange(row) {
+    //   debugger;
+    //   if(row){
+    //     this.selectedRows = row;
+    //   }
+    // },
+
+    //确定选中
+    // confirmSelect(){
+    //     if(this.selectedItemId ==null || this.selectedItemId==0){
+    //         this.$notify({
+    //             title:'提示',
+    //             type:'warning',
+    //             message: '请至少选择一条数据!'
+    //         });
+    //         return;
+    //     }
+    //     this.$emit('onSelected',this.selectedRows);
+    //     this.showFlag = false;
+    // }
+    //
+    submitEquipmentForm() {
+      const data = this.ids;
+      console.log("数据",data);
+      const equipmentCode = data.toString();
+      console.log("拆分数据",equipmentCode);
+      console.log("原来的数据",this.queryParams.itemCodeGet);
+      if(this.queryParams.itemCodeGet == ""){
+        this.queryParams.itemCodeGet = equipmentCode;
+      }else{
+        this.queryParams.itemCodeGet = this.queryParams.itemCodeGet + ','+ equipmentCode;
+      }
+     this.selectedRows = this.queryParams.itemCodeGet;
+     this.$emit('onSelected', this.selectedRows);
+     this.queryParams.equipmentTypeCode = null;
+     this.getList();
+     console.log('111111',this.queryParams.equipmentTypeCode);
+     this.showFlag = false;
+     this.queryParams.itemCodeGet = "";
+    },
+    cancelEquipmentForm(){
+      this.queryParams.equipmentTypeCode = null;
+         this.getList();
+         console.log('111111',this.queryParams.equipmentTypeCode);
+         this.showFlag = false;
+    }
+  }
+};
+</script>