refactor(物料管理): 移除领料按钮并修正产品列名
- 在入库记录页面移除10线领料按钮及相关条件判断 - 在工单详情对话框中将产品编号和名称列改为物料编号和名称
This commit is contained in:
@@ -87,10 +87,8 @@
|
|||||||
<el-button v-if="scope.row.remarks == '已撤销' || scope.row.transactionType == '入库红单'" type="info" size="small" title="撤销" disabled
|
<el-button v-if="scope.row.remarks == '已撤销' || scope.row.transactionType == '入库红单'" type="info" size="small" title="撤销" disabled
|
||||||
>已撤销</el-button
|
>已撤销</el-button
|
||||||
>
|
>
|
||||||
|
|
||||||
<template v-else>
|
<template v-else>
|
||||||
<el-button
|
<el-button
|
||||||
v-if="scope.row.workorderRaw == null || scope.row.workorderRaw == ''"
|
|
||||||
type="info"
|
type="info"
|
||||||
size="small"
|
size="small"
|
||||||
icon="refresh-left"
|
icon="refresh-left"
|
||||||
@@ -99,7 +97,7 @@
|
|||||||
@click="handleCancel(scope.row)"
|
@click="handleCancel(scope.row)"
|
||||||
>撤销</el-button
|
>撤销</el-button
|
||||||
>
|
>
|
||||||
<el-button
|
<!-- <el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
size="small"
|
size="small"
|
||||||
icon="takeaway-box"
|
icon="takeaway-box"
|
||||||
@@ -107,7 +105,7 @@
|
|||||||
v-hasPermi="['mmrecordinbound:lingliao']"
|
v-hasPermi="['mmrecordinbound:lingliao']"
|
||||||
@click="handleTakeMaterial(scope.row)"
|
@click="handleTakeMaterial(scope.row)"
|
||||||
>10线领料</el-button
|
>10线领料</el-button
|
||||||
>
|
> -->
|
||||||
</template>
|
</template>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|||||||
@@ -141,8 +141,8 @@
|
|||||||
<el-table-column prop="createdTime" label="操作时间" width="120" />
|
<el-table-column prop="createdTime" label="操作时间" width="120" />
|
||||||
<el-table-column prop="operator" label="操作员" width="80" />
|
<el-table-column prop="operator" label="操作员" width="80" />
|
||||||
<el-table-column prop="inboundNo" label="入库单号" />
|
<el-table-column prop="inboundNo" label="入库单号" />
|
||||||
<el-table-column prop="productCode" label="产品编号" />
|
<el-table-column prop="materialCode" label="产品编号" />
|
||||||
<el-table-column prop="productName" label="产品名称" />
|
<el-table-column prop="materialName" label="产品名称" />
|
||||||
<el-table-column prop="batchNo" label="原材料批次号" width="120" />
|
<el-table-column prop="batchNo" label="原材料批次号" width="120" />
|
||||||
<el-table-column prop="quantity" label="入库数量" />
|
<el-table-column prop="quantity" label="入库数量" />
|
||||||
<el-table-column label="操作" width="120" fixed="right" align="center">
|
<el-table-column label="操作" width="120" fixed="right" align="center">
|
||||||
@@ -163,8 +163,8 @@
|
|||||||
<el-table-column prop="createdTime" label="操作时间" width="120" />
|
<el-table-column prop="createdTime" label="操作时间" width="120" />
|
||||||
<el-table-column prop="operator" label="操作员" width="80" />
|
<el-table-column prop="operator" label="操作员" width="80" />
|
||||||
<el-table-column prop="outboundNo" label="出货单号" />
|
<el-table-column prop="outboundNo" label="出货单号" />
|
||||||
<el-table-column prop="productCode" label="产品编号" />
|
<el-table-column prop="materialCode" label="产品编号" />
|
||||||
<el-table-column prop="productName" label="产品名称" />
|
<el-table-column prop="materialName" label="产品名称" />
|
||||||
<el-table-column prop="batchNo" label="原材料批次号" width="120" />
|
<el-table-column prop="batchNo" label="原材料批次号" width="120" />
|
||||||
<el-table-column prop="workorder" label="出货工单号" width="120" />
|
<el-table-column prop="workorder" label="出货工单号" width="120" />
|
||||||
<el-table-column prop="workorderRaw" label="原材料工单号" width="120" />
|
<el-table-column prop="workorderRaw" label="原材料工单号" width="120" />
|
||||||
|
|||||||
Reference in New Issue
Block a user