验货数量限制修改,采购订单状态新增
This commit is contained in:
parent
845cf8cc77
commit
0b819ec0eb
|
|
@ -887,18 +887,20 @@ export default {
|
|||
}else{
|
||||
row.qualifiedNum = row.qualifiedNum.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1')
|
||||
}
|
||||
if(Number(row.deliveryNum)>=(Number(row.orderNum)-Number(row.totalQualifiedNum))){
|
||||
setTimeout(()=>{
|
||||
row.qualifiedNum = Number(row.orderNum)-Number(row.totalQualifiedNum)
|
||||
},200)
|
||||
if(Number(row.deliveryNum)>(Number(row.orderNum)-Number(row.totalQualifiedNum))){
|
||||
if(Number(row.qualifiedNum)>(Number(row.orderNum)-Number(row.totalQualifiedNum))){
|
||||
setTimeout(()=>{
|
||||
row.qualifiedNum = Number(row.orderNum)-Number(row.totalQualifiedNum)
|
||||
},200)
|
||||
}
|
||||
}
|
||||
if(Number(row.deliveryNum)<(Number(row.orderNum)-Number(row.totalQualifiedNum))){
|
||||
setTimeout(()=>{
|
||||
if(Number(row.qualifiedNum)>=Number(row.deliveryNum)){
|
||||
row.qualifiedNum = Number(row.deliveryNum)
|
||||
}
|
||||
},200)
|
||||
}
|
||||
// if(Number(row.deliveryNum)<(Number(row.orderNum)-Number(row.totalQualifiedNum))){
|
||||
// setTimeout(()=>{
|
||||
// if(Number(row.qualifiedNum)>=Number(row.deliveryNum)){
|
||||
// row.qualifiedNum = Number(row.deliveryNum)
|
||||
// }
|
||||
// },200)
|
||||
// }
|
||||
},
|
||||
//日期
|
||||
formatDate(date) {
|
||||
|
|
|
|||
|
|
@ -31,6 +31,8 @@
|
|||
<el-select v-model="queryParams.orderStatus" placeholder="请选择提交状态" style="width: 240px;">
|
||||
<el-option label="待提交" :value="1"></el-option>
|
||||
<el-option label="已提交" :value="2"></el-option>
|
||||
<el-option label="已验货" :value="3"></el-option>
|
||||
<el-option label="已完成" :value="4"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="审批状态" prop="approveStatus">
|
||||
|
|
@ -122,12 +124,14 @@
|
|||
<el-table-column label="采购订单标题" align="center" prop="orderTitle" :show-overflow-tooltip="true" width="180"/>
|
||||
<el-table-column label="采购订单时间" align="center" prop="createTime" :show-overflow-tooltip="true" width="160"/>
|
||||
|
||||
<!-- <el-table-column label="提交状态" align="center" prop="orderStatus" :show-overflow-tooltip="true" width="100">
|
||||
<el-table-column label="提交状态" align="center" prop="orderStatus" :show-overflow-tooltip="true" width="100">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.orderStatus==1">待提交</span>
|
||||
<span v-if="scope.row.orderStatus==2">已提交</span>
|
||||
<span v-if="scope.row.orderStatus==3">已验货</span>
|
||||
<span v-if="scope.row.orderStatus==4">已完成</span>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
</el-table-column>
|
||||
<!-- <el-table-column label="确认状态" align="center" prop="supplierConfirmStatus" :show-overflow-tooltip="true" width="100">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.supplierConfirmStatus==1">待确认</span>
|
||||
|
|
@ -155,19 +159,19 @@
|
|||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit" v-if="scope.row.orderStatus==1"
|
||||
icon="el-icon-edit" v-if="scope.row.orderStatus==1||scope.row.orderStatus==2"
|
||||
@click="handleUpdate(scope.row)"
|
||||
>编辑</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit" v-if="scope.row.orderStatus==2"
|
||||
icon="el-icon-edit" v-if="scope.row.orderStatus!=1"
|
||||
@click="handleView(scope.row)"
|
||||
>详情</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit" v-if="scope.row.orderStatus==2"
|
||||
icon="el-icon-edit" v-if="scope.row.orderStatus==2||scope.row.orderStatus==3"
|
||||
@click="handlePurchaseInspection(scope.row)"
|
||||
>生成采购验货</el-button>
|
||||
<el-button
|
||||
|
|
|
|||
Loading…
Reference in New Issue