fix: BUG修改

This commit is contained in:
kun 2024-05-20 19:51:23 +08:00
parent e87430651b
commit c6aeb5415a
22 changed files with 65 additions and 45 deletions

View File

@ -212,7 +212,8 @@ const emits = defineEmits(["update:detailsDialog", "confirm"]);
const showIsAuthority = ref(false); const showIsAuthority = ref(false);
const isOpen = ref(false); const isOpen = ref(false);
const governNameList = ref([]); const governNameList = ref([]);
const baseUrl = import.meta.env.VITE_API_URL; const baseUrl = window.location.protocol + "//" + window.location.host;
// const baseUrl = import.meta.env.VITE_API_URL;
const copyBool = ref(false); const copyBool = ref(false);
const filelist = ref([]); const filelist = ref([]);
const ruleForm = ref({ const ruleForm = ref({
@ -429,12 +430,12 @@ const rules = ref<FormRules>({
}); });
const confirmSubmit = (ruleFormRef: FormInstance | undefined) => { const confirmSubmit = (ruleFormRef: FormInstance | undefined) => {
if (!ruleFormRef) return; if (!ruleFormRef) return;
if (!copyBool.value) {
ElMessage.error("请先复制账号密码以及手机号和登录地址");
return;
}
ruleFormRef.validate(async (valid, fields) => { ruleFormRef.validate(async (valid, fields) => {
if (valid) { if (valid) {
if (!copyBool.value) {
ElMessage.error("请先复制账号密码以及手机号和登录地址");
return;
}
ruleForm.value.enterpriseMains = [ ruleForm.value.enterpriseMains = [
{ {
leadName: ruleForm.value.legalPerson, leadName: ruleForm.value.legalPerson,

View File

@ -191,7 +191,8 @@ const emits = defineEmits(["update:detailsDialog", "confirm"]);
const showIsAuthority = ref(false); const showIsAuthority = ref(false);
const isOpen = ref(false); const isOpen = ref(false);
const governNameList = ref([]); const governNameList = ref([]);
const baseUrl = import.meta.env.VITE_API_URL; const baseUrl = window.location.protocol + "//" + window.location.host;
// const baseUrl = import.meta.env.VITE_API_URL;
const filelist = ref([]); const filelist = ref([]);
const ruleForm = ref({ const ruleForm = ref({
enterpriseName: "", enterpriseName: "",

View File

@ -163,7 +163,8 @@ const active = ref(1);
const store = GlobalStore(); const store = GlobalStore();
const headers = ref({ Authorization: "Bearer " + store.token }); const headers = ref({ Authorization: "Bearer " + store.token });
const ruleFormRef = ref<FormInstance>(); const ruleFormRef = ref<FormInstance>();
const baseUrl = import.meta.env.VITE_API_URL; const baseUrl = window.location.protocol + "//" + window.location.host;
// const baseUrl = import.meta.env.VITE_API_URL;
interface formData { interface formData {
title: string; title: string;
uploadTime: string; uploadTime: string;

View File

@ -178,7 +178,8 @@ const emit = defineEmits<{
const globalStore = GlobalStore(); const globalStore = GlobalStore();
const ruleFormRef = ref<FormInstance>(); const ruleFormRef = ref<FormInstance>();
const governNameList = ref([]); const governNameList = ref([]);
const baseUrl = import.meta.env.VITE_API_URL; const baseUrl = window.location.protocol + "//" + window.location.host;
// const baseUrl = import.meta.env.VITE_API_URL;
const isOpen = ref(false); const isOpen = ref(false);
const showIsAuthority = ref(false); const showIsAuthority = ref(false);
const filelist = ref([]); const filelist = ref([]);

View File

@ -148,7 +148,8 @@ const rules = reactive<FormRules>({
] ]
}); });
const baseUrl = import.meta.env.VITE_API_URL; const baseUrl = window.location.protocol + "//" + window.location.host;
// const baseUrl = import.meta.env.VITE_API_URL;
const options = ref<Options[]>([]); const options = ref<Options[]>([]);

View File

@ -362,7 +362,8 @@ const pages = ref({
}); });
const records = ref([]); const records = ref([]);
const active = ref(1); const active = ref(1);
const baseUrl = import.meta.env.VITE_API_URL; const baseUrl = window.location.protocol + "//" + window.location.host;
// const baseUrl = import.meta.env.VITE_API_URL;
const globalStore = GlobalStore(); const globalStore = GlobalStore();
const fileList = ref([]); const fileList = ref([]);
const fileList1 = ref([]); const fileList1 = ref([]);

View File

@ -110,7 +110,8 @@ const records = ref([]);
const active = ref(1); const active = ref(1);
const store = GlobalStore(); const store = GlobalStore();
const headers = ref({ Authorization: "Bearer " + store.token }); const headers = ref({ Authorization: "Bearer " + store.token });
const baseUrl = import.meta.env.VITE_API_URL; const baseUrl = window.location.protocol + "//" + window.location.host;
// const baseUrl = import.meta.env.VITE_API_URL;
// //
const columns: ColumnProps[] = [ const columns: ColumnProps[] = [
{ prop: "projectCode", label: "子目号", width: 150 }, { prop: "projectCode", label: "子目号", width: 150 },

View File

@ -114,11 +114,11 @@ const addVisible = ref(false);
// //
const formConfig = { const formConfig = {
formItemConfig: [ formItemConfig: [
{ // {
label: "累计拨款金额(元)", // label: "()",
prop: "totalAmount", // prop: "totalAmount",
type: "input" // type: "input"
}, // },
{ {
label: "付款金额(元)", label: "付款金额(元)",
prop: "payAmount", prop: "payAmount",
@ -131,16 +131,16 @@ const formConfig = {
format: "YYYY-MM-DD", format: "YYYY-MM-DD",
valueFormat: "YYYY-MM-DD" valueFormat: "YYYY-MM-DD"
}, },
{ // {
label: "未支付工程款(元)", // label: "()",
prop: "unPayAmount", // prop: "unPayAmount",
type: "input" // type: "input"
}, // },
{ // {
label: "支付百分比(%)", // label: "(%)",
prop: "payRatio", // prop: "payRatio",
type: "input" // type: "input"
}, // },
{ {
label: "申报时段", label: "申报时段",
prop: "applyIdList", prop: "applyIdList",
@ -253,13 +253,13 @@ const getApplyTimeData = async () => {
const res = await govermentApplyTimeList(requestData); const res = await govermentApplyTimeList(requestData);
console.log(res, "------------未支付申报时段"); console.log(res, "------------未支付申报时段");
if (res && res.result.length > 0) { if (res && res.result.length > 0) {
formConfig.formItemConfig[5].data = res.result.map(i => { formConfig.formItemConfig[2].data = res.result.map(i => {
return { return {
label: i.name, label: i.name,
value: i.id value: i.id
}; };
}); });
console.log(formConfig.formItemConfig[5].data); console.log(formConfig.formItemConfig[2].data);
} }
}; };
// //
@ -352,7 +352,7 @@ watch(
(n, o) => { (n, o) => {
visible1.value = n; visible1.value = n;
if (n) { if (n) {
formConfig.formItemConfig[5].data = []; formConfig.formItemConfig[2].data = [];
getSubItemList(); getSubItemList();
} else { } else {
emits("confirm"); emits("confirm");

View File

@ -189,7 +189,7 @@
</div> </div>
</el-form> </el-form>
<div class="table"> <!-- <div class="table">
<h4>单体项目</h4> <h4>单体项目</h4>
<el-table <el-table
:data="form.engineeringSingles" :data="form.engineeringSingles"
@ -240,7 +240,7 @@
<el-button type="danger" link @click="removeEngineeringSingle(row)">删除</el-button> <el-button type="danger" link @click="removeEngineeringSingle(row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
<!-- 表格无数据情况 --> 表格无数据情况
<template #empty> <template #empty>
<div class="table-empty"> <div class="table-empty">
<slot name="empty"> <slot name="empty">
@ -250,7 +250,7 @@
</div> </div>
</template> </template>
</el-table> </el-table>
</div> </div> -->
<footer class="footer"> <footer class="footer">
<el-button type="primary" @click="next(ruleFormRef)">下一步</el-button> <el-button type="primary" @click="next(ruleFormRef)">下一步</el-button>
</footer> </footer>

View File

@ -121,7 +121,8 @@ const columns: ColumnProps[] = [
{ prop: "operation", label: "操作" } { prop: "operation", label: "操作" }
]; ];
const store = GlobalStore(); const store = GlobalStore();
const baseUrl = import.meta.env.VITE_API_URL; const baseUrl = window.location.protocol + "//" + window.location.host;
// const baseUrl = import.meta.env.VITE_API_URL;
const headers = ref({ Authorization: "Bearer " + store.token }); const headers = ref({ Authorization: "Bearer " + store.token });
const current = ref<any>([]); const current = ref<any>([]);
const addDialogVisible = ref(false); const addDialogVisible = ref(false);

View File

@ -468,7 +468,8 @@ const dangerForm = ref({
image: [] image: []
}); });
const storeVisible = ref(false); const storeVisible = ref(false);
const baseUrl = import.meta.env.VITE_API_URL; const baseUrl = window.location.protocol + "//" + window.location.host;
// const baseUrl = import.meta.env.VITE_API_URL;
const props = defineProps({ const props = defineProps({
orderDialog: Boolean orderDialog: Boolean
}); });

View File

@ -352,7 +352,8 @@ const reformInfo = ref({
recommend: "", recommend: "",
solveImage: [] solveImage: []
}); });
const baseUrl = import.meta.env.VITE_API_URL; const baseUrl = window.location.protocol + "//" + window.location.host;
// const baseUrl = import.meta.env.VITE_API_URL;
// //
const submitPrint = async () => { const submitPrint = async () => {
printJS({ printJS({

View File

@ -454,7 +454,8 @@ const dangerForm = ref({
image: [] image: []
}); });
const storeVisible = ref(false); const storeVisible = ref(false);
const baseUrl = import.meta.env.VITE_API_URL; const baseUrl = window.location.protocol + "//" + window.location.host;
// const baseUrl = import.meta.env.VITE_API_URL;
const props = defineProps({ const props = defineProps({
orderDialog: Boolean orderDialog: Boolean
}); });

View File

@ -317,7 +317,8 @@ import type { FormInstance, UploadProps } from "element-plus";
import { relativeInfo, timeLineData, singleOptionAudit, allOptionAudit } from "@/api/modules/goverment"; import { relativeInfo, timeLineData, singleOptionAudit, allOptionAudit } from "@/api/modules/goverment";
import { submitReform } from "@/api/modules/project"; import { submitReform } from "@/api/modules/project";
import printJS from "print-js"; import printJS from "print-js";
const baseUrl = import.meta.env.VITE_API_URL; const baseUrl = window.location.protocol + "//" + window.location.host;
// const baseUrl = import.meta.env.VITE_API_URL;
const props = defineProps({ const props = defineProps({
detailsDialog: Boolean, detailsDialog: Boolean,
relativeId: String relativeId: String

View File

@ -292,7 +292,8 @@ const searchForm = ref({
timeRange: [] timeRange: []
}); });
const globalStore = GlobalStore(); const globalStore = GlobalStore();
const baseUrl = import.meta.env.VITE_API_URL; const baseUrl = window.location.protocol + "//" + window.location.host;
// const baseUrl = import.meta.env.VITE_API_URL;
const fileList1 = ref([]); const fileList1 = ref([]);
const fileList = ref([]); const fileList = ref([]);
const headers = ref({ Authorization: "Bearer " + globalStore.token }); const headers = ref({ Authorization: "Bearer " + globalStore.token });

View File

@ -261,7 +261,8 @@ import { onMounted, ref, watch, reactive } from "vue";
import { ElMessage, ElMessageBox } from "element-plus"; import { ElMessage, ElMessageBox } from "element-plus";
import type { FormInstance, UploadProps } from "element-plus"; import type { FormInstance, UploadProps } from "element-plus";
import { relativeInfo, timeLineData, submitReform, submitAll } from "@/api/modules/project"; import { relativeInfo, timeLineData, submitReform, submitAll } from "@/api/modules/project";
const baseUrl = import.meta.env.VITE_API_URL; const baseUrl = window.location.protocol + "//" + window.location.host;
// const baseUrl = import.meta.env.VITE_API_URL;
const props = defineProps({ const props = defineProps({
detailsDialog: Boolean, detailsDialog: Boolean,
relativeId: String relativeId: String

View File

@ -259,7 +259,8 @@ import { onMounted, ref, watch, reactive } from "vue";
import { ElMessage, ElMessageBox } from "element-plus"; import { ElMessage, ElMessageBox } from "element-plus";
import type { FormInstance, UploadProps } from "element-plus"; import type { FormInstance, UploadProps } from "element-plus";
import { relativeInfo, timeLineData, submitReform, submitAll } from "@/api/modules/project"; import { relativeInfo, timeLineData, submitReform, submitAll } from "@/api/modules/project";
const baseUrl = import.meta.env.VITE_API_URL; const baseUrl = window.location.protocol + "//" + window.location.host;
// const baseUrl = import.meta.env.VITE_API_URL;
const props = defineProps({ const props = defineProps({
detailsDialog: Boolean, detailsDialog: Boolean,
relativeId: String relativeId: String

View File

@ -156,7 +156,8 @@ const fileList = ref([]);
const store = GlobalStore(); const store = GlobalStore();
const headers = ref({ Authorization: "Bearer " + store.token }); const headers = ref({ Authorization: "Bearer " + store.token });
const ruleFormRef = ref<FormInstance>(); const ruleFormRef = ref<FormInstance>();
const baseUrl = import.meta.env.VITE_API_URL; const baseUrl = window.location.protocol + "//" + window.location.host;
// const baseUrl = import.meta.env.VITE_API_URL;
interface formData { interface formData {
title: string; title: string;
uploadTime: string; uploadTime: string;

View File

@ -252,7 +252,8 @@ const searchForm = ref({
timeRange: [] timeRange: []
}); });
const globalStore = GlobalStore(); const globalStore = GlobalStore();
const baseUrl = import.meta.env.VITE_API_URL; const baseUrl = window.location.protocol + "//" + window.location.host;
// const baseUrl = import.meta.env.VITE_API_URL;
const fileList1 = ref([]); const fileList1 = ref([]);
const fileList = ref([]); const fileList = ref([]);
const headers = ref({ Authorization: "Bearer " + globalStore.token }); const headers = ref({ Authorization: "Bearer " + globalStore.token });

View File

@ -261,7 +261,8 @@ import { onMounted, ref, watch, reactive } from "vue";
import { ElMessage, ElMessageBox } from "element-plus"; import { ElMessage, ElMessageBox } from "element-plus";
import type { FormInstance, UploadProps } from "element-plus"; import type { FormInstance, UploadProps } from "element-plus";
import { relativeInfo, timeLineData, submitReform, submitAll } from "@/api/modules/project"; import { relativeInfo, timeLineData, submitReform, submitAll } from "@/api/modules/project";
const baseUrl = import.meta.env.VITE_API_URL; const baseUrl = window.location.protocol + "//" + window.location.host;
// const baseUrl = import.meta.env.VITE_API_URL;
const props = defineProps({ const props = defineProps({
detailsDialog: Boolean, detailsDialog: Boolean,
relativeId: String relativeId: String

View File

@ -259,7 +259,8 @@ import { onMounted, ref, watch, reactive } from "vue";
import { ElMessage, ElMessageBox } from "element-plus"; import { ElMessage, ElMessageBox } from "element-plus";
import type { FormInstance, UploadProps } from "element-plus"; import type { FormInstance, UploadProps } from "element-plus";
import { relativeInfo, timeLineData, submitReform, submitAll } from "@/api/modules/project"; import { relativeInfo, timeLineData, submitReform, submitAll } from "@/api/modules/project";
const baseUrl = import.meta.env.VITE_API_URL; const baseUrl = window.location.protocol + "//" + window.location.host;
// const baseUrl = import.meta.env.VITE_API_URL;
const props = defineProps({ const props = defineProps({
detailsDialog: Boolean, detailsDialog: Boolean,
relativeId: String relativeId: String

View File

@ -128,7 +128,8 @@ const fileList = ref([]);
const store = GlobalStore(); const store = GlobalStore();
const headers = ref({ Authorization: "Bearer " + store.token }); const headers = ref({ Authorization: "Bearer " + store.token });
const ruleFormRef = ref<FormInstance>(); const ruleFormRef = ref<FormInstance>();
const baseUrl = import.meta.env.VITE_API_URL; const baseUrl = window.location.protocol + "//" + window.location.host;
// const baseUrl = import.meta.env.VITE_API_URL;
const isBool = ref(true); const isBool = ref(true);
interface formData { interface formData {
title: string; title: string;