diff --git a/.env.development b/.env.development
index 8849f99..6e07116 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VITE_APP_TITLE = 煤科建管平台
VITE_APP_ENV = 'development'
# 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.213:8899'
+VITE_APP_BASE_API = 'http://192.168.110.149:8899'
# 无人机接口地址
diff --git a/src/api/bidding/biddingLimit/index.ts b/src/api/bidding/biddingLimit/index.ts
index 4415568..c70d466 100644
--- a/src/api/bidding/biddingLimit/index.ts
+++ b/src/api/bidding/biddingLimit/index.ts
@@ -53,3 +53,18 @@ export const sheetList = (query) => {
params: query
});
};
+//获取sheet
+export const obtainAllVersionNumbers = (query) => {
+ return request({
+ url: '/bidding/biddingLimitList/obtainAllVersionNumbers',
+ method: 'get',
+ params: query
+ });
+};
+//获取sheet
+export const getVersionDetail = (id) => {
+ return request({
+ url: '/bidding/biddingLimitList/getVersionDetail/' + id,
+ method: 'get'
+ });
+};
diff --git a/src/components/FileList/index.vue b/src/components/FileList/index.vue
index d08b9f3..3b39562 100644
--- a/src/components/FileList/index.vue
+++ b/src/components/FileList/index.vue
@@ -1,56 +1,52 @@
-
-
-
-
-
- 查看文件
- 下载文件
-
-
-
-
-
+
+
+
+
+
+ 查看文件
+ 下载文件
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
+const adjustIframe = () => {
+ const iframe = document.querySelector('iframe');
+ if (iframe) {
+ iframe.style.height = `${iframe.contentWindow.document.body.scrollHeight}px`;
+ }
+};
+
diff --git a/src/views/biddingManagemen/biddingLimit/index.vue b/src/views/biddingManagemen/biddingLimit/index.vue
index bb6f934..d08d055 100644
--- a/src/views/biddingManagemen/biddingLimit/index.vue
+++ b/src/views/biddingManagemen/biddingLimit/index.vue
@@ -3,6 +3,11 @@
+
+
+
+
+
@@ -28,7 +33,24 @@
导出excel
- 审核
+ 审核
+
+
+ 查看流程
@@ -75,8 +97,7 @@
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();