|
|
@ -25,7 +25,7 @@
|
|
|
|
<el-col :span="6">
|
|
|
|
<el-col :span="6">
|
|
|
|
<el-form-item label="项目编号" prop="saleOrderIds">
|
|
|
|
<el-form-item label="项目编号" prop="saleOrderIds">
|
|
|
|
<el-input disabled v-model="formData.saleOrderCode" placeholder="请输入项目编号" >
|
|
|
|
<el-input disabled v-model="formData.saleOrderCode" placeholder="请输入项目编号" >
|
|
|
|
<template #append><el-button :disabled="query.active != 'create'" @click="openProjectOrderDialog" :icon="Search" /></template>
|
|
|
|
<template #append><el-button :disabled="active != 'create'" @click="openProjectOrderDialog" :icon="Search" /></template>
|
|
|
|
</el-input>
|
|
|
|
</el-input>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
@ -117,7 +117,7 @@
|
|
|
|
</el-row>
|
|
|
|
</el-row>
|
|
|
|
</el-card>
|
|
|
|
</el-card>
|
|
|
|
|
|
|
|
|
|
|
|
<el-card class="hl-card-info" v-if="query.active != 'create'">
|
|
|
|
<el-card class="hl-card-info" v-if="active != 'create'">
|
|
|
|
<template #header>
|
|
|
|
<template #header>
|
|
|
|
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">收货信息</span>
|
|
|
|
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">收货信息</span>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
@ -202,7 +202,7 @@
|
|
|
|
</el-row>
|
|
|
|
</el-row>
|
|
|
|
</el-card>
|
|
|
|
</el-card>
|
|
|
|
|
|
|
|
|
|
|
|
<el-card class="hl-card-info" v-if="query.active != 'create'">
|
|
|
|
<el-card class="hl-card-info" v-if="active != 'create'">
|
|
|
|
<template #header>
|
|
|
|
<template #header>
|
|
|
|
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">发货清单</span>
|
|
|
|
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">发货清单</span>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
@ -285,7 +285,7 @@
|
|
|
|
<el-table-column label="操作" align="center" width="100">
|
|
|
|
<el-table-column label="操作" align="center" width="100">
|
|
|
|
<template #default="scope">
|
|
|
|
<template #default="scope">
|
|
|
|
<el-button
|
|
|
|
<el-button
|
|
|
|
v-if="'update,create,deliver'.indexOf(query.active) > -1"
|
|
|
|
v-if="'update,create,deliver'.indexOf(active) > -1"
|
|
|
|
link
|
|
|
|
link
|
|
|
|
type="danger"
|
|
|
|
type="danger"
|
|
|
|
size="small"
|
|
|
|
size="small"
|
|
|
@ -302,12 +302,12 @@
|
|
|
|
</el-row>
|
|
|
|
</el-row>
|
|
|
|
</el-card>
|
|
|
|
</el-card>
|
|
|
|
|
|
|
|
|
|
|
|
<el-card class="hl-card-info" v-if="query.active != 'create'">
|
|
|
|
<el-card class="hl-card-info" v-if="active != 'create'">
|
|
|
|
<template #header>
|
|
|
|
<template #header>
|
|
|
|
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">其他物料清单</span>
|
|
|
|
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">其他物料清单</span>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
<el-row>
|
|
|
|
<el-row>
|
|
|
|
<el-col v-if="query.active != 'detail'">
|
|
|
|
<el-col v-if="active != 'detail'">
|
|
|
|
<el-button class="hl-addbutton" type="primary" size="large" @click="onAddItem2"
|
|
|
|
<el-button class="hl-addbutton" type="primary" size="large" @click="onAddItem2"
|
|
|
|
>新增</el-button
|
|
|
|
>新增</el-button
|
|
|
|
>
|
|
|
|
>
|
|
|
@ -389,7 +389,7 @@
|
|
|
|
<el-table-column label="操作" align="center" width="240">
|
|
|
|
<el-table-column label="操作" align="center" width="240">
|
|
|
|
<template #default="scope">
|
|
|
|
<template #default="scope">
|
|
|
|
<el-button
|
|
|
|
<el-button
|
|
|
|
v-if="'update,create,deliver'.indexOf(query.active) > -1"
|
|
|
|
v-if="'update,create,deliver'.indexOf(active) > -1"
|
|
|
|
link
|
|
|
|
link
|
|
|
|
type="danger"
|
|
|
|
type="danger"
|
|
|
|
size="small"
|
|
|
|
size="small"
|
|
|
@ -406,12 +406,12 @@
|
|
|
|
</el-row>
|
|
|
|
</el-row>
|
|
|
|
</el-card>
|
|
|
|
</el-card>
|
|
|
|
|
|
|
|
|
|
|
|
<el-card class="hl-card-info" v-if="query.active != 'create'">
|
|
|
|
<el-card class="hl-card-info" v-if="active != 'create'">
|
|
|
|
<template #header>
|
|
|
|
<template #header>
|
|
|
|
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">附件信息</span>
|
|
|
|
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">附件信息</span>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
<el-row>
|
|
|
|
<el-row>
|
|
|
|
<el-col v-if="query.active != 'detail'">
|
|
|
|
<el-col v-if="active != 'detail'">
|
|
|
|
<el-upload
|
|
|
|
<el-upload
|
|
|
|
ref="attachmentUploadRef"
|
|
|
|
ref="attachmentUploadRef"
|
|
|
|
multiple
|
|
|
|
multiple
|
|
|
@ -441,7 +441,7 @@
|
|
|
|
<el-table-column label="操作" align="center">
|
|
|
|
<el-table-column label="操作" align="center">
|
|
|
|
<template #default="scope">
|
|
|
|
<template #default="scope">
|
|
|
|
<el-button
|
|
|
|
<el-button
|
|
|
|
v-if="'update,create,deliver'.indexOf(query.active) > -1"
|
|
|
|
v-if="'update,create,deliver'.indexOf(active) > -1"
|
|
|
|
link
|
|
|
|
link
|
|
|
|
type="danger"
|
|
|
|
type="danger"
|
|
|
|
size="small"
|
|
|
|
size="small"
|
|
|
@ -466,7 +466,7 @@
|
|
|
|
</el-row>
|
|
|
|
</el-row>
|
|
|
|
</el-card>
|
|
|
|
</el-card>
|
|
|
|
|
|
|
|
|
|
|
|
<el-card class="hl-card-info" v-if="query.active != 'create'">
|
|
|
|
<el-card class="hl-card-info" v-if="active != 'create'">
|
|
|
|
<template #header>
|
|
|
|
<template #header>
|
|
|
|
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">操作日志</span>
|
|
|
|
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">操作日志</span>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
@ -494,11 +494,11 @@
|
|
|
|
</el-form>
|
|
|
|
</el-form>
|
|
|
|
<div class="text-center hl-footer">
|
|
|
|
<div class="text-center hl-footer">
|
|
|
|
<el-button @click="goback" size="large">取 消</el-button>
|
|
|
|
<el-button @click="goback" size="large">取 消</el-button>
|
|
|
|
<el-button v-if="query.active != 'detail' && formData.deliverStatus == 1" @click="submitForm('SAVE')" type="success" :disabled="formLoading" size="large"
|
|
|
|
<el-button v-if="active != 'detail' && formData.deliverStatus == 1" @click="submitForm('SAVE')" type="success" :disabled="formLoading" size="large"
|
|
|
|
>保 存</el-button>
|
|
|
|
>保 存</el-button>
|
|
|
|
<el-button v-if="(((query.active != 'detail' && formData.id) || query.active == 'deliver') && formData.deliverStatus == 1)" @click="submitForm('DELIVER')" type="primary" :disabled="formLoading" size="large"
|
|
|
|
<el-button v-if="(((active != 'detail' && formData.id) || active == 'deliver') && formData.deliverStatus == 1)" @click="submitForm('DELIVER')" type="primary" :disabled="formLoading" size="large"
|
|
|
|
>发 货</el-button>
|
|
|
|
>发 货</el-button>
|
|
|
|
<el-button v-if="query.active == 'detail' && formData.deliverStatus == 2 && formData.id" type="primary" :disabled="formLoading" size="large"
|
|
|
|
<el-button v-if="active == 'detail' && formData.deliverStatus == 2 && formData.id" type="primary" :disabled="formLoading" size="large"
|
|
|
|
>打印发货单</el-button>
|
|
|
|
>打印发货单</el-button>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</el-card>
|
|
|
|
</el-card>
|
|
|
@ -535,6 +535,8 @@ const { t } = useI18n() // 国际化
|
|
|
|
const message = useMessage() // 消息弹窗
|
|
|
|
const message = useMessage() // 消息弹窗
|
|
|
|
const router = useRouter()
|
|
|
|
const router = useRouter()
|
|
|
|
const { query } = useRoute()
|
|
|
|
const { query } = useRoute()
|
|
|
|
|
|
|
|
const active = toRef(query, 'active')
|
|
|
|
|
|
|
|
const activeId = toRef(query, 'id')
|
|
|
|
|
|
|
|
|
|
|
|
const dialogVisible = ref(false) // 弹窗的是否展示
|
|
|
|
const dialogVisible = ref(false) // 弹窗的是否展示
|
|
|
|
const dialogTitle = ref('') // 弹窗的标题
|
|
|
|
const dialogTitle = ref('') // 弹窗的标题
|
|
|
@ -599,12 +601,12 @@ const formRef = ref() // 表单 Ref
|
|
|
|
/** 子表的表单 */
|
|
|
|
/** 子表的表单 */
|
|
|
|
const subFormRef = ref()
|
|
|
|
const subFormRef = ref()
|
|
|
|
const otherSubFormRef = ref()
|
|
|
|
const otherSubFormRef = ref()
|
|
|
|
const submitForm = async (active) => {
|
|
|
|
const submitForm = async (operate) => {
|
|
|
|
// 校验表单
|
|
|
|
// 校验表单
|
|
|
|
formData.value.active = active
|
|
|
|
formData.value.active = operate
|
|
|
|
await formRef.value.validate()
|
|
|
|
await formRef.value.validate()
|
|
|
|
// 校验子表单
|
|
|
|
// 校验子表单
|
|
|
|
if(query.active != 'create'){
|
|
|
|
if(active.value != 'create'){
|
|
|
|
await subFormRef.value.validate()
|
|
|
|
await subFormRef.value.validate()
|
|
|
|
await otherSubFormRef.value.validate()
|
|
|
|
await otherSubFormRef.value.validate()
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -629,14 +631,14 @@ const submitForm = async (active) => {
|
|
|
|
attachmentUploadRef.value!.submit()
|
|
|
|
attachmentUploadRef.value!.submit()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (active == 'SAVE') {
|
|
|
|
if (operate == 'SAVE') {
|
|
|
|
if(query.active != 'deliver'){
|
|
|
|
if(active.value != 'deliver'){
|
|
|
|
query.active = 'update'
|
|
|
|
active.value = 'update'
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}else if(active == 'DELIVER'){
|
|
|
|
}else if(operate == 'DELIVER'){
|
|
|
|
query.active = 'detail'
|
|
|
|
active.value = 'detail'
|
|
|
|
}
|
|
|
|
}
|
|
|
|
query.id = orderId
|
|
|
|
activeId.value = orderId
|
|
|
|
reload()
|
|
|
|
reload()
|
|
|
|
} finally {
|
|
|
|
} finally {
|
|
|
|
formLoading.value = false
|
|
|
|
formLoading.value = false
|
|
|
@ -698,6 +700,9 @@ const onAddItem2 = () => {
|
|
|
|
status: undefined,
|
|
|
|
status: undefined,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
row.deliveryOrderId = formData.value.id
|
|
|
|
row.deliveryOrderId = formData.value.id
|
|
|
|
|
|
|
|
if(!formData.value.deliverOrderOtherSubs) {
|
|
|
|
|
|
|
|
formData.value.deliverOrderOtherSubs = []
|
|
|
|
|
|
|
|
}
|
|
|
|
formData.value.deliverOrderOtherSubs.push(row)
|
|
|
|
formData.value.deliverOrderOtherSubs.push(row)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -930,13 +935,13 @@ const initDeliverData = async (projectOrderId) => {
|
|
|
|
|
|
|
|
|
|
|
|
const initData = async () => {
|
|
|
|
const initData = async () => {
|
|
|
|
resetForm()
|
|
|
|
resetForm()
|
|
|
|
if('detail' == query.active){
|
|
|
|
if('detail' == active.value){
|
|
|
|
detailDisabled.value = true
|
|
|
|
detailDisabled.value = true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if('deliver' == query.active && query.projectOrderId){
|
|
|
|
if('deliver' == active.value && query.projectOrderId){
|
|
|
|
await initDeliverData(query.projectOrderId)
|
|
|
|
await initDeliverData(query.projectOrderId)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
await queryData(query.active, query.id)
|
|
|
|
await queryData(active.value, activeId.value)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
const detailDisabled = ref(false)
|
|
|
|
const detailDisabled = ref(false)
|
|
|
|