From 02e9f600d38ab3f200da7618a7eb066264ddd812 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 20 Dec 2023 14:46:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=20?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/equipment/index.vue | 81 +++++++++++++++++++++++++++++--
 1 file changed, 78 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index a73391aa..d5a72cb9 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -169,7 +169,7 @@
         :index="indexMethod"
         label="序号"
       />
-      <el-table-column label="设备编码" align="center" prop="equipmentCode">
+      <el-table-column label="设备编码" align="center" prop="equipmentCode" width="150">
         <template slot-scope="scope">
           <el-button
             type="text"
@@ -183,7 +183,7 @@
         label="设备名称"
         align="center"
         prop="equipmentName"
-        width="200"
+        width="300"
       />
       <el-table-column
         label="是否启用"
@@ -296,6 +296,36 @@
         prop="buyTime"
         width="200"
       />
+      <el-table-column
+        label="资产分类名称"
+        align="center"
+        prop="assetClassificationName"
+        width="100"
+      />
+      <el-table-column
+        label="资产描述"
+        align="center"
+        prop="assetDescription"
+        width="200"
+      />
+      <el-table-column
+        label="设备数量"
+        align="center"
+        prop="equipmentNumber"
+        width="100"
+      />
+      <el-table-column
+        label="存货号"
+        align="center"
+        prop="inventoryNumber"
+        width="100"
+      />
+      <el-table-column
+        label="计量单位"
+        align="center"
+        prop="unitMeasurement"
+        width="100"
+      />
       <el-table-column
         label="资产负责人"
         align="center"
@@ -394,6 +424,7 @@
                 <el-select
                   v-model="form.equipmentTypeCode"
                   placeholder="请选择设备类型"
+                  filterable
                   style="width: 195px"
                 >
                   <el-option
@@ -661,9 +692,48 @@
                 />
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="资产分类名称" prop="assetClassificationName">
+                <el-input
+                  v-model="form.assetClassificationName"
+                  placeholder="请输入资产分类名称"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="资产描述" prop="assetDescription">
+                <el-input
+                  v-model="form.assetDescription"
+                  placeholder="请输入资产描述"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备数量" prop="equipmentNumber">
+                <el-input
+                  v-model="form.equipmentNumber"
+                  placeholder="请输入设备数量"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="存货号" prop="inventoryNumber">
+                <el-input
+                  v-model="form.inventoryNumber"
+                  placeholder="请输入存货号"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="计量单位" prop="unitMeasurement">
+                <el-input
+                  v-model="form.unitMeasurement"
+                  placeholder="请输入计量单位"
+                />
+              </el-form-item>
+            </el-col>
           </el-row>
         </div>
-
         <!-- 设备绑定备件 -->
         <div v-if="this.repairRecordSteps == 3 " class="step-body">
           <template>
@@ -1288,6 +1358,11 @@ export default {
         hourlyUnitPrice: null,
         equipmentHead: null,
         equipmentCategory : null,
+			  assetClassificationName : null,
+			  assetDescription : null,
+			  equipmentNumber : null,
+			  inventoryNumber : null ,
+			  unitMeasurement : null
       };
       this.resetForm("form");
     },