Skip to content

F
factory_front
Commit 17709532 by qinjianhui
Options

fix: 建模管理优化

parent 3b0fd13a
Showing with 60 additions and 19 deletions
src/components/CardWrapper.vue
...@@ -23,7 +23,11 @@ ...@@ -23,7 +23,11 @@
<img :src="c.imagePath" /> <img :src="c.imagePath" />
</div> </div>
</div> </div>
<div class="commodity-card-name-price flex flex-justify-space-between"> <slot name="time"></slot>
<div
v-if="cardItem.productName"
class="commodity-card-name-price flex flex-justify-space-between"
>
<slot name="productName"></slot> <slot name="productName"></slot>
<slot name="price"></slot> <slot name="price"></slot>
</div> </div>
......
src/types/api/typesetting.ts
...@@ -28,6 +28,9 @@ export interface TypesettingListData { ...@@ -28,6 +28,9 @@ export interface TypesettingListData {
confirm?: boolean confirm?: boolean
personInChargeId?: number personInChargeId?: number
personInChargeName?: string personInChargeName?: string
createTime?: string
updateTime?: string
assignmentTime?: string
} }
export interface SearchForm { export interface SearchForm {
......
src/views/typesetting/TypesettingManagement.vue
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
cardItem.productName cardItem.productName
}}</span> }}</span>
</template> </template>
<template #price> <template v-if="cardItem.retailPrice" #price>
<span class="price"> <span class="price">
{{ cardItem.retailPrice ? '$' : '' {{ cardItem.retailPrice ? '$' : ''
}}{{ cardItem.retailPrice }} }}{{ cardItem.retailPrice }}
...@@ -94,6 +94,14 @@ ...@@ -94,6 +94,14 @@
</template> </template>
</Icon> </Icon>
<Icon <Icon
name="chakanxiangqing"
@click.stop="submitReview(cardItem)"
>
<template #title>
<title>查看详情</title>
</template>
</Icon>
<Icon
v-if="treeId === '201'" v-if="treeId === '201'"
name="querenshenhexunjia" name="querenshenhexunjia"
@click.stop="confirm(cardItem)" @click.stop="confirm(cardItem)"
...@@ -110,7 +118,15 @@ ...@@ -110,7 +118,15 @@
@click.stop="submitReview(cardItem)" @click.stop="submitReview(cardItem)"
> >
<template #title> <template #title>
<title>提交审核</title> <title>
{{
cardItem?.state === '301' || cardItem?.state === '501'
? '打版完成'
: cardItem?.state === '401'
? '修改'
: ''
}}
</title>
</template> </template>
</Icon> </Icon>
<Icon <Icon
...@@ -119,18 +135,21 @@ ...@@ -119,18 +135,21 @@
@click.stop="submitReview(cardItem)" @click.stop="submitReview(cardItem)"
> >
<template #title> <template #title>
<title>报价</title> <title>上传稿件</title>
</template> </template>
</Icon> </Icon>
<Icon
v-if="treeId === '701' || treeId === '901'"
name="chakanxiangqing"
@click.stop="submitReview(cardItem)"
>
<template #title>
<title>查看</title>
</template> </template>
</Icon> <template #time>
<div class="product-time">
<div class="create-time">
<span class="label">创建时间:</span>
<span class="value">{{ cardItem.createTime }}</span>
</div>
<div class="assign-time">
<span class="label">分派时间:</span>
<span class="value">{{ cardItem.assignmentTime }}</span>
</div>
</div>
</template> </template>
</CardWrapper> </CardWrapper>
</div> </div>
...@@ -161,7 +180,13 @@ ...@@ -161,7 +180,13 @@
<submitReviewModal <submitReviewModal
ref="submitReviewModelRef" ref="submitReviewModelRef"
v-model="submitReviewVisible" v-model="submitReviewVisible"
title="提交审核" :title="
row?.state === '301' || row?.state === '501'
? '打版完成'
: row?.state === '401'
? '修改'
: '上传稿件'
"
:row="row" :row="row"
@refresh="onRefreshPage" @refresh="onRefreshPage"
></submitReviewModal> ></submitReviewModal>
...@@ -293,9 +318,9 @@ const submitReviewModelRef = ref() ...@@ -293,9 +318,9 @@ const submitReviewModelRef = ref()
const submitReview = async (data: TypesettingListData) => { const submitReview = async (data: TypesettingListData) => {
try { try {
submitReviewModelRef.value?.getExamineInfo(data) submitReviewModelRef.value?.getExamineInfo(data)
if (data.state === '701' || data.state === '901') { // if (data.state === '701' || data.state === '901') {
submitReviewModelRef.value?.getPriceDetail(data) submitReviewModelRef.value?.getPriceDetail(data)
} // }
const res = await getTypesettingDetail(data.id) const res = await getTypesettingDetail(data.id)
row.value = res.data row.value = res.data
nextTick(() => { nextTick(() => {
...@@ -424,4 +449,13 @@ const reject = async () => { ...@@ -424,4 +449,13 @@ const reject = async () => {
.svg-icon { .svg-icon {
margin-left: 5px; margin-left: 5px;
} }
.product-time {
margin-bottom: 10px;
.create-time,
.assign-time {
height: 26px;
line-height: 26px;
}
}
</style> </style>
src/views/typesetting/submitReviewModal.vue
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
</ElTabPane> </ElTabPane>
<ElTabPane <ElTabPane
v-if="row?.state === '601' || row?.state === '701' || row?.state === '901'" v-if="row?.state === '601' || row?.state === '701' || row?.state === '901'"
label="报价信息" label="上传稿件"
name="second" name="second"
> >
<div v-loading="loading" class="review-info"> <div v-loading="loading" class="review-info">
...@@ -154,13 +154,13 @@ ...@@ -154,13 +154,13 @@
</div> </div>
<div class="price-form"> <div class="price-form">
<div class="modals-image-title"> <div class="modals-image-title">
<span>报价信息</span> <span>上传稿件</span>
</div> </div>
<ElForm ref="priceFormRef" :model="priceForm" label-width="100px"> <ElForm ref="priceFormRef" :model="priceForm" label-width="100px">
<ElFormItem <ElFormItem
label="工艺单" label="稿件"
prop="craftImage" prop="craftImage"
:rules="[{ required: true, message: '请上传工艺单' }]" :rules="[{ required: true, message: '请上传稿件' }]"
> >
<UploadImage <UploadImage
v-model="priceForm.craftImage" v-model="priceForm.craftImage"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment