Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

gaoluyang

2 天以前 b64a0deae5b5d33f9e20671a68936b27f0b9b00b

 src/views/mes/workbench/index.vue

@@ -167,7 +167,6 @@
          :list="taskList"
          :selected-id="selectedTask?.id"
          :loading="taskLoading"
          :process-name="workstation?.processName"
          @select="handleSelectTask"
        />
      </aside>
@@ -181,8 +180,8 @@
      <main class="workbench-main">
        <div class="workbench-main__head">
          <span class="workbench-main__tab-title">{{ activeTabLabel }}</span>
          <span v-if="selectedTask?.workOrderCode" class="workbench-main__context">
            工单 {{ selectedTask.workOrderCode }}
          <span v-if="selectedTask?.code" class="workbench-main__context">
            工单 {{ selectedTask.code }}
          </span>
        </div>
        <div class="workbench-main__body">
@@ -204,16 +203,25 @@
          />
          <RecordParamTab
            v-else-if="activeTab === 'record-param'"
            :work-order-id="selectedTask?.workOrderId"
            :task-id="selectedTask?.id"
            :work-order-id="selectedTask?.id"
            :workstation-id="workstationId"
          />
          <ProductIssueTab
            v-else-if="activeTab === 'product-issue'"
            :task-id="selectedTask?.id"
            :task-code="selectedTask?.code"
            :task-name="selectedTask?.name"
            :work-order-id="selectedTask?.workOrderId"
            :workstation-id="workstationId"
            :workstation-name="workstationName"
          />
          <ReturnIssueTab
            v-else-if="activeTab === 'return-issue'"
            :task-id="selectedTask?.id"
            :task-code="selectedTask?.code"
            :task-name="selectedTask?.name"
            :work-order-id="selectedTask?.workOrderId"
            :workstation-id="workstationId"
            :workstation-name="workstationName"
          />