修改运维管理维修管理

src/views/ledgerAssets/components/assetInformation.vue

@@ -582,13 +582,11 @@
       },
       // 使用岗位点击事件
       async auditorDeptClick(data) {
-        console.log(data);
+        this.zcInfo.chargePersonId = '';
+        this.zcInfo.usePersonId = '';
+        this.userList = [];
         if (data) {
           this.getStaffList(data);
-        } else {
-          this.zcInfo.chargePersonId = '';
-          this.zcInfo.usePersonId = '';
-          this.userList = [];
         }
       },
       // 获取供应商下拉列表
@@ -624,7 +622,7 @@
       async initData() {
         console.log('this.zcInfo---------------------', this.zcInfo);
         // 填充使用岗位
-        this.zcInfo.postId && this.auditorDeptClick(this.zcInfo.postId);
+        this.zcInfo.postId && this.getStaffList(this.zcInfo.postId);
         this.geMaintainersList();
       }
     }

src/views/ledgerAssets/components/assetInformationView.vue

@@ -258,7 +258,7 @@
                 style="width: 100%"
                 v-model="zcInfo.isPublic"
                 filterable
-                placeholder="请选择使用人"
+                placeholder="请选择类型"
               >
                 <el-option
                   v-for="item in typeOptions"
@@ -571,13 +571,11 @@
       },
       // 使用岗位点击事件
       async auditorDeptClick(data) {
-        console.log(data);
+        this.zcInfo.chargePersonId = '';
+        this.zcInfo.usePersonId = '';
+        this.userList = [];
         if (data) {
           this.getStaffList(data);
-        } else {
-          this.zcInfo.chargePersonId = '';
-          this.zcInfo.usePersonId = '';
-          this.userList = [];
         }
       },
       // 获取供应商下拉列表

src/views/maintenance/delivery/plan/details.vue

@@ -125,6 +125,27 @@
                   <span class="item_label">设备型号</span>
                   <span class="item_value">{{ item.substance.model }}</span>
                 </div>
+                <div class="item_info">
+                  <span class="item_label">编号</span>
+                  <span class="item_value">{{
+                    item.substance.codeNumber
+                  }}</span>
+                </div>
+                <div class="item_info">
+                  <span class="item_label">使用人</span>
+                  <span class="item_value">{{ item.substance.usePerson }}</span>
+                </div>
+                <div class="item_info">
+                  <span class="item_label">使用岗位</span>
+                  <span class="item_value">{{ item.substance.postName }}</span>
+                </div>
+
+                <div class="item_info">
+                  <span class="item_label">负责人</span>
+                  <span class="item_value">{{
+                    item.substance.chargePerson
+                  }}</span>
+                </div>
                 <div class="item_info">
                   <span class="item_label">是否丢失</span>
                   <span class="item_value">{{ loseOptions[item.isLose] }}</span>
@@ -778,12 +799,12 @@
               flex: 1;
               padding-left: 5px;
             }
-            &:last-child {
-              width: 100%;
-              .item_value {
-                border: 0;
-              }
-            }
+            // &:last-child {
+            //   width: 100%;
+            //   .item_value {
+            //     border: 0;
+            //   }
+            // }
           }
         }
         > p {

src/views/maintenance/delivery/plan/index.vue

@@ -19,7 +19,7 @@
             class="ele-btn-icon"
             @click="openAdd('新增量具送检计划配置')"
           >
-            新建临时计划
+            新建抽检计划
           </el-button>
         </template>
         <!-- 	     <template v-slot:enable="{ row }">

src/views/maintenance/repair/components/RepairDetailsDialog.vue

@@ -454,10 +454,17 @@
           //     return;
           //   });
           // }
-          this.repairInfoLogs =
+          let repairInfoLogs =
             res.ticketsInfoResponse.repairLogVOS?.length > 0
-              ? res.ticketsInfoResponse.repairLogVOS
+              ? res.ticketsInfoResponse.repairLogVOS.map((item) => {
+                  return {
+                    ...item,
+                    requestUserName: res.repairRequestResponse.requestUserName,
+                    remark: res.repairRequestResponse.remark
+                  };
+                })
               : [];
+          this.repairInfoLogs = repairInfoLogs.reverse();
         }
       },
 

src/views/maintenance/repair/components/WorkOrderTab.vue

@@ -55,6 +55,10 @@
           <span>生成工单</span>
           <span>{{ logs['CREATE'].createTime }}</span>
         </div>
+        <div slot="description" class="create_workerOrder_desc">
+          <div> 报修人：{{ logs['CREATE'].requestUserName }} </div>
+          <div> 故障描述：{{ logs['CREATE'].remark }} </div>
+        </div>
       </el-step>
       <el-step v-if="item.type == 'WORK_REPORT'">
         <span
@@ -421,7 +425,9 @@
           this.logs[item.type] = {
             id: item.id,
             content: item.content,
-            createTime: item.createTime
+            createTime: item.createTime,
+            remark: item.remark,
+            requestUserName: item.requestUserName
           };
         });
         this.logsKeys = Object.keys(this.logs);
@@ -522,6 +528,12 @@
       justify-content: space-between;
       color: #7f7f7f;
     }
+    ::v-deep .create_workerOrder_desc {
+      display: flex;
+      > div {
+        flex: 1;
+      }
+    }
     ::v-deep .work_report_desc {
       padding: 5px 10px;
       margin-bottom: 30px;