新增订单数量 库存数量 安全库存字段

dev
qiuhongwu 4 months ago
parent 5c0007345c
commit 171c82ad91

@ -93,7 +93,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="业务员" > <el-form-item label="业务员">
<UserSelect <UserSelect
:disabled="alterDisabled || detailDisabled" :disabled="alterDisabled || detailDisabled"
v-model="formData.businessMan" v-model="formData.businessMan"
@ -159,7 +159,7 @@
<el-form-item label="是否紧急" prop="isUrgency"> <el-form-item label="是否紧急" prop="isUrgency">
<el-radio-group <el-radio-group
v-model="formData.isUrgency" v-model="formData.isUrgency"
:disabled="detailDisabled||formData.orderSource!==1" :disabled="detailDisabled || formData.orderSource !== 1"
:class="{ 'alter-class': fieldHasAlter('isUrgency') }" :class="{ 'alter-class': fieldHasAlter('isUrgency') }"
> >
<el-radio <el-radio
@ -179,7 +179,7 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="客户名称" prop="customerId"> <el-form-item label="客户名称" prop="customerId">
<ClientSelect <ClientSelect
:disabled="alterDisabled || detailDisabled||formData.orderSource!==1" :disabled="alterDisabled || detailDisabled || formData.orderSource !== 1"
v-model="formData.customerId" v-model="formData.customerId"
@update:newValue="handleSelectedClient" @update:newValue="handleSelectedClient"
/> />
@ -265,7 +265,9 @@
<el-row> <el-row>
<el-col> <el-col>
<el-card class="hl-incard"> <el-card class="hl-incard">
<el-col v-if="'update,create,alter'.indexOf(query.active) > -1&&formData.orderSource==1"> <el-col
v-if="'update,create,alter'.indexOf(query.active) > -1 && formData.orderSource == 1"
>
<el-button class="hl-addbutton" type="primary" size="large" @click="onAddItem" <el-button class="hl-addbutton" type="primary" size="large" @click="onAddItem"
>新增</el-button >新增</el-button
> >
@ -330,8 +332,22 @@
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
label="订单数量"
min-width="150"
prop="orderAmount"
align="center"
/>
<el-table-column
label="库存数量"
min-width="150"
prop="availableQuantity"
align="center"
/>
<el-table-column label="安全库存" min-width="150" prop="invSafe" align="center" />
<el-table-column min-width="150" align="center"> <el-table-column min-width="150" align="center">
<template #header> <span class="hl-table_header">*</span>数量 </template> <template #header> <span class="hl-table_header">*</span>生产数量 </template>
<template #default="{ row, $index }"> <template #default="{ row, $index }">
<el-form-item <el-form-item
:prop="`${$index}.amount`" :prop="`${$index}.amount`"
@ -340,9 +356,9 @@
> >
<el-input-number <el-input-number
style="width: 100%" style="width: 100%"
:disabled="detailDisabled||formData.orderSource!==1" :disabled="detailDisabled || formData.orderSource !== 1"
v-model="row.amount" v-model="row.amount"
placeholder="请输入数量" placeholder="请输入生产数量"
:min="0" :min="0"
:precision="0" :precision="0"
:class="{ 'alter-class': fieldHasAlterInRow('amount', row) }" :class="{ 'alter-class': fieldHasAlterInRow('amount', row) }"
@ -389,7 +405,11 @@
clearable clearable
class="!w-400px" class="!w-400px"
@change="handleWh(row, $index)" @change="handleWh(row, $index)"
:disabled="detailDisabled||formData.orderStatus == 8||formData.orderSource!==1 " :disabled="
detailDisabled ||
formData.orderStatus == 8 ||
formData.orderSource !== 1
"
> >
<el-option <el-option
v-for="dict in whList" v-for="dict in whList"
@ -409,7 +429,7 @@
class="mb-0px!" class="mb-0px!"
> >
<el-input <el-input
:disabled="detailDisabled||formData.orderSource!==1" :disabled="detailDisabled || formData.orderSource !== 1"
v-model="row.remark" v-model="row.remark"
placeholder="请输入备注" placeholder="请输入备注"
:class="{ 'alter-class': fieldHasAlterInRow('remark', row) }" :class="{ 'alter-class': fieldHasAlterInRow('remark', row) }"
@ -421,8 +441,10 @@
<template #default="scope"> <template #default="scope">
<el-button <el-button
v-if=" v-if="
'update,create,alter'.indexOf(query.active) > -1 && !formData.hasAlter 'update,create,alter'.indexOf(query.active) > -1 &&
&&formData.orderSource==1" !formData.hasAlter &&
formData.orderSource == 1
"
:disabled="detailDisabled" :disabled="detailDisabled"
link link
type="danger" type="danger"
@ -446,7 +468,9 @@
<el-row> <el-row>
<el-col> <el-col>
<el-card class="hl-incard" :class="{ 'alter-class': fieldHasAlter('attachments') }"> <el-card class="hl-incard" :class="{ 'alter-class': fieldHasAlter('attachments') }">
<el-col v-if="'update,create,alter'.indexOf(query.active) > -1||formData.orderSource==1"> <el-col
v-if="'update,create,alter'.indexOf(query.active) > -1 || formData.orderSource == 1"
>
<el-upload <el-upload
ref="contractUploadRef" ref="contractUploadRef"
:file-list="contractUploadFiles" :file-list="contractUploadFiles"
@ -623,7 +647,7 @@ const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 12 const formLoading = ref(false) // 12
const formType = ref('') // create - update - const formType = ref('') // create - update -
const nowStr = formatDate(new Date(), 'YYYY-MM-DD') const nowStr = formatDate(new Date(), 'YYYY-MM-DD')
const now = new Date(nowStr+' 00:00:00').getTime() const now = new Date(nowStr + ' 00:00:00').getTime()
const formData = ref({ const formData = ref({
id: undefined, id: undefined,
code: undefined, code: undefined,
@ -826,7 +850,6 @@ const submitForm = async (active) => {
return return
} }
} }
} }
const orderId = await ProjectOrderApi.operateProjectOrder(data) const orderId = await ProjectOrderApi.operateProjectOrder(data)
@ -841,7 +864,7 @@ const submitForm = async (active) => {
await protocolUploadRef.value!.submit() await protocolUploadRef.value!.submit()
} }
if (active == 'DISPATCH'|| active == 'ALTER') { if (active == 'DISPATCH' || active == 'ALTER') {
query.active = 'detail' query.active = 'detail'
} else { } else {
query.active = 'update' query.active = 'update'
@ -869,6 +892,9 @@ const getList = async (arrMat) => {
projectSubName: row.name, projectSubName: row.name,
projectSubCode: row.code, projectSubCode: row.code,
unit: row.unit, unit: row.unit,
orderAmount: 0,
availableQuantity: 0,
invSafe: 0,
warehouseId: formData.value.warehouseId warehouseId: formData.value.warehouseId
} }
formData.value.projectOrderSubs.push(rows) formData.value.projectOrderSubs.push(rows)

Loading…
Cancel
Save