2024-1-12-3 设备管理-汇总报表页面优化1

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
+      <el-table-column label="备注" align="center" prop="remark" width="100">
-        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>
         <!-- 维修基本信息 -->
@@ -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
@@ -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;
@@ -1385,7 +1417,7 @@ export default {
         assetDescription: null,
         equipmentNumber: null,
         inventoryNumber: null,
-			  unitMeasurement : 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 = [];