Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld

Junjie

2023-11-27 5ac80d6a06f686a62c307c52c652e511e3896fb7

 src/main/webapp/views/commandManage/commandManage.html

@@ -53,7 +53,7 @@
                        </el-dropdown>
                     </template>
                  </el-table-column>
                  <el-table-column property="id" label="指令编号">
                  <el-table-column property="id" label="#ID">
                  </el-table-column>
                  <el-table-column property="wrkNo" label="工作号">
                  </el-table-column>
@@ -178,6 +178,12 @@
                  }
                  this.getTableData()
               },
               tableRowClassName({row, rowIndex}) {
                  if (rowIndex === this.commandStep) {
                     return 'success-row';
                  }
                  return '';
               },
               handleCommand(command, row) {
                  switch (command) {
                     case "showTask":
@@ -190,27 +196,23 @@
                        break;
                     case "completeCommand":
                        //完成指令
                        this.completeCommand(row)
                        this.completeWrk(row)
                        break;
                  }
               },
               showTask(row) {
                  //查看任务
                  let wrkNo = row.wrkNo == null ? "" : row.wrkNo
                  console.log(wrkNo)
                  //查看指令
                  $layui.layer.open({
                     type: 2,
                     title: '任务管理',
                     maxmin: true,
                     area: [top.detailWidth, top.detailHeight],
                     shadeClose: true,
                     content: '../taskWrk/taskWrk.html?taskNo=' + row.taskNo + "&wrkNo=" + row.wrkNo,
                     content: '../taskWrk/taskWrk.html?taskNo=' + row.taskNo + "&wrkNo=" + wrkNo,
                     success: function(layero, index) {}
                  });
               },
               tableRowClassName({row, rowIndex}) {
                  if (rowIndex === this.commandStep) {
                     return 'success-row';
                  }
                  return '';
               },
               executeCommand(row) {
                  //执行指令
@@ -271,7 +273,7 @@
                        }
                     }
                  });
               }
               },
            }
         })
      </script>