|
|
|
@ -104,16 +104,28 @@
|
|
|
|
|
<ContentWrap>
|
|
|
|
|
<el-table v-loading="loading" :data="list" :stripe="true" class="hl-table">
|
|
|
|
|
<el-table-column fixed type="index" min-width="70" label="序号" align="center" />
|
|
|
|
|
<el-table-column fixed label="生产派工单号" align="center" prop="code" min-width="195">
|
|
|
|
|
<el-table-column fixed label="生产派工单号" align="center" prop="code" min-width="170">
|
|
|
|
|
<template #default="scope">
|
|
|
|
|
<el-button type="primary" plain link @click="openDetail('detail', scope.row.id)">{{
|
|
|
|
|
scope.row.code
|
|
|
|
|
}}</el-button>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<!-- 新增产品编码 -->
|
|
|
|
|
<el-table-column label="产品编码" align="center" prop="projectSubCode" min-width="140" />
|
|
|
|
|
<!-- 项目名称修改为产品名称 -->
|
|
|
|
|
<el-table-column label="产品名称" fixed align="center" prop="projectSubName" min-width="240" />
|
|
|
|
|
<el-table-column label="规格型号" fixed align="center" prop="spec" min-width="160" />
|
|
|
|
|
<el-table-column label="数量" fixed align="center" prop="amount" min-width="90" />
|
|
|
|
|
<el-table-column label="单位" align="center" prop="unit" min-width="80">
|
|
|
|
|
<template #default="scope">
|
|
|
|
|
<dict-tag :type="DICT_TYPE.BIZ_MATERIAL_UNIT" :value="scope.row.unit" />
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
|
|
<!-- 生产任务单号修改为生产计划单号 -->
|
|
|
|
|
<el-table-column
|
|
|
|
|
fixed
|
|
|
|
|
|
|
|
|
|
label="生产计划单号"
|
|
|
|
|
align="center"
|
|
|
|
|
prop="planCode"
|
|
|
|
@ -124,17 +136,7 @@
|
|
|
|
|
<el-table-column label="客户名称" align="center" prop="customerName" min-width="240" />
|
|
|
|
|
<!-- 新增生产车间 -->
|
|
|
|
|
<el-table-column label="生产车间" align="center" prop="workshopName" min-width="180" />
|
|
|
|
|
<!-- 新增产品编码 -->
|
|
|
|
|
<el-table-column label="产品编码" align="center" prop="projectSubCode" min-width="260" />
|
|
|
|
|
<!-- 项目名称修改为产品名称 -->
|
|
|
|
|
<el-table-column label="产品名称" align="center" prop="projectSubName" min-width="180" />
|
|
|
|
|
<el-table-column label="规格型号" align="center" prop="spec" min-width="160" />
|
|
|
|
|
<el-table-column label="数量" align="center" prop="amount" min-width="120" />
|
|
|
|
|
<el-table-column label="单位" align="center" prop="unit" min-width="120">
|
|
|
|
|
<template #default="scope">
|
|
|
|
|
<dict-tag :type="DICT_TYPE.BIZ_MATERIAL_UNIT" :value="scope.row.unit" />
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
|
|
<el-table-column
|
|
|
|
|
label="创建时间"
|
|
|
|
|
align="center"
|
|
|
|
@ -144,11 +146,10 @@
|
|
|
|
|
/>
|
|
|
|
|
<el-table-column label="备注" align="center" prop="remark" min-width="160" />
|
|
|
|
|
<el-table-column
|
|
|
|
|
fixed="right"
|
|
|
|
|
label="任务负责人"
|
|
|
|
|
align="center"
|
|
|
|
|
prop="ownerName"
|
|
|
|
|
min-width="140"
|
|
|
|
|
min-width="120"
|
|
|
|
|
/>
|
|
|
|
|
<!-- 要求完成时间修改为预计完成日期 -->
|
|
|
|
|
<el-table-column
|
|
|
|
@ -157,14 +158,14 @@
|
|
|
|
|
align="center"
|
|
|
|
|
prop="requiredCompletedDate"
|
|
|
|
|
:formatter="dateFormatter2"
|
|
|
|
|
min-width="160"
|
|
|
|
|
min-width="140"
|
|
|
|
|
/>
|
|
|
|
|
<el-table-column
|
|
|
|
|
fixed="right"
|
|
|
|
|
label="单据状态"
|
|
|
|
|
align="center"
|
|
|
|
|
prop="dispatchStatus"
|
|
|
|
|
min-width="140"
|
|
|
|
|
min-width="120"
|
|
|
|
|
>
|
|
|
|
|
<template #default="scope">
|
|
|
|
|
<dict-tag :type="DICT_TYPE.BIZ_DISPATCH_STATUS" :value="scope.row.dispatchStatus" />
|
|
|
|
@ -174,7 +175,7 @@
|
|
|
|
|
fixed="right"
|
|
|
|
|
label="操作"
|
|
|
|
|
align="center"
|
|
|
|
|
min-width="290"
|
|
|
|
|
min-width="270"
|
|
|
|
|
style="position: relative"
|
|
|
|
|
>
|
|
|
|
|
<template #default="scope">
|
|
|
|
|