diff --git a/src/api/bidding/biddingLimit/index.ts b/src/api/bidding/biddingLimit/index.ts
index 344d819..c70d466 100644
--- a/src/api/bidding/biddingLimit/index.ts
+++ b/src/api/bidding/biddingLimit/index.ts
@@ -61,3 +61,10 @@ export const obtainAllVersionNumbers = (query) => {
params: query
});
};
+//获取sheet
+export const getVersionDetail = (id) => {
+ return request({
+ url: '/bidding/biddingLimitList/getVersionDetail/' + id,
+ method: 'get'
+ });
+};
diff --git a/src/views/biddingManagemen/biddingLimit/index.vue b/src/views/biddingManagemen/biddingLimit/index.vue
index 1a35dc7..d08d055 100644
--- a/src/views/biddingManagemen/biddingLimit/index.vue
+++ b/src/views/biddingManagemen/biddingLimit/index.vue
@@ -5,7 +5,7 @@
-
+
@@ -33,7 +33,24 @@
导出excel
- 审核
+ 审核
+
+
+ 查看流程
@@ -94,7 +111,8 @@ const options = ref([]);
const sheets = ref([]);
const tableData = ref([]);
const isExpandAll = ref(true);
-
+const versionObj = ref({});
+const versionMap = new Map();
//获取版本号
const getVersionNums = async () => {
try {
@@ -104,16 +122,18 @@ const getVersionNums = async () => {
pageNum: 1
};
const res = await obtainAllVersionNumbers(params);
- console.log(11111111);
- console.log(res);
-
if (res.code == 200) {
options.value = res.data;
if (res.data.length > 0) {
- queryForm.value.versions = res.data[0];
+ res.data.forEach((item: any) => {
+ versionMap.set(item.versions, item);
+ });
+ queryForm.value.versions = res.data[0].versions;
+ versionObj.value = res.data[0];
getSheetName();
} else {
queryForm.value.versions = '';
+ versionObj.value = {};
}
}
} catch (error) {
@@ -121,7 +141,7 @@ const getVersionNums = async () => {
}
};
//选择版本号
-const changeVersions = () => {
+const changeVersions = (val) => {
getSheetName();
};
@@ -224,7 +244,7 @@ const listeningProject = watch(
() => currentProject.value?.id,
(nid, oid) => {
getVersionNums();
- getSheetName();
+ // getSheetName();
}
);
const handleExport = () => {
@@ -238,23 +258,39 @@ const handleExport = () => {
);
};
// 审核
-const handleAudit = (row: any) => {
+const handleAudit = () => {
proxy.$tab.closePage(proxy.$route);
+ let id = versionMap.get(queryForm.value.versions).id;
proxy.$router.push({
path: `/approval/biddingLimit/indexEdit`,
query: {
- // id: row.id,
- type: 'add'
+ id,
+ type: 'add',
+ sheets: sheets.value,
+ versions: versionObj.value
+ }
+ });
+};
+// 查看审核
+const handleViewInfo = () => {
+ proxy.$tab.closePage(proxy.$route);
+ let id = versionMap.get(queryForm.value.versions).id;
+ proxy.$router.push({
+ path: `/approval/biddingLimit/indexEdit`,
+ query: {
+ id,
+ type: 'view',
+ sheets: sheets.value,
+ versions: versionObj.value
}
});
};
-
onUnmounted(() => {
listeningProject();
});
onMounted(() => {
getVersionNums();
- getSheetName();
+ // getSheetName();
});
diff --git a/src/views/biddingManagemen/biddingLimit/indexEdit.vue b/src/views/biddingManagemen/biddingLimit/indexEdit.vue
index 0f16882..450d058 100644
--- a/src/views/biddingManagemen/biddingLimit/indexEdit.vue
+++ b/src/views/biddingManagemen/biddingLimit/indexEdit.vue
@@ -19,17 +19,10 @@
成本核算清单
-
-
-
-
+
+
+
+ {{ item }}
@@ -77,8 +70,7 @@ import ApprovalButton from '@/components/Process/approvalButton.vue';
import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
import { useUserStoreHook } from '@/store/modules/user';
-import { getDrawing } from '@/api/design/drawing';
-import { updateDesignChange, getDesignChange } from '@/api/design/designChange';
+import { getVersionDetail } from '@/api/bidding/biddingLimit';
// 获取用户 store
const userStore = useUserStoreHook();
@@ -107,7 +99,8 @@ const submitVerifyRef = ref>();
const approvalRecordRef = ref>();
//按钮组件
const approvalButtonRef = ref>();
-
+const sheets = ref([]);
+const versions = ref({});
const leaveFormRef = ref();
const dialog = reactive({
visible: false,
@@ -135,18 +128,6 @@ const initFormData = {
};
const data = reactive({
form: { ...initFormData },
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- projectId: currentProject.value?.id,
- fileName: undefined,
- fileType: undefined,
- fileSuffix: undefined,
- fileStatus: undefined,
- originalName: undefined,
- newest: undefined,
- params: {}
- },
rules: {}
});
@@ -168,7 +149,7 @@ const getInfo = () => {
loading.value = true;
buttonLoading.value = false;
nextTick(async () => {
- const res = await getDesignChange(routeParams.value.id);
+ const res = await getVersionDetail(routeParams.value.id);
Object.assign(form.value, res.data);
loading.value = false;
buttonLoading.value = false;
@@ -178,19 +159,8 @@ const getInfo = () => {
/** 提交按钮 */
const submitForm = (status1: string) => {
status.value = status1;
- leaveFormRef.value?.validate(async (valid: boolean) => {
- if (valid) {
- buttonLoading.value = true;
- var res;
- // if (form.value.id) {
- res = await updateDesignChange({ ...form.value, id: routeParams.value.id }).finally(() => (buttonLoading.value = false));
- // }
- if (res.code == 200) {
- dialog.visible = false;
- submit(status.value, res.data);
- }
- }
- });
+ buttonLoading.value = true;
+ submit(status.value, form.value);
};
const submitFlow = async () => {
@@ -228,8 +198,7 @@ const submitCallback = async () => {
};
//审批
const approvalVerifyOpen = async () => {
- submitVerifyRef.value.openDialog(routeParams.value.taskId, true, routeParams.value.businessId);
- // submitVerifyRef.value.openDialog(routeParams.value.taskId);
+ submitVerifyRef.value.openDialog(routeParams.value.taskId);
};
// 图纸上传成功之后 开始提交
const submit = async (status, data) => {
@@ -256,8 +225,11 @@ const submit = async (status, data) => {
onMounted(() => {
nextTick(async () => {
- routeParams.value = proxy.$route.query;
reset();
+ routeParams.value = proxy.$route.query;
+ sheets.value = routeParams.value.sheets;
+ versions.value = routeParams.value.versions;
+ Object.assign(form.value, versions.value);
loading.value = false;
if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
getInfo();