Merge branch 'master' into csc

chengsc

2024-09-13 c75a630f7b099dfe3e5030a2cc66e96560cb9561

 Web/src/views/device/wcsOderTask/component/editDialog.vue

@@ -115,7 +115,7 @@
         </template>
      </el-dialog>

      <!-- 绑定任务弹框 -->
      <!-- 选择物料弹框 -->
      <el-dialog v-model="bindDialogVisible" title="选择数据">
            <el-table
                :data="bindBoxData"