|
|
@@ -6,8 +6,8 @@
|
|
|
<el-form-item label="名称" prop="productName">
|
|
|
<el-input v-model="dataForm.productName" placeholder="名称" clearable></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="合同号" prop="orderCode">
|
|
|
- <el-input v-model="dataForm.orderCode" placeholder="合同号" clearable></el-input>
|
|
|
+ <el-form-item label="任务单编码" prop="orderCode">
|
|
|
+ <el-input v-model="dataForm.orderCode" placeholder="任务单编码" clearable></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="生产状态" prop="state">
|
|
|
<el-select
|
|
|
@@ -40,60 +40,97 @@
|
|
|
align="center">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="prodCode"
|
|
|
+ prop="orderCode"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
min-width="140"
|
|
|
:show-tooltip-when-overflow="true"
|
|
|
- label="物料编号">
|
|
|
+ label="任务单编码">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="productName"
|
|
|
+ prop="customerName"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
min-width="140"
|
|
|
:show-tooltip-when-overflow="true"
|
|
|
- label="物料名称">
|
|
|
+ label="客户名称">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="orderDeliveryDate"
|
|
|
+ prop="contractNumber"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
min-width="160"
|
|
|
:show-tooltip-when-overflow="true"
|
|
|
- label="交期时间">
|
|
|
+ label="合同号">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="state"
|
|
|
+ prop=""
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
min-width="80"
|
|
|
:formatter="stateFormat"
|
|
|
:show-tooltip-when-overflow="true"
|
|
|
- label="状态">
|
|
|
+ label="生产编号">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="orderCode"
|
|
|
+ prop="productName"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
min-width="140"
|
|
|
:show-tooltip-when-overflow="true"
|
|
|
- label="合同号">
|
|
|
+ label="物料名称">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="customerName"
|
|
|
+ prop="cnt"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
min-width="120"
|
|
|
:show-overflow-tooltip="true"
|
|
|
- label="客户名称">
|
|
|
+ label="数量">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="deliveryDate"
|
|
|
+ prop="deliverCnt"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
min-width="160"
|
|
|
:show-tooltip-when-overflow="true"
|
|
|
+ label="送货数量">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="arriveCnt"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ min-width="160"
|
|
|
+ label="送达数量">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="deliveryDate"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ min-width="160"
|
|
|
+ label="交期时间">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="batchNumber"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ min-width="160"
|
|
|
+ label="批次号">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="state"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ min-width="160"
|
|
|
+ label="状态">
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">{{stateFormat(scope.row)}}</template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="consignmentDate"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ min-width="160"
|
|
|
label="发货时间">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -111,14 +148,15 @@
|
|
|
<el-button :disabled="!scope.row.attachList || scope.row.attachList.length === 0" type="text" size="small" @click="attachDetails(scope.row)">查看</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+
|
|
|
<el-table-column
|
|
|
fixed="right"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- width="120"
|
|
|
+ width="160"
|
|
|
label="操作">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-button v-if="isAuth('order:deliver:info') && Number(scope.row.state) !== 0" type="text" size="small" @click="detailHandle(scope.row)">查看</el-button>
|
|
|
+ <el-button v-if="isAuth('order:deliver:info') && Number(scope.row.state) <= 3" type="text" size="small" @click="detailHandle(scope.row)">查看</el-button>
|
|
|
<el-button v-if="isAuth('order:deliver:send') && Number(scope.row.state) === 2" type="text" size="small" @click="sendHandle(scope.row.deliverId)">发货</el-button>
|
|
|
<el-button v-if="isAuth('order:deliver:arrive') && Number(scope.row.state) === 3" type="text" size="small" @click="arriveHandle(scope.row.deliverId)">送达</el-button>
|
|
|
</template>
|
