Skip to content

F
factory_front
Commit 38124728 by qinjianhui
Options

fix: 优化

parent 17709532
Showing with 34 additions and 11 deletions
src/views/typesetting/TypesettingManagement.vue
...@@ -23,7 +23,13 @@ ...@@ -23,7 +23,13 @@
</div> </div>
<div class="right-content flex-1 flex-column overflow-hidden"> <div class="right-content flex-1 flex-column overflow-hidden">
<div class="search-form"> <div class="search-form">
<ElForm :model="searchForm" size="large" inline> <ElForm
:model="searchForm"
size="large"
inline
@submit.prevent
@keyup.enter="search"
>
<!-- <ElFormItem label="创建时间" prop="rangeDate"> <!-- <ElFormItem label="创建时间" prop="rangeDate">
<ElDatePicker <ElDatePicker
v-model="searchForm.rangeDate" v-model="searchForm.rangeDate"
...@@ -95,7 +101,7 @@ ...@@ -95,7 +101,7 @@
</Icon> </Icon>
<Icon <Icon
name="chakanxiangqing" name="chakanxiangqing"
@click.stop="submitReview(cardItem)" @click.stop="submitReview(cardItem, true)"
> >
<template #title> <template #title>
<title>查看详情</title> <title>查看详情</title>
...@@ -180,8 +186,11 @@ ...@@ -180,8 +186,11 @@
<submitReviewModal <submitReviewModal
ref="submitReviewModelRef" ref="submitReviewModelRef"
v-model="submitReviewVisible" v-model="submitReviewVisible"
:detailable="detailable"
:title=" :title="
row?.state === '301' || row?.state === '501' detailable
? '查看详情'
: row?.state === '301' || row?.state === '501'
? '打版完成' ? '打版完成'
: row?.state === '401' : row?.state === '401'
? '修改' ? '修改'
...@@ -315,7 +324,9 @@ const confirm = async (data: TypesettingListData) => { ...@@ -315,7 +324,9 @@ const confirm = async (data: TypesettingListData) => {
} }
const submitReviewVisible = ref(false) const submitReviewVisible = ref(false)
const submitReviewModelRef = ref() const submitReviewModelRef = ref()
const submitReview = async (data: TypesettingListData) => { const detailable = ref(false)
const submitReview = async (data: TypesettingListData, isDetail = false) => {
detailable.value = isDetail
try { try {
submitReviewModelRef.value?.getExamineInfo(data) submitReviewModelRef.value?.getExamineInfo(data)
// if (data.state === '701' || data.state === '901') { // if (data.state === '701' || data.state === '901') {
......
src/views/typesetting/submitReviewModal.vue
...@@ -114,6 +114,7 @@ ...@@ -114,6 +114,7 @@
/> />
<div <div
v-if=" v-if="
!detailable &&
lastVersion === version && lastVersion === version &&
(row?.state === '301' || row?.state === '401') (row?.state === '301' || row?.state === '401')
" "
...@@ -128,7 +129,9 @@ ...@@ -128,7 +129,9 @@
</div> </div>
</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"
> >
...@@ -164,7 +167,9 @@ ...@@ -164,7 +167,9 @@
> >
<UploadImage <UploadImage
v-model="priceForm.craftImage" v-model="priceForm.craftImage"
:disabled="row?.state === '701' || row?.state === '901'" :disabled="
detailable || row?.state === '701' || row?.state === '901'
"
></UploadImage> ></UploadImage>
</ElFormItem> </ElFormItem>
<ElFormItem <ElFormItem
...@@ -175,7 +180,9 @@ ...@@ -175,7 +180,9 @@
<ElInput <ElInput
v-model="priceForm.bulkUnitPrice" v-model="priceForm.bulkUnitPrice"
clearable clearable
:disabled="row?.state === '701' || row?.state === '901'" :disabled="
detailable || row?.state === '701' || row?.state === '901'
"
placeholder="大货单价" placeholder="大货单价"
></ElInput> ></ElInput>
</ElFormItem> </ElFormItem>
...@@ -184,7 +191,9 @@ ...@@ -184,7 +191,9 @@
v-model="priceForm.testUnitPrice" v-model="priceForm.testUnitPrice"
placeholder="测试单价" placeholder="测试单价"
clearable clearable
:disabled="row?.state === '701' || row?.state === '901'" :disabled="
detailable || row?.state === '701' || row?.state === '901'
"
></ElInput> ></ElInput>
</ElFormItem> </ElFormItem>
<!-- <ElFormItem <!-- <ElFormItem
...@@ -202,7 +211,9 @@ ...@@ -202,7 +211,9 @@
<ElInput <ElInput
v-model="priceForm.priceNote" v-model="priceForm.priceNote"
type="textarea" type="textarea"
:disabled="row?.state === '701' || row?.state === '901'" :disabled="
detailable || row?.state === '701' || row?.state === '901'
"
placeholder="备注" placeholder="备注"
></ElInput> ></ElInput>
</ElFormItem> </ElFormItem>
...@@ -304,7 +315,7 @@ ...@@ -304,7 +315,7 @@
</div> </div>
</ElTabPane> </ElTabPane>
</ElTabs> </ElTabs>
<template #footer> <template v-if="!detailable" #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button size="large" @click="visible = false">取消</el-button> <el-button size="large" @click="visible = false">取消</el-button>
<el-button <el-button
...@@ -376,6 +387,7 @@ const props = defineProps({ ...@@ -376,6 +387,7 @@ const props = defineProps({
modelValue: Boolean, modelValue: Boolean,
title: String, title: String,
row: Object, row: Object,
detailable: Boolean,
}) })
const emit = defineEmits(['update:modelValue', 'refresh']) const emit = defineEmits(['update:modelValue', 'refresh'])
const visible = computed({ const visible = computed({
...@@ -388,7 +400,7 @@ const visible = computed({ ...@@ -388,7 +400,7 @@ const visible = computed({
}) })
watch(visible, (val) => { watch(visible, (val) => {
if (val) { if (val) {
if (props.row?.state === '601') { if (props.row?.state === '601' && !props.detailable) {
activeName.value = 'second' activeName.value = 'second'
} else { } else {
activeName.value = 'first' activeName.value = 'first'
......
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