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/ctr/expensesContract/index.vue b/src/views/ctr/expensesContract/index.vue
index 3235641..f7dbf2b 100644
--- a/src/views/ctr/expensesContract/index.vue
+++ b/src/views/ctr/expensesContract/index.vue
@@ -5,9 +5,9 @@
-
+
@@ -18,9 +18,9 @@
-
+
搜索
重置
@@ -57,7 +57,7 @@
-
+
@@ -68,7 +68,7 @@
-
+
@@ -93,9 +93,9 @@
-
+
@@ -131,6 +131,7 @@
import { listExpensesContract, getExpensesContract, delExpensesContract, addExpensesContract, updateExpensesContract, getFileList } from '@/api/ctr/expensesContract';
import { ExpensesContractVO, ExpensesContractQuery, ExpensesContractForm } from '@/api/ctr/expensesContract/types';
import FileList from '@/components/FileList/index.vue';
+import useUserStore from '@/store/modules/user';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { expenses_contract_type, income_contract_type } = toRefs(
@@ -146,9 +147,10 @@ const multiple = ref(true);
const total = ref(0);
const fileListVisible = ref(false); // 控制附件列表对话框的显示
const fileList = ref>([]); // 文件列表
-
+const userStore = useUserStore();
const queryFormRef = ref();
const expensesContractFormRef = ref();
+const currentProject = computed(() => userStore.selectedProject);
const dialog = reactive({
visible: false,
@@ -171,7 +173,7 @@ const data = reactive>({
queryParams: {
pageNum: 1,
pageSize: 10,
- projectId: undefined,
+ projectId: currentProject.value?.id,
contractCode: undefined,
contractType: undefined,
contractSupplier: undefined,
@@ -292,7 +294,21 @@ const handleShowFileList = async (row: ExpensesContractVO) => {
});
}
+
onMounted(() => {
getList();
});
+// 监听项目id刷新数据
+const listeningProject = watch(
+ () => currentProject.value?.id,
+ (nid, oid) => {
+ queryParams.value.projectId = nid;
+ form.value.projectId = nid;
+ getList();
+ }
+);
+
+onUnmounted(() => {
+ listeningProject();
+});
diff --git a/src/views/ctr/incomeContract/index.vue b/src/views/ctr/incomeContract/index.vue
index 7c5b7f0..c9a4ad9 100644
--- a/src/views/ctr/incomeContract/index.vue
+++ b/src/views/ctr/incomeContract/index.vue
@@ -5,9 +5,9 @@
-
+
@@ -54,7 +54,7 @@
-
+
@@ -122,7 +122,10 @@
import { listIncomeContract, getIncomeContract, delIncomeContract, addIncomeContract, updateIncomeContract, getFileList } from '@/api/ctr/incomeContract';
import { IncomeContractVO, IncomeContractQuery, IncomeContractForm } from '@/api/ctr/incomeContract/types';
import FileList from '@/components/FileList/index.vue';
+import useUserStore from '@/store/modules/user';
const { proxy } = getCurrentInstance();
+const userStore = useUserStore();
+const currentProject = computed(() => userStore.selectedProject);
const { expenses_contract_type, income_contract_type } = toRefs(
proxy?.useDict('income_contract_type', 'expenses_contract_type')
@@ -159,7 +162,7 @@ const data = reactive>({
queryParams: {
pageNum: 1,
pageSize: 10,
- projectId: undefined,
+ projectId: currentProject.value?.id,
contractCode: undefined,
contractType: undefined,
contractOwner: undefined,
@@ -284,4 +287,17 @@ const handleShowFileList = async (row: IncomeContractVO) => {
onMounted(() => {
getList();
});
+// 监听项目id刷新数据
+const listeningProject = watch(
+ () => currentProject.value?.id,
+ (nid, oid) => {
+ queryParams.value.projectId = nid;
+ form.value.projectId = nid;
+ getList();
+ }
+);
+
+onUnmounted(() => {
+ listeningProject();
+});
diff --git a/src/views/ctr/index.vue b/src/views/ctr/index.vue
index 9bc0672..fc29113 100644
--- a/src/views/ctr/index.vue
+++ b/src/views/ctr/index.vue
@@ -66,19 +66,21 @@
-
+
选择招标
-
+
-
+
+
+ v-model="form.amount" placeholder="请输入合同金额" disabled />
@@ -97,26 +99,26 @@
{{ contract_type == "income" ? "收入合同" : "支出合同" }}
-
+
月结算
形象节点
-
+
-
+
-
+
-
+
@@ -165,6 +167,7 @@ const tempFileList = ref([])
const { proxy } = getCurrentInstance();
const userStore = useUserStore();
const planList = ref([]);
+const dialogVisible = ref(false);
const { expenses_contract_type, income_contract_type } = toRefs(
proxy?.useDict('income_contract_type', 'expenses_contract_type')
@@ -173,7 +176,6 @@ const fileRef = ref(null);
const incomeContractFormRef = ref(null);
const expensesContractFormRef = ref(null);
const payMentRef = ref(null);
-const dialogVisible = ref(false);
const incomeContractFormRules = {
contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
@@ -184,9 +186,11 @@ const incomeContractFormRules = {
const expensesContractFormRules = {
contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
+
contractSupplier: [{ required: true, message: '请输入供应商', trigger: 'blur' }],
amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
- tenderId: [{ required: false, message: '请输入招标Id', trigger: 'blur' }],
+ tenderId: [{ required: true, message: '请选择招标计划', trigger: 'blur' }],
+
remark: [{ required: false, message: '请输入备注', trigger: 'blur' }],
};
const payMentRules = {
@@ -338,7 +342,7 @@ const handleChoose = async () => {
const formData = {
projectId: userStore.selectedProject.id,
dictName: form.value.contractType,
- status: 1
+ status: 1,
}
const { data } = await getTenderPlan(formData)
if (data.length === 0) {
@@ -348,7 +352,6 @@ const handleChoose = async () => {
planList.value = data
dialogVisible.value = true;
-
}
const handleChooseData = (row) => {
form.value.tenderId = row.id;