From 2de12aabc739792d44d5391078e30858820644fc Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Fri, 12 Jan 2024 17:20:12 +0800
Subject: [PATCH] =?UTF-8?q?2024-1-12-3=20=E8=AE=BE=E5=A4=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E6=B1=87=E6=80=BB=E6=8A=A5=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=961?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/equipment/index.vue | 116 ++++++++++++++++++++----------
 1 file changed, 77 insertions(+), 39 deletions(-)

diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index 19ee090..d17c429 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -169,7 +169,12 @@
         :index="indexMethod"
         label="序号"
       />
-      <el-table-column label="设备编码" align="center" prop="equipmentCode" width="150">
+      <el-table-column
+        label="设备编码"
+        align="center"
+        prop="equipmentCode"
+        width="150"
+      >
         <template slot-scope="scope">
           <el-button
             type="text"
@@ -200,7 +205,12 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column prop="equipmentStatus" label="设备状态" width="100" align="center">
+      <el-table-column
+        prop="equipmentStatus"
+        label="设备状态"
+        width="100"
+        align="center"
+      >
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.equipment_status"
@@ -221,12 +231,7 @@
           />
         </template>
       </el-table-column>
-      <el-table-column
-        label="备注"
-        align="center"
-        prop="remark"
-        width="100"
-      >
+      <el-table-column label="备注" align="center" prop="remark" width="100">
       </el-table-column>
       <el-table-column
         label="设备类型编码"
@@ -394,7 +399,10 @@
             <el-step title="设备使用状况"></el-step>
             <el-step title="设备资产信息"></el-step>
             <el-step title="设备绑定备件"></el-step>
-            <el-step title="设备绑定辅助设备" v-if="this.form.equipmentCategory == '1' "></el-step>
+            <el-step
+              title="设备绑定辅助设备"
+              v-if="this.form.equipmentCategory == '1'"
+            ></el-step>
           </el-steps>
         </div>
         <!-- 维修基本信息 -->
@@ -742,7 +750,7 @@
           </el-row>
         </div>
         <!-- 设备绑定备件 -->
-        <div v-if="this.repairRecordSteps == 3 " class="step-body">
+        <div v-if="this.repairRecordSteps == 3" class="step-body">
           <template>
             <el-transfer
               filterable
@@ -757,7 +765,12 @@
         </div>
 
         <!-- 设备绑定辅助设备 -->
-        <div v-if="this.repairRecordSteps == 4 && this.form.equipmentCategory == '1'  " class="step-body">
+        <div
+          v-if="
+            this.repairRecordSteps == 4 && this.form.equipmentCategory == '1'
+          "
+          class="step-body"
+        >
           <template>
             <el-transfer
               filterable
@@ -775,21 +788,39 @@
         <el-button v-if="this.repairRecordSteps > 0" @click="stepLast"
           >上一步</el-button
         >
-        <el-button v-if="this.repairRecordSteps < 4 && this.form.equipmentCategory == '1' " @click="stepNext"
+        <el-button
+          v-if="
+            this.repairRecordSteps < 4 && this.form.equipmentCategory == '1'
+          "
+          @click="stepNext"
           >下一步</el-button
         >
-        <el-button v-if="this.repairRecordSteps < 3 && this.form.equipmentCategory == '0' " @click="stepNext"
+        <el-button
+          v-if="
+            this.repairRecordSteps < 3 && this.form.equipmentCategory == '0'
+          "
+          @click="stepNext"
+          >下一步</el-button
+        >
+        <el-button
+          v-if="
+            this.repairRecordSteps < 3 && this.form.equipmentCategory == null
+          "
+          disabled
           >下一步</el-button
         >
-        <el-button v-if="this.repairRecordSteps < 3 && this.form.equipmentCategory == null " disabled>下一步</el-button>
         <el-button
-          v-if=" this.repairRecordSteps == 4 && this.form.equipmentCategory == '1' "
+          v-if="
+            this.repairRecordSteps == 4 && this.form.equipmentCategory == '1'
+          "
           type="primary"
           @click="submitForm"
           >提 交</el-button
         >
         <el-button
-          v-if=" this.repairRecordSteps == 3 && this.form.equipmentCategory == '0' "
+          v-if="
+            this.repairRecordSteps == 3 && this.form.equipmentCategory == '0'
+          "
           type="primary"
           @click="submitForm"
           >提 交</el-button
@@ -909,19 +940,19 @@
               }}</el-descriptions-item>
             </el-descriptions>
           </el-tab-pane>
-          <el-tab-pane label="辅助设备" >
+          <el-tab-pane label="辅助设备">
             <ItemEquipment
               :optType="optType"
               :equipmentCode="form.equipmentCode"
             ></ItemEquipment>
           </el-tab-pane>
-          <el-tab-pane label="维修记录" >
+          <el-tab-pane label="维修记录">
             <ItemWXRecords
               :optType="optType"
               :equipmentCode="form.equipmentCode"
             ></ItemWXRecords>
           </el-tab-pane>
-          <el-tab-pane label="保养记录" >
+          <el-tab-pane label="保养记录">
             <ItemBYRecords
               :optType="optType"
               :equipmentCode="form.equipmentCode"
@@ -1068,7 +1099,7 @@ export default {
     "equipment_status",
     "equipment_category",
   ],
-  components: { ItemSelectPerson, ItemEquipment , ItemWXRecords , ItemBYRecords},
+  components: { ItemSelectPerson, ItemEquipment, ItemWXRecords, ItemBYRecords },
   data() {
     return {
       CS: {
@@ -1198,7 +1229,7 @@ export default {
         workshopSection: null,
         equipmentLocation: null,
         hourlyUnitPrice: null,
-        equipmentCategory : null,
+        equipmentCategory: null,
       },
       queryEquipmentHeadParams: {
         pageNum: 1,
@@ -1207,7 +1238,7 @@ export default {
       queryAuxiliaryEquipmentParams: {
         pageNum: 1,
         pageSize: 1000,
-        equipmentCategory : null,
+        equipmentCategory: null,
       },
       options: [
         {
@@ -1310,10 +1341,11 @@ export default {
           // 将返回的列表赋值于穿梭框左边列表
           this.leftList.push({
             key: response.rows[i].materialCode,
-            label: response.rows[i].materialCode + response.rows[i].materialDesc,
+            label:
+              response.rows[i].materialCode + response.rows[i].materialDesc,
           });
         }
-        console.log(this.auxiliaryEquipmentRightList)
+        console.log(this.auxiliaryEquipmentRightList);
         for (let i in response.selected) {
           this.rightList.push(response.selected[i].key);
           this.form.rightData = this.rightList;
@@ -1380,12 +1412,12 @@ export default {
         equipmentLocation: null,
         hourlyUnitPrice: null,
         equipmentHead: null,
-        equipmentCategory : null,
-			  assetClassificationName : null,
-			  assetDescription : null,
-			  equipmentNumber : null,
-			  inventoryNumber : null ,
-			  unitMeasurement : null
+        equipmentCategory: null,
+        assetClassificationName: null,
+        assetDescription: null,
+        equipmentNumber: null,
+        inventoryNumber: null,
+        unitMeasurement: null,
       };
       this.resetForm("form");
     },
@@ -1443,13 +1475,16 @@ export default {
       this.rightList = [];
       this.auxiliaryEquipmentLeftList = [];
       this.auxiliaryEquipmentRightList = [];
-      this.queryAuxiliaryEquipmentParams.equipmentCategory = '0';
+      this.queryAuxiliaryEquipmentParams.equipmentCategory = "0";
       listEquipment(this.queryAuxiliaryEquipmentParams).then((response) => {
         for (let i in response.rows) {
           // 将返回的列表赋值于穿梭框左边列表
           this.auxiliaryEquipmentLeftList.push({
             key: response.rows[i].equipmentCode,
-            label: response.rows[i].equipmentCode + response.rows[i].equipmentName + response.rows[i].remark,
+            label:
+              response.rows[i].equipmentCode +
+              response.rows[i].equipmentName +
+              response.rows[i].remark,
           });
         }
       });
@@ -1466,22 +1501,25 @@ export default {
         this.options1 = response.rows;
       });
 
-      this.queryAuxiliaryEquipmentParams.equipmentCategory = '0';
+      this.queryAuxiliaryEquipmentParams.equipmentCategory = "0";
       listEquipment(this.queryAuxiliaryEquipmentParams).then((response) => {
-        console.log("listEquipment")
+        console.log("listEquipment");
         this.auxiliaryEquipmentLeftList = [];
         for (let i in response.rows) {
           // 将返回的列表赋值于穿梭框左边列表
           this.auxiliaryEquipmentLeftList.push({
             key: response.rows[i].equipmentCode,
-            label: response.rows[i].equipmentCode + response.rows[i].equipmentName + response.rows[i].remark,
+            label:
+              response.rows[i].equipmentCode +
+              response.rows[i].equipmentName +
+              response.rows[i].remark,
           });
         }
-        console.log(this.auxiliaryEquipmentRightList)
+        console.log(this.auxiliaryEquipmentRightList);
       });
 
       getEquipment(equipmentId).then((response) => {
-        console.log("getEquipment")
+        console.log("getEquipment");
         this.form = response.data;
         this.rightList = [];
         for (let i in response.data.selectedData) {
@@ -1489,14 +1527,14 @@ export default {
           this.rightList.push(response.data.selectedData[i].spareCode);
         }
         this.auxiliaryEquipmentRightList = [];
-        console.log(this.auxiliaryEquipmentRightList)
+        console.log(this.auxiliaryEquipmentRightList);
         for (let i in response.data.selectedEquipmentData) {
           // 将返回的辅助设备列表赋值于穿梭框右边列表
           this.auxiliaryEquipmentRightList.push(
             response.data.selectedEquipmentData[i].auxiliaryEquipmentCode
           );
         }
-        console.log(this.auxiliaryEquipmentRightList)
+        console.log(this.auxiliaryEquipmentRightList);
 
         if (response.data.imageFiles != null) {
           var newFiles = [];