diff --git a/src/components/generateForm/index.vue b/src/components/generateForm/index.vue index c351711..f697b06 100644 --- a/src/components/generateForm/index.vue +++ b/src/components/generateForm/index.vue @@ -6,7 +6,10 @@ - + + @@ -52,6 +55,9 @@ const props = defineProps({ formData: { type: Object, required: true + }, + type: { + type: Number, } }) diff --git a/src/views/oa_Initiate/detail.vue b/src/views/oa_Initiate/detail.vue index 711894c..a57f443 100644 --- a/src/views/oa_Initiate/detail.vue +++ b/src/views/oa_Initiate/detail.vue @@ -43,7 +43,7 @@

+ v-if="formData.flow_info.check_type == 2 && formData.check_status != 3 && formData.check_status != 2 && formData.admin_id != userStore.id && formData.steps[findActive()].check_list.map(item => item.check_user_id).includes(userStore.id)">
审批结束 diff --git a/src/views/oa_Initiate/edit.vue b/src/views/oa_Initiate/edit.vue index 6f9de43..4429bd0 100644 --- a/src/views/oa_Initiate/edit.vue +++ b/src/views/oa_Initiate/edit.vue @@ -5,7 +5,7 @@ - + @@ -17,6 +17,14 @@ import generateForm from './../../components/generateForm/index.vue' import Popup from "@/components/popup/index.vue"; import { apiOaoaApproveAdd } from "@/api/oa_Initiate" +defineProps({ + type: { + type: Number, + } +}) + + + const emit = defineEmits(["success", "close"]); const formRef = shallowRef(); const popupRef = shallowRef>(); diff --git a/src/views/oa_Initiate/index.vue b/src/views/oa_Initiate/index.vue index 6825a5a..7ad2f62 100644 --- a/src/views/oa_Initiate/index.vue +++ b/src/views/oa_Initiate/index.vue @@ -7,7 +7,8 @@
{{ item.name }}
-
{{ e.title }} +
{{ + e.title }}
@@ -53,7 +54,7 @@
+ :type="type" @close="showEdit = false" /> @@ -76,7 +77,7 @@ const showEdit = ref(false) const detailRef = ref(null) // 是否显示编辑框 const showDetail = ref(false) - +const type = ref(1) // 查询条件 const queryParams = reactive({ @@ -85,7 +86,8 @@ const queryParams = reactive({ // 编辑 -const handleEdit = async (id: any) => { +const handleEdit = async (id: any, cate) => { + type.value = cate let res = await apiOaFlowTypeDetail({ id }) showEdit.value = true await nextTick() diff --git a/src/views/oa_arrival/detail.vue b/src/views/oa_arrival/detail.vue index 6e38008..80c7537 100644 --- a/src/views/oa_arrival/detail.vue +++ b/src/views/oa_arrival/detail.vue @@ -37,17 +37,9 @@ {{ formData.invoice_address }} - - {{}} + {{ formData.open_admin_name }} - - {{}} - - - {{}} - - {{ formData.remark }} @@ -56,17 +48,31 @@ + + + + + {{ formData.code }} + + + {{ formData.open_time }} + + + {{ formData.delivery }} + + + - + {{ formData.is_cash_text }} - + {{ (+formData.amount) - (+formData.enter_amount) }} - + {{ formData.enter_amount }} diff --git a/src/views/oa_arrival/edit.vue b/src/views/oa_arrival/edit.vue index 4d31fc1..957832d 100644 --- a/src/views/oa_arrival/edit.vue +++ b/src/views/oa_arrival/edit.vue @@ -37,17 +37,9 @@ {{ formData.invoice_address }} - - {{}} + {{ formData.open_admin_name }} - - {{}} - - - {{}} - - {{ formData.remark }} @@ -60,16 +52,19 @@ - + {{ formData.is_cash_text }} - + {{ (+formData.amount) - (+formData.enter_amount) }} - + {{ formData.enter_amount }} +