diff --git a/src/components/flowDetail/index.vue b/src/components/flowDetail/index.vue index 18a6517..5fe65f3 100644 --- a/src/components/flowDetail/index.vue +++ b/src/components/flowDetail/index.vue @@ -1,10 +1,6 @@ <template> <div class="edit-popup"> <el-card> - {{ userInfo }} - {{ formData?.check_status }} - {{ formData.create_user }} - {{ formData?.check_status == 0 && formData.create_user == userInfo.id }} <el-descriptions :column="3" title="审21批详情" border> <el-descriptions-item label="审批主题" label-align="left" align="left" label-class-name="my-label"> {{ formData.title }} @@ -30,8 +26,6 @@ <el-steps :active="activeStep" simple :align-center="true"> <el-step :title="getStep(item, index)" :icon="index == 0 ? Avatar : Clock" v-for="(item, index) in formData.step" :key="index" /> - <el-step :title="getStep(item, index)" :icon="index == 0 ? Avatar : Clock" - v-for="(item, index) in formData.step" :key="index" /> </el-steps> </el-descriptions-item> <el-descriptions-item label="审批记录" label-align="left" align="left"> @@ -39,8 +33,6 @@ style="margin-top: 20px"> <el-step :title="item.check_time + item.title" v-for="(item, index) in formData.record" :key="index" /> - <el-step :title="item.check_time + item.title" v-for="(item, index) in formData.record" - :key="index" /> </el-steps> </el-descriptions-item> <div v-if="formData?.current_check_user_ids?.includes(String(userInfo.id))"> @@ -50,7 +42,7 @@ </el-form-item> <el-form-item label="审批"> <el-button type="primary" @click="checkFn(1)"> - 通过1212 + 通过 </el-button> <el-button @click="checkFn(2)"> 拒绝 @@ -58,20 +50,12 @@ </el-form-item> </el-descriptions-item> </div> - - <!-- <div v-if="formData?.check_status == 0 && formData.create_user == userInfo.id"> - <el-descriptions-item label="操作1" label-align="left" align="left"> - <el-form-item label="意见"> - <el-input v-model="remark" clearable placeholder="请输入" type="textarea" /> - </el-form-item> - <el-form-item label="审批"> - <el-button @click="revokeFn"> - 撤销121212 - </el-button> - </el-form-item> - </el-descriptions-item> - </div> --> - + <el-descriptions-item label="操作" label-align="left" align="left" + v-if="formData?.check_status == 0 && formData.create_user == userInfo.id"> + <el-button @click="revokeFn"> + 撤销 + </el-button> + </el-descriptions-item> </el-descriptions> </el-card> </div> @@ -89,7 +73,6 @@ const userInfo = computed(() => userStore.userInfo) const props = defineProps({ approve_id: Number }) - let activeStep = ref(0) const remark = ref('') @@ -98,7 +81,7 @@ const popupRef = shallowRef<InstanceType<typeof Popup>>() // 表单数据 const formData = reactive({ - "id": 11, + "id": '', "title": "", "create_user": 1, "check_status": 0, diff --git a/src/components/flowProcess/index.vue b/src/components/flowProcess/index.vue index d3cf6e4..007f118 100644 --- a/src/components/flowProcess/index.vue +++ b/src/components/flowProcess/index.vue @@ -44,6 +44,11 @@ </el-form-item> </el-col> </el-row> + <el-row> + <el-button @click="submit" type="primary"> + 提交 + </el-button> + </el-row> </div> </el-card> @@ -53,18 +58,17 @@ import { ref, reactive, defineProps } from 'vue' import { apiFlowTypeLists, } from '@/api/flow_type' import { apiFlowLists, apiFlowDetail, apiFlowDelete } from '@/api/flow' import { useRoute } from "vue-router" -const route = useRoute() +const route = useRoute() const emits = defineEmits(["confirm"]); const formData = reactive({ flow_type: "", flow_path: "", - path: route.fullPath + path: route.path }) const flowTyprList = ref([]) - const getFlowtypeList = async () => { let res = await apiFlowTypeLists() flowTyprList.value = res.lists @@ -86,27 +90,25 @@ const getFlowTypeList = async () => { // 获取流程详情 const flowDetail = ref({}) - const getDetail = async () => { let res = await apiFlowDetail({ id: formData.flow_path }) flowDetail.value = res + // emits("confirm", formData); } -const getDescr = (item) => { - if (item.flow_step == 1) return "当前部门负责人" - else { - return (item.flow_user.map(val => ([val.name]))).join(',') - } +// 流程说明 +const getDescr = (item) => { return item.flow_step == 1 ? "当前部门负责人" : (item.flow_user.map(val => ([val.name]))).join(',') } + +// 提交审批 +const submit = () => { + } +getFlowtypeList() + const numberToChinese = (num) => { let chineseNum = ["零", "一", "二", "三", "四", "五", "六", "七", "八", "九", "十"]; return chineseNum[num]; } -// 选中数据子父传递 -getFlowtypeList() - -console.log(route.fullPath, "route") - </script> \ No newline at end of file diff --git a/src/views/bid_document_examination/detail.vue b/src/views/bid_document_examination/detail.vue index 2b21f85..f0ab9c5 100644 --- a/src/views/bid_document_examination/detail.vue +++ b/src/views/bid_document_examination/detail.vue @@ -112,8 +112,8 @@ <el-table-column label="报价金额" prop="sale_amount" show-overflow-tooltip /> </el-table> </el-row> - <flowDetail :approve_id="formData?.approve_id" /> - <flowProcess></flowProcess> + <!-- <flowProcess></flowProcess> --> + <!-- <flowDetail :approve_id="formData?.approve_id" /> --> </popup> </div>