From a32735be01d72dc994e6538b39266d0b8a942a17 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 6 Nov 2023 17:48:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=20=E7=8F=AD=E7=BB=84+?=
 =?UTF-8?q?=E6=8A=A5=E5=B7=A5+=E7=BB=B4=E4=BF=AE+=E5=A4=87=E6=96=99?=
 =?UTF-8?q?=E7=94=B3=E9=A2=86=E5=8D=95+=E5=A4=87=E4=BB=B6=E5=8F=B0?=
 =?UTF-8?q?=E8=B4=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/device/sparePartsApplicationRecord.js |   9 +
 src/views/device/equTeam/index.vue            |   9 -
 src/views/device/faultReport/index.vue        |  45 ++-
 src/views/device/repairOrder/index.vue        |  81 ++--
 .../device/repairOrder/selectSpareParts.vue   |  88 ++---
 .../repairOrder/selectSparePartsLedger.vue    | 266 +++++++++++++
 .../sparePartsApplicationRecord/index.vue     | 159 ++++++--
 .../selectSingleEquipment.vue                 | 246 ++++++++++++
 .../selectSinglePerson.vue                    | 186 +++++++++
 .../selectSparePartsLedger.vue                | 361 ++++++++++++++++++
 src/views/device/sparePartsLedger/index.vue   |   8 -
 11 files changed, 1322 insertions(+), 136 deletions(-)
 create mode 100644 src/views/device/repairOrder/selectSparePartsLedger.vue
 create mode 100644 src/views/device/sparePartsApplicationRecord/selectSingleEquipment.vue
 create mode 100644 src/views/device/sparePartsApplicationRecord/selectSinglePerson.vue
 create mode 100644 src/views/device/sparePartsApplicationRecord/selectSparePartsLedger.vue

diff --git a/src/api/device/sparePartsApplicationRecord.js b/src/api/device/sparePartsApplicationRecord.js
index ed6fb54..56e1316 100644
--- a/src/api/device/sparePartsApplicationRecord.js
+++ b/src/api/device/sparePartsApplicationRecord.js
@@ -42,3 +42,12 @@ export function delSparePartsApplicationRecord(applyId) {
 		method: 'delete'
 	});
 }
+
+// 查询当前维修单备件申领记录列表
+export function listRepairSparePartsRecord(query) {
+  return request({
+    url: '/device/sparePartsApplicationRecord/listRepairSparePartsRecord',
+    method: 'get',
+    params: query
+  });
+}
diff --git a/src/views/device/equTeam/index.vue b/src/views/device/equTeam/index.vue
index a904e95..ef3acfe 100644
--- a/src/views/device/equTeam/index.vue
+++ b/src/views/device/equTeam/index.vue
@@ -192,15 +192,6 @@
             </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
diff --git a/src/views/device/faultReport/index.vue b/src/views/device/faultReport/index.vue
index b8e2a23..bcbf2d4 100644
--- a/src/views/device/faultReport/index.vue
+++ b/src/views/device/faultReport/index.vue
@@ -1002,9 +1002,13 @@
             />
           </el-form-item>
         </el-row>
-        <el-form-item label="故障图片" prop="orderPicture">
-          <el-input v-model="form.orderPicture" placeholder="请输入故障图片" />
-        </el-form-item>
+        <el-row>
+          <el-col :span="24">
+             <el-form-item label="故障图片" prop="orderPicture">
+              <FileUpload v-model="form.fileList" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -1034,6 +1038,9 @@ export default {
   dicts: ["device_order_source"],
   data() {
     return {
+      //图片存储
+      fileList: [],
+      //设备选择
       equipmentCodeOption: [],
       // 遮罩层
       loading: true,
@@ -1146,7 +1153,26 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        equipmentCode: [
+          { required: true, message: "设备编码不能为空", trigger: "blur" },
+        ],
+        orderBreakdownTime: [
+          { required: true, message: "故障时间不能为空", trigger: "blur" },
+        ],
+        orderTime: [
+          { required: true, message: "报修时间不能为空", trigger: "blur" },
+        ],
+        orderRepairman: [
+          { required: true, message: "报修人不能为空", trigger: "blur" },
+        ],
+        orderDesc: [
+          { required: true, message: "故障描述不能为空", trigger: "blur" },
+        ],
+        orderConnection: [
+          { required: true, message: "联系方式不能为空", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {
@@ -1194,6 +1220,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        fileList: "",
         orderId: null,
         orderCode: null,
         equipmentCode: null,
@@ -1247,6 +1274,16 @@ export default {
       const orderId = row.orderId || this.ids;
       getFaultReport(orderId).then((response) => {
         this.form = response.data;
+        if (response.data.files != null) {
+          var newFiles = [];
+          response.data.files.forEach((item) => {
+            var newFile = {};
+            newFile.name = item.fileName;
+            newFile.url = item.fileAddress;
+            newFiles.push(newFile);
+          });
+          this.form.fileList = newFiles;
+        }
         this.open = true;
         this.title = "修改故障报修";
       });
diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue
index bb930a1..54bcc05 100644
--- a/src/views/device/repairOrder/index.vue
+++ b/src/views/device/repairOrder/index.vue
@@ -908,7 +908,7 @@
           </el-col>
         </div>
         <!-- 处理结果 -->
-        <div v-if="this.repairRecordSteps == 1" class="step-body">
+        <div v-if="this.repairRecordSteps == 1" class="step-body" @mousemove = "handleMouseout">
           <el-row :gutter="10" class="mb8">
             <el-col :span="24">
               <el-form-item label="原因分析" prop="workReason">
@@ -950,7 +950,7 @@
           placeholder="请选择维修状态"
           @change="$forceUpdate()"
           clearable
-          style="width: 220px"
+          style="width: 195px"
           @keyup.enter.native="handleQuery"
         >
           <el-option
@@ -997,12 +997,13 @@
                   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 v-model="form.workCostTime" style="width: 195px" >
                 </el-input>
               </el-form-item>
             </el-col>
@@ -1028,7 +1029,7 @@
         </div>
         <!-- 使用备件领用记录 -->
         <div v-if="this.repairRecordSteps == 2" class="step-body">
-          <SelectSpareParts :optType="optType"></SelectSpareParts>
+          <ItemSelectSpareParts :optType="optType" :workCode="form.workCode" :equipmentCode="form.equipmentCode" v-if="form.workCode !=null"></ItemSelectSpareParts>
         </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -1064,11 +1065,11 @@ import { getMaintenanceTeamList } from "@/api/device/equTeam";
 import ItemSelect from "./selectSingleEquipment.vue";
 import ItemSelectPerson from "./selectSinglePerson.vue";
 import { Message } from "element-ui";
-import SelectSpareParts from "./selectSpareParts.vue";
+import ItemSelectSpareParts from "./selectSpareParts.vue";
 
 export default {
   name: " RepairOrder",
-  components: { ItemSelect, ItemSelectPerson, SelectSpareParts },
+  components: { ItemSelect, ItemSelectPerson, ItemSelectSpareParts },
   data() {
     return {
       //选择设备维修班组
@@ -1169,31 +1170,35 @@ export default {
       ],
       // 日期范围选择快捷
       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]);
-          }
-        }]
+        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: {},
@@ -1206,6 +1211,13 @@ export default {
     this.getTeamList();
   },
   methods: {
+    //计算时间 结束维修时间-开始维修时间
+    handleMouseout(){
+      console.log("打印维修时间")
+      if(this.form.workEndTime != null && this.form.workStartTime != null){
+        this.form.workCostTime = this.form.workEndTime - this.form.workStartTime;
+      }
+    },
     // 填写维修记录步骤上一步
     stepLast() {
       this.repairRecordSteps--;
@@ -1223,7 +1235,6 @@ export default {
         this.loading = false;
       });
     },
-
     /** 查询维修工单列表 */
     getTeamList() {
       this.loading = true;
@@ -1295,9 +1306,9 @@ export default {
     resetQuery() {
       this.resetForm("queryForm");
       //计划维修时间组、计划停机时间组
-      this.queryParams.workPlanTimeArray = [],
-      this.queryParams.workPlanDownTimeArray = [],
-      this.handleQuery();
+      (this.queryParams.workPlanTimeArray = []),
+        (this.queryParams.workPlanDownTimeArray = []),
+        this.handleQuery();
     },
     // 多选框备品备件选中数据
     handleSelectionSparePartsChange(selection) {
diff --git a/src/views/device/repairOrder/selectSpareParts.vue b/src/views/device/repairOrder/selectSpareParts.vue
index 9c018c2..1f5a6e6 100644
--- a/src/views/device/repairOrder/selectSpareParts.vue
+++ b/src/views/device/repairOrder/selectSpareParts.vue
@@ -7,9 +7,10 @@
 					plain
 					icon="el-icon-plus"
 					size="mini"
-					@click="handleAdd"
+					@click="handleSelectSparePartsLedger"
 					v-hasPermi="['device:sparePartsApplicationRecord:add']"
 				>新增</el-button>
+				<ItemSelectSparePartsLedger ref="itemSelectSparePartsLedger" @onSelected="selectSparePartsLedger" ></ItemSelectSparePartsLedger>
 			</el-col>
 			<el-col :span="1.5">
 				<el-button
@@ -40,13 +41,12 @@
 			<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="workCode" width="150"/>
+      <el-table-column label="使用设备" align="center" prop="spareUseEquipment" />
 			<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>
@@ -54,7 +54,6 @@
 			</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
@@ -84,49 +83,11 @@
 		/>
 
 		<!-- 添加或修改申领记录对话框 -->
-		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+		<el-dialog :title="title" :visible.sync="open" width="1000px" 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 type="primary" @click="submitAddForm">确 定</el-button>
 				<el-button @click="cancel">取 消</el-button>
 			</div>
 		</el-dialog>
@@ -134,10 +95,12 @@
 </template>
 
 <script>
-import { listSparePartsApplicationRecord, getSparePartsApplicationRecord, delSparePartsApplicationRecord, addSparePartsApplicationRecord, updateSparePartsApplicationRecord } from "@/api/device/sparePartsApplicationRecord";
+import { listSparePartsApplicationRecord, getSparePartsApplicationRecord, delSparePartsApplicationRecord, addSparePartsApplicationRecord, updateSparePartsApplicationRecord , listRepairSparePartsRecord } from "@/api/device/sparePartsApplicationRecord";
+import ItemSelectSparePartsLedger from "./selectSparePartsLedger.vue";
 
 export default {
 	name: "SelectSpareParts",
+	components: { ItemSelectSparePartsLedger },
 	data() {
 		return {
 			// 遮罩层
@@ -162,6 +125,9 @@ export default {
 			queryParams: {
 				pageNum: 1,
 				pageSize: 10,
+				workCode: this.workCode,
+			  equipmentCode: this.equipmentCode,
+				applyType: null,
 				applyCode: null,
 				spareCode: null,
 				spareName: null,
@@ -213,10 +179,19 @@ export default {
 			}
 		};
 	},
+  props: {
+    equipmentCode: undefined,
+    workCode: undefined,
+    optType: undefined,
+  },
 	created() {
 		this.getList();
 	},
 	methods: {
+	    //设备选择弹出框
+      handleSelectSparePartsLedger() {
+        this.$refs.itemSelectSparePartsLedger.showFlag = true;
+      },
 		// 生成表头序号
     indexMethod(index) {
       return index + 1;
@@ -224,7 +199,7 @@ export default {
 		/** 查询申领记录列表 */
 		getList() {
 			this.loading = true;
-			listSparePartsApplicationRecord(this.queryParams).then(response => {
+			listRepairSparePartsRecord(this.queryParams).then(response => {
 				this.sparePartsApplicationRecordList = response.rows;
 				this.total = response.total;
 				this.loading = false;
@@ -238,6 +213,9 @@ export default {
 		// 表单重置
 		reset() {
 			this.form = {
+				workCode: this.workCode,
+				equipmentCode: this.equipmentCode,
+				applyType: null,
 				applyId: null,
 				applyCode: null,
 				spareCode: null,
@@ -314,6 +292,22 @@ export default {
 				}
 			});
 		},
+    //接收参数
+    selectSparePartsLedger(obj){
+      console.log("接收参数",obj[0]);
+      //备件编号、备件名称、备件规格型号、备件使用设备、备件申请数量、备件关联工单号
+      this.form.spareCode = obj[0].materialCode;
+      this.form.spareName = obj[0].materialDesc;
+      this.form.spareModel = obj[0].spareMode;
+      this.form.spareUseEquipment = this.queryParams.equipmentCode;
+      this.form.spareQuantity = obj[0].spareQuantity;
+      this.form.workCode = this.queryParams.workCode;
+      addSparePartsApplicationRecord(this.form).then(response => {
+      	this.$modal.msgSuccess("新增成功");
+      	this.open = false;
+      	this.getList();
+      });
+    },
 		/** 删除按钮操作 */
 		handleDelete(row) {
 			const applyIds = row.applyId || this.ids;
diff --git a/src/views/device/repairOrder/selectSparePartsLedger.vue b/src/views/device/repairOrder/selectSparePartsLedger.vue
new file mode 100644
index 0000000..2ff0dd6
--- /dev/null
+++ b/src/views/device/repairOrder/selectSparePartsLedger.vue
@@ -0,0 +1,266 @@
+<template>
+  <el-dialog title="备品备件选择"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal= false
+    width="1100px"
+    center
+    :before-close="cancel"
+  >
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px">
+			<el-form-item label="备品备件号" prop="materialCode">
+				<el-input
+					v-model="queryParams.materialCode"
+					placeholder="请输入备品备件号"
+					clearable
+					@keyup.enter.native="handleQuery"
+					style="width:150px"
+				/>
+			</el-form-item>
+			<el-form-item label="备件类型" prop="spareType">
+				<el-select v-model="queryParams.spareType" placeholder="请选择备件类型"  @keyup.enter.native="handleQuery" @change="$forceUpdate()" clearable style="width:150px">
+          <el-option v-for="item in options" :key="item.spareType" :label="item.label" :value="item.spareType"></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-row :gutter="10" class="mb8">
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
+
+		<el-table v-loading="loading" :data="sparePartsLedgerList" @selection-change="handleSelectionChange" ref="multipleTable">
+			<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="materialCode" width="120"/>
+			<el-table-column label="备品备件描述" align="center" prop="materialDesc" width="120"/>
+			<el-table-column label="备品备件类型" align="center" prop="spareType" width="120"/>
+			<el-table-column label="规格型号" align="center" prop="spareMode" />
+			<el-table-column label="库存总数量" align="center" prop="amount" />
+			<el-table-column label="库存冻结数量" align="center" prop="storageAmount" />
+			<el-table-column label="库存可用数量" align="center" prop="availableQuantity" >
+			<template slot-scope="scope">
+      <span>{{ scope.row.amount-scope.row.storageAmount}}</span>
+      </template>
+      </el-table-column>
+			<el-table-column label="领用数量" align="center" prop="spareQuantity">
+			  <template slot-scope="scope">
+          <el-input size="small" v-model="scope.row.spareQuantity" @change="handleEdit(scope.$index,scope.row)"></el-input>
+        </template>
+      </el-table-column>
+		</el-table>
+
+		<pagination
+			v-show="total>0"
+			:total="total"
+			:page.sync="queryParams.pageNum"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList"
+		/>
+		</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>
+</template>
+
+<script>
+import { listSparePartsLedger, getSparePartsLedger, delSparePartsLedger, addSparePartsLedger, updateSparePartsLedger } from "@/api/device/sparePartsLedger";
+
+export default {
+	name: "SparePartsLedger",
+	data() {
+		return {
+		  //展示
+		  showFlag:false,
+			// 遮罩层
+			loading: true,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 备品备件台账管理表格数据
+			sparePartsLedgerList: [],
+			// 弹出层标题
+			title: "",
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNum: 1,
+				pageSize: 10,
+				storageId: null,
+				whCode: null,
+				regionCode: null,
+				waCode: null,
+				storageType: null,
+				wlCode: null,
+				materialCode: null,
+				materialDesc: null,
+				amount: null,
+				storageAmount: null,
+				occupyAmount: null,
+				lpn: null,
+				productBatch: null,
+				receiveDate: null,
+				productDate: null,
+				userDefined1: null,
+				userDefined2: null,
+				userDefined3: null,
+				userDefined4: null,
+				userDefined5: null,
+				userDefined6: null,
+				userDefined7: null,
+				userDefined8: null,
+				userDefined9: null,
+				userDefined10: null,
+				gmtCreate: null,
+				lastModifiedBy: null,
+				gmtModified: null,
+				activeFlag: null,
+				factoryCode: null,
+				sapFactoryCode: null,
+				wlName: null,
+				spareUseLife: null,
+				spareName: null,
+				spareMode: null,
+				spareManufacturer: null,
+				spareSupplier: null,
+				spareReplacementCycle: null,
+				spareMeasurementUnit: null,
+				spareConversionUnit: null,
+				spareConversionRatio: null,
+				spareInventoryFloor: null,
+				spareInventoryUpper: null
+			},
+			 options: [{
+                spareType: "专用",
+                label: '专用'
+              }, {
+                spareType: "通用",
+                label: '通用'
+              }],
+			// 表单参数
+			form: {},
+			// 表单校验
+			rules: {
+				storageId: [
+					{ required: true, message: "唯一序列不能为空", trigger: "blur" }
+				],
+			}
+		};
+	},
+	created() {
+		this.getList();
+	},
+	methods: {
+    handleEdit(index, row) {
+     console.log('row:',index, row);
+     console.log('storageId:',row.storageId) //获取到变化行的name值
+    },
+		// 生成表头序号
+    indexMethod(index) {
+      return index + 1;
+    },
+		/** 查询备品备件台账管理列表 */
+		getList() {
+			this.loading = true;
+			listSparePartsLedger(this.queryParams).then(response => {
+				this.sparePartsLedgerList = response.rows;
+				this.total = response.total;
+				this.loading = false;
+			});
+		},
+		// 取消按钮
+		cancel() {
+			this.showFlag = false;
+			this.reset();
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				storageId: null,
+				whCode: null,
+				regionCode: null,
+				waCode: null,
+				storageType: null,
+				wlCode: null,
+				materialCode: null,
+				materialDesc: null,
+				amount: null,
+				storageAmount: null,
+				occupyAmount: null,
+				lpn: null,
+				productBatch: null,
+				receiveDate: null,
+				productDate: null,
+				userDefined1: null,
+				userDefined2: null,
+				userDefined3: null,
+				userDefined4: null,
+				userDefined5: null,
+				userDefined6: null,
+				userDefined7: null,
+				userDefined8: null,
+				userDefined9: null,
+				userDefined10: null,
+				createBy: null,
+				gmtCreate: null,
+				lastModifiedBy: null,
+				gmtModified: null,
+				activeFlag: null,
+				factoryCode: null,
+				sapFactoryCode: null,
+				wlName: null,
+				delFlag: null,
+				spareUseLife: null,
+				spareName: null,
+				spareMode: null,
+				spareManufacturer: null,
+				spareSupplier: null,
+				spareReplacementCycle: null,
+				spareMeasurementUnit: null,
+				spareConversionUnit: null,
+				spareConversionRatio: null,
+				spareInventoryFloor: null,
+				spareInventoryUpper: 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.storageId)
+			this.single = selection.length!==1
+			this.multiple = !selection.length
+		},
+		/** 提交按钮 */
+		submitForm(){
+      console.log('data:',this.sparePartsLedgerList);
+      console.log("选择的数据",this.$refs.multipleTable.selection);
+      this.$emit('onSelected',this.$refs.multipleTable.selection);
+      this.showFlag = false;
+		},
+	}
+};
+</script>
diff --git a/src/views/device/sparePartsApplicationRecord/index.vue b/src/views/device/sparePartsApplicationRecord/index.vue
index 7cdbe54..16a2392 100644
--- a/src/views/device/sparePartsApplicationRecord/index.vue
+++ b/src/views/device/sparePartsApplicationRecord/index.vue
@@ -1,14 +1,15 @@
 <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-form-item label="出库单号" prop="applyCode">
 				<el-input
 					v-model="queryParams.applyCode"
 					placeholder="请输入出库单号"
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
-			</el-form-item>
+			</el-form-item> -->
 			<el-form-item label="备品备件编码" prop="spareCode">
 				<el-input
 					v-model="queryParams.spareCode"
@@ -41,14 +42,14 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="使用组线" prop="spareGroupLine">
+			<!-- <el-form-item label="使用组线" prop="spareGroupLine">
 				<el-input
 					v-model="queryParams.spareGroupLine"
 					placeholder="请输入使用组线"
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
-			</el-form-item>
+			</el-form-item> -->
 			<el-form-item label="使用设备" prop="spareUseEquipment">
 				<el-input
 					v-model="queryParams.spareUseEquipment"
@@ -65,14 +66,14 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="批准人" prop="applyApprovePeople">
+			<!-- <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-form-item label="领用时间" prop="applyTime">
         <el-date-picker
           v-model="queryParams.applyTimeArray"
@@ -142,20 +143,20 @@
 			<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="applyCode" />
+			<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="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="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">
@@ -187,45 +188,79 @@
 
 		<!-- 添加或修改申领记录对话框 -->
 		<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 ref="form" :model="form" :rules="rules" label-width="110px">
+				<!-- <el-form-item label="出库单号" prop="applyCode">
+					<el-input v-model="form.applyCode" placeholder="请输入出库单号" style="width: 280px"/>
+				</el-form-item> -->
+				<el-form-item label="使用设备" prop="spareUseEquipment">
+					<el-input v-model="form.spareUseEquipment" placeholder="请输选择使用设备" style="width: 280px">
+            <el-button
+              slot="append"
+              @click="handleSelectEquipment"
+              icon="el-icon-search"
+            ></el-button>
+          </el-input>
+          <ItemSelectEquipment ref="itemSelectEquipment" @onSelected="onItemSelectedEquipment">
+          </ItemSelectEquipment>
 				</el-form-item>
 				<el-form-item label="备品备件编码" prop="spareCode">
-					<el-input v-model="form.spareCode" placeholder="请输入备品备件编码" />
+					<el-input v-model="form.spareCode" placeholder="请选择备品备件编码" style="width: 280px">
+            <el-button
+              slot="append"
+              @click="handleSelectSparePartsLedger"
+              icon="el-icon-search"
+            ></el-button>
+          </el-input>
+          <ItemSelectSparePartsLedger ref="itemSelectSparePartsLedger" @onSelected="onItemSelectedSparePartsLedger">
+          </ItemSelectSparePartsLedger>
 				</el-form-item>
 				<el-form-item label="备品备件名称" prop="spareName">
-					<el-input v-model="form.spareName" placeholder="请输入备品备件名称" />
+					<el-input v-model="form.spareName" placeholder="请选择备品备件名称" style="width: 280px"/>
 				</el-form-item>
 				<el-form-item label="规格型号" prop="spareModel">
-					<el-input v-model="form.spareModel" placeholder="请输入规格型号" />
+					<el-input v-model="form.spareModel" placeholder="请选择规格型号" style="width: 280px"/>
 				</el-form-item>
-				<el-form-item label="数量" prop="spareQuantity">
-					<el-input v-model="form.spareQuantity" placeholder="请输入数量" />
+        <el-form-item label="库存总数量" prop="amount">
+					<el-input v-model="form.amount" style="width: 280px" disabled/>
 				</el-form-item>
-				<el-form-item label="使用组线" prop="spareGroupLine">
-					<el-input v-model="form.spareGroupLine" placeholder="请输入使用组线" />
+        <el-form-item label="冻结数量" prop="storageAmount">
+					<el-input v-model="form.storageAmount" style="width: 280px" disabled/>
 				</el-form-item>
-				<el-form-item label="使用设备" prop="spareUseEquipment">
-					<el-input v-model="form.spareUseEquipment" placeholder="请输入使用设备" />
+        <el-form-item label="库存可用数量" prop="availableQuantity">
+					<el-input v-model="form.availableQuantity" style="width: 280px" disabled/>
 				</el-form-item>
+				<el-form-item label="数量" prop="spareQuantity">
+					<el-input v-model="form.spareQuantity" placeholder="请输入数量" style="width: 280px"/>
+				</el-form-item>
+				<!-- <el-form-item label="使用组线" prop="spareGroupLine">
+					<el-input v-model="form.spareGroupLine" placeholder="请选择使用组线" style="width: 280px"/>
+				</el-form-item> -->
 				<el-form-item label="领用时间" prop="applyTime">
 					<el-date-picker clearable
 						v-model="form.applyTime"
-						type="date"
-						value-format="yyyy-MM-dd"
+						type="datetime"
+						value-format="yyyy-MM-dd HH:mm:ss"
+						style="width: 280px"
 						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-input v-model="form.applyPeople" placeholder="请选择申领人" style="width: 280px">
+            <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="applyApprovePeople">
+					<el-input v-model="form.applyApprovePeople" placeholder="请选择批准人" style="width: 280px"/>
+				</el-form-item> -->
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>
@@ -237,9 +272,13 @@
 
 <script>
 import { listSparePartsApplicationRecord, getSparePartsApplicationRecord, delSparePartsApplicationRecord, addSparePartsApplicationRecord, updateSparePartsApplicationRecord } from "@/api/device/sparePartsApplicationRecord";
+import ItemSelectPerson from "./selectSinglePerson.vue";
+import ItemSelectEquipment from "./selectSingleEquipment.vue";
+import ItemSelectSparePartsLedger from "./selectSparePartsLedger.vue";
 
 export default {
 	name: "SparePartsApplicationRecord",
+	components: { ItemSelectPerson ,ItemSelectEquipment,ItemSelectSparePartsLedger},
 	data() {
 		return {
 			// 遮罩层
@@ -312,6 +351,24 @@ export default {
 			form: {},
 			// 表单校验
 			rules: {
+				spareCode: [
+					{ required: true, message: "备品备件编码不能为空", trigger: "blur" }
+				],
+				spareName: [
+					{ required: true, message: "备品备件名称不能为空", trigger: "blur" }
+				],
+				spareModel: [
+					{ required: true, message: "规格型号不能为空", trigger: "blur" }
+				],
+				spareQuantity: [
+					{ required: true, message: "数量不能为空", trigger: "blur" }
+				],
+				applyTime: [
+					{ required: true, message: "领用时间不能为空", trigger: "blur" }
+				],
+				applyPeople: [
+					{ required: true, message: "申领人不能为空", trigger: "blur" }
+				],
 			}
 		};
 	},
@@ -319,6 +376,35 @@ export default {
 		this.getList();
 	},
 	methods: {
+	  //备品备件选择弹出框
+    handleSelectSparePartsLedger() {
+      this.$refs.itemSelectSparePartsLedger.showFlag = true;
+    },
+    //备品备件回显
+    onItemSelectedSparePartsLedger(obj) {
+      this.form.spareCode = obj[0].materialCode;
+      this.form.spareName = obj[0].materialDesc;
+      this.form.spareModel = obj[0].spareMode;
+      this.form.amount =  obj[0].amount;
+      this.form.storageAmount =  obj[0].storageAmount;
+      this.form.availableQuantity = obj[0].amount - obj[0].storageAmount;
+    },
+    //设备选择
+    handleSelectEquipment() {
+      this.$refs.itemSelectEquipment.showFlag = true;
+    },
+    //设备选择
+    onItemSelectedEquipment(obj) {
+      this.form.spareUseEquipment = obj;
+    },
+    //人员选择
+    handleSelectPerson() {
+      this.$refs.itemSelectPerson.showFlag = true;
+    },
+    //人员选择
+    onItemSelectedPerson(obj) {
+      this.form.applyPeople = obj;
+    },
 		// 生成表头序号
     indexMethod(index) {
       return index + 1;
@@ -407,11 +493,18 @@ export default {
 							this.getList();
 						});
 					} else {
-						addSparePartsApplicationRecord(this.form).then(response => {
+            if(this.form.amount - this.form.storageAmount < this.form.spareQuantity){
+              this.$message({
+              message: "您填入的领用数量大于库存可用数量！",
+              type: "warning",
+            });
+            }else{
+              addSparePartsApplicationRecord(this.form).then(response => {
 							this.$modal.msgSuccess("新增成功");
 							this.open = false;
 							this.getList();
 						});
+            }
 					}
 				}
 			});
diff --git a/src/views/device/sparePartsApplicationRecord/selectSingleEquipment.vue b/src/views/device/sparePartsApplicationRecord/selectSingleEquipment.vue
new file mode 100644
index 0000000..a9bc5cb
--- /dev/null
+++ b/src/views/device/sparePartsApplicationRecord/selectSingleEquipment.vue
@@ -0,0 +1,246 @@
+<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();
+    },
+
+
+    // 多选框选中数据
+		handleEquipmentSelectionChange(selection) {
+			this.ids = selection.map(item => item.equipmentCode);
+			this.single = selection.length!==1;
+			this.multiple = !selection.length;
+			console.log("多选框",this.ids);
+		},
+
+    submitEquipmentForm() {
+      const data = this.ids;
+      if(data.length >1){
+        Message.warning("只能选择一个备件使用机器,请勿选择多个！");
+      }else{
+        const equipmentCode = data.toString();
+        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>
diff --git a/src/views/device/sparePartsApplicationRecord/selectSinglePerson.vue b/src/views/device/sparePartsApplicationRecord/selectSinglePerson.vue
new file mode 100644
index 0000000..11fe0a9
--- /dev/null
+++ b/src/views/device/sparePartsApplicationRecord/selectSinglePerson.vue
@@ -0,0 +1,186 @@
+<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(data.length >1){
+        Message.warning("只能选择一个维修人,请勿选择多个！");
+      }else{
+        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/sparePartsApplicationRecord/selectSparePartsLedger.vue b/src/views/device/sparePartsApplicationRecord/selectSparePartsLedger.vue
new file mode 100644
index 0000000..7e75c31
--- /dev/null
+++ b/src/views/device/sparePartsApplicationRecord/selectSparePartsLedger.vue
@@ -0,0 +1,361 @@
+<template>
+  <el-dialog
+    title="备品备件选择"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal="false"
+    width="1100px"
+    center
+    :before-close="cancel"
+  >
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="98px"
+    >
+      <el-form-item label="备品备件号" prop="materialCode">
+        <el-input
+          v-model="queryParams.materialCode"
+          placeholder="请输入备品备件号"
+          clearable
+          @keyup.enter.native="handleQuery"
+          style="width: 150px"
+        />
+      </el-form-item>
+      <el-form-item label="备件类型" prop="spareType">
+        <el-select
+          v-model="queryParams.spareType"
+          placeholder="请选择备件类型"
+          @keyup.enter.native="handleQuery"
+          @change="$forceUpdate()"
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="item in options"
+            :key="item.spareType"
+            :label="item.label"
+            :value="item.spareType"
+          ></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-row :gutter="10" class="mb8">
+        <right-toolbar
+          :showSearch.sync="showSearch"
+          @queryTable="getList"
+        ></right-toolbar>
+      </el-row>
+
+      <el-table
+        v-loading="loading"
+        :data="sparePartsLedgerList"
+        @selection-change="handleSelectionChange"
+        ref="multipleTable"
+      >
+        <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="materialCode"
+          width="120"
+        />
+        <el-table-column
+          label="备品备件描述"
+          align="center"
+          prop="materialDesc"
+          width="120"
+        />
+        <el-table-column
+          label="备品备件类型"
+          align="center"
+          prop="spareType"
+          width="120"
+        />
+        <el-table-column label="规格型号" align="center" prop="spareMode" />
+        <el-table-column label="库存总数量" align="center" prop="amount" />
+        <el-table-column
+          label="库存冻结数量"
+          align="center"
+          prop="storageAmount"
+        />
+        <el-table-column
+          label="库存可用数量"
+          align="center"
+          prop="availableQuantity"
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.amount - scope.row.storageAmount }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="领用数量" align="center" prop="spareQuantity">
+          <template slot-scope="scope">
+            <el-input
+              size="small"
+              v-model="scope.row.spareQuantity"
+              @change="handleEdit(scope.$index, scope.row)"
+            ></el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </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>
+</template>
+  
+  <script>
+import {
+  listSparePartsLedger,
+  getSparePartsLedger,
+  delSparePartsLedger,
+  addSparePartsLedger,
+  updateSparePartsLedger,
+} from "@/api/device/sparePartsLedger";
+
+export default {
+  name: "SparePartsLedger",
+  data() {
+    return {
+      //展示
+      showFlag: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 备品备件台账管理表格数据
+      sparePartsLedgerList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        storageId: null,
+        whCode: null,
+        regionCode: null,
+        waCode: null,
+        storageType: null,
+        wlCode: null,
+        materialCode: null,
+        materialDesc: null,
+        amount: null,
+        storageAmount: null,
+        occupyAmount: null,
+        lpn: null,
+        productBatch: null,
+        receiveDate: null,
+        productDate: null,
+        userDefined1: null,
+        userDefined2: null,
+        userDefined3: null,
+        userDefined4: null,
+        userDefined5: null,
+        userDefined6: null,
+        userDefined7: null,
+        userDefined8: null,
+        userDefined9: null,
+        userDefined10: null,
+        gmtCreate: null,
+        lastModifiedBy: null,
+        gmtModified: null,
+        activeFlag: null,
+        factoryCode: null,
+        sapFactoryCode: null,
+        wlName: null,
+        spareUseLife: null,
+        spareName: null,
+        spareMode: null,
+        spareManufacturer: null,
+        spareSupplier: null,
+        spareReplacementCycle: null,
+        spareMeasurementUnit: null,
+        spareConversionUnit: null,
+        spareConversionRatio: null,
+        spareInventoryFloor: null,
+        spareInventoryUpper: null,
+      },
+      options: [
+        {
+          spareType: "专用",
+          label: "专用",
+        },
+        {
+          spareType: "通用",
+          label: "通用",
+        },
+      ],
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        storageId: [
+          { required: true, message: "唯一序列不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    handleEdit(index, row) {
+      console.log("row:", index, row);
+      console.log("storageId:", row.storageId); //获取到变化行的name值
+    },
+    // 生成表头序号
+    indexMethod(index) {
+      return index + 1;
+    },
+    /** 查询备品备件台账管理列表 */
+    getList() {
+      this.loading = true;
+      listSparePartsLedger(this.queryParams).then((response) => {
+        this.sparePartsLedgerList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.showFlag = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        storageId: null,
+        whCode: null,
+        regionCode: null,
+        waCode: null,
+        storageType: null,
+        wlCode: null,
+        materialCode: null,
+        materialDesc: null,
+        amount: null,
+        storageAmount: null,
+        occupyAmount: null,
+        lpn: null,
+        productBatch: null,
+        receiveDate: null,
+        productDate: null,
+        userDefined1: null,
+        userDefined2: null,
+        userDefined3: null,
+        userDefined4: null,
+        userDefined5: null,
+        userDefined6: null,
+        userDefined7: null,
+        userDefined8: null,
+        userDefined9: null,
+        userDefined10: null,
+        createBy: null,
+        gmtCreate: null,
+        lastModifiedBy: null,
+        gmtModified: null,
+        activeFlag: null,
+        factoryCode: null,
+        sapFactoryCode: null,
+        wlName: null,
+        delFlag: null,
+        spareUseLife: null,
+        spareName: null,
+        spareMode: null,
+        spareManufacturer: null,
+        spareSupplier: null,
+        spareReplacementCycle: null,
+        spareMeasurementUnit: null,
+        spareConversionUnit: null,
+        spareConversionRatio: null,
+        spareInventoryFloor: null,
+        spareInventoryUpper: 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.storageId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 提交按钮 */
+    submitForm() {
+      console.log("data:", this.sparePartsLedgerList);
+      console.log("选择的数据", this.$refs.multipleTable.selection);
+      if (this.$refs.multipleTable.selection.length > 1) {
+        this.$message({
+          message: "请勿选择多种备件！",
+          type: "warning",
+        });
+        // const number =
+        //   this.$refs.multipleTable.selection.amount -
+        //   this.$refs.multipleTable.selection.storageAmount;
+        // console.log("number", number);
+        // if (this.$refs.multipleTable.selection.spareQuantity > number) {
+        //   this.$message({
+        //     message: "您填入的领用数量大于库存可用数量！",
+        //     type: "warning",
+        //   });
+        // }
+      } else {
+        this.$emit("onSelected", this.$refs.multipleTable.selection);
+        this.showFlag = false;
+      }
+    },
+  },
+};
+</script>
+  
\ No newline at end of file
diff --git a/src/views/device/sparePartsLedger/index.vue b/src/views/device/sparePartsLedger/index.vue
index 007046e..19452fc 100644
--- a/src/views/device/sparePartsLedger/index.vue
+++ b/src/views/device/sparePartsLedger/index.vue
@@ -10,14 +10,6 @@
 					style="width:150px"
 				/>
 			</el-form-item>
-			<el-form-item label="备品备件描述" prop="materialDesc">
-				<el-input
-					v-model="queryParams.materialDesc"
-					placeholder="请输入备品备件描述"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
 			<el-form-item label="规格型号" prop="spareMode">
 				<el-input
 					v-model="queryParams.spareMode"