Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-majoys into dev

mes-ui/mes-ui-admin-vue3/src/views/biz/taskdispatch/index.vue

@@ -121,10 +121,10 @@
       >
         <el-table-column fixed type="selection" width="40" :reserve-selection="true" />
         <el-table-column fixed type="index" min-width="70" label="序号" align="center" />
-        <el-table-column fixed label="生产派工单号" align="center" prop="code" min-width="150">
+        <el-table-column fixed label="生产订单号" align="center" prop="projectCode" min-width="220" >
           <template #default="scope">
             <el-button type="primary" plain link @click="openDetail('detail', scope.row.id)">{{
-              scope.row.code
+              scope.row.projectCode
             }}</el-button>
           </template>
         </el-table-column>
@@ -133,7 +133,7 @@
         <!-- 项目名称修改为产品名称 -->
         <el-table-column
           label="产品名称"
-          fixed
+
           align="center"
           prop="projectSubName"
           min-width="240"
@@ -150,8 +150,7 @@
 
         <!-- 生产任务单号修改为生产计划单号 -->
         <el-table-column label="生产计划单号" align="center" prop="planCode" min-width="180" />
-        <!-- 项目编号修改为生产订单号 -->
-        <el-table-column label="生产订单号" align="center" prop="projectCode" min-width="220" />
+        <el-table-column  label="生产派工单号" align="center" prop="code" min-width="150"/>
         <el-table-column label="客户名称" align="center" prop="customerName" min-width="240" />
         <!-- 新增生产车间 -->
         <el-table-column label="生产车间" align="center" prop="workshopName" min-width="180" />