taoge_xiaodi/td_official
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改产值

Browse Source
This commit is contained in:
Teo
2025-08-22 15:11:31 +08:00
parent 65f4191211
commit d93b0d71a9
8 changed files with 422 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.env.development
View File

@ -5,8 +5,16 @@ VITE_APP_TITLE = 煤科建管平台
VITE_APP_ENV = 'development'
# 开发环境
# 李陈杰 209
VITE_APP_BASE_API = 'http://192.168.110.209:8899'
# 曾涛
# VITE_APP_BASE_API = 'http://192.168.110.180:8899'
# 罗成
# VITE_APP_BASE_API = 'http://192.168.110.213:8899'
# 朱银
# VITE_APP_BASE_API = 'http://192.168.110.149:8899'
# VITE_APP_BASE_API = 'http://192.168.110.209:8899'
# VITE_APP_BASE_API = 'http://192.168.110.209:8899'
# 无人机接口地址
VITE_APP_BASE_DRONE_API = 'http://58.17.134.85:9512'

175
src/views/ctr/index.vue
View File

@ -11,13 +11,11 @@
<el-button type="success" size="large" @click="checkContractType('income')">收入合同</el-button>
<el-button type="primary" size="large" @click="checkContractType('expenses')">支出合同</el-button>
</div>
</template>
<template v-else-if="active == 1">
<h1>{{ contract_type == "income" ? "收入合同" : "支出合同" }}</h1>
<h1>{{ contract_type == 'income' ? '收入合同' : '支出合同' }}</h1>
<template v-if="contract_type == 'income'">
<el-form ref="incomeContractFormRef" :model="form" :rules="incomeContractFormRules"
label-width="80px">
<el-form ref="incomeContractFormRef" :model="form" :rules="incomeContractFormRules" label-width="80px">
<!-- <el-form-item label="项目名称">
<el-input :model-value="project.name" disabled />
</el-form-item> -->
@ -26,8 +24,7 @@
</el-form-item>
<el-form-item label="合同类型" prop="contractType">
<el-select v-model="form.contractType" placeholder="请选择合同类型">
<el-option v-for="item in income_contract_type" :key="item.value" :label="item.label"
:value="item.value" />
<el-option v-for="item in income_contract_type" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="业主单位" prop="contractOwner">
@ -37,21 +34,22 @@
<editor v-model="form.contractedContent" :min-height="192" />
</el-form-item>
<el-form-item label="合同金额" prop="amount">
<el-input v-model="form.amount" placeholder="请输入合同金额"
oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" />
<el-input
v-model="form.amount"
placeholder="请输入合同金额"
oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
/>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
<el-form-item label="附件">
<FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess"
:ref="fileRef" :defaultFileList="tempFileList" />
<FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess" :ref="fileRef" :defaultFileList="tempFileList" />
</el-form-item>
</el-form>
</template>
<template v-else-if="contract_type == 'expenses'">
<el-form ref="expensesContractFormRef" :model="form" :rules="expensesContractFormRules"
label-width="80px">
<el-form ref="expensesContractFormRef" :model="form" :rules="expensesContractFormRules" label-width="80px">
<!-- <el-form-item label="项目名称">
<el-input :model-value="projectName" placeholder="请输入项目ID" disabled />
</el-form-item> -->
@ -60,8 +58,7 @@
</el-form-item>
<el-form-item label="合同类型" prop="contractType">
<el-select v-model="form.contractType" placeholder="请选择合同类型">
<el-option v-for="item in expenses_contract_type" :key="item.value" :label="item.label"
:value="item.value" />
<el-option v-for="item in expenses_contract_type" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="招标计划" prop="tenderId">
@ -69,26 +66,27 @@
<el-input v-model="form.name" placeholder="请选择招标计划" disabled />
<el-button type="primary" @click="handleChoose">选择招标</el-button>
</el-form-item>
<el-form-item label="供应商" prop="contractSupplier">
<el-input v-model="form.contractSupplier" placeholder="请输入供应商" disabled />
<el-form-item label="供应商" prop="winningBidder">
<el-input v-model="form.winningBidder" placeholder="请输入供应商" disabled />
</el-form-item>
<el-form-item label="分包内容">
<!-- <editor v-model="form.contractedContent" :min-height="192" disabled /> -->
<el-input v-model="form.contractedContent" style="width: 300px"
:autosize="{ minRows: 2, maxRows: 4 }" type="textarea" disabled />
<el-input v-model="form.contractedContent" style="width: 300px" :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" disabled />
</el-form-item>
<el-form-item label="合同金额" prop="amount">
<el-form-item label="合同金额" prop="contractPrice">
<el-input
oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
v-model="form.amount" placeholder="请输入合同金额" disabled />
v-model="form.contractPrice"
placeholder="请输入合同金额"
disabled
/>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
<el-form-item label="附件">
<FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess"
:ref="fileRef" :defaultFileList="tempFileList" />
<FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess" :ref="fileRef" :defaultFileList="tempFileList" />
</el-form-item>
</el-form>
</template>
@ -98,7 +96,7 @@
</div>
</template>
<template v-else-if="active == 2">
<h1>{{ contract_type == "income" ? "收入合同" : "支出合同" }}</h1>
<h1>{{ contract_type == 'income' ? '收入合同' : '支出合同' }}</h1>
<el-form :model="form" :rules="payMentRules" label-width="150" ref="payMentRef">
<el-form-item label="支付方式" placeholder="请选择支付方式" prop="payType">
<el-select v-model="form.payType">
@ -107,20 +105,32 @@
</el-select>
</el-form-item>
<el-form-item label="预付款比例（%）" prop="advancePayRatio">
<el-input v-model="form.advancePayRatio" placeholder="请输入预付款比例"
oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" />
<el-input
v-model="form.advancePayRatio"
placeholder="请输入预付款比例"
oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
/>
</el-form-item>
<el-form-item label="尾款比例（%）" prop="balancePayRatio">
<el-input v-model="form.balancePayRatio" placeholder="请输入尾款比例"
oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" />
<el-input
v-model="form.balancePayRatio"
placeholder="请输入尾款比例"
oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
/>
</el-form-item>
<el-form-item label="质保金比例（%）" prop="assuranceDepositRatio;">
<el-input v-model="form.assuranceDepositRatio" placeholder="请输入质保金比例"
oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" />
<el-input
v-model="form.assuranceDepositRatio"
placeholder="请输入质保金比例"
oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
/>
</el-form-item>
<el-form-item label="付款比例（%）" prop="payRatio">
<el-input v-model="form.payRatio" placeholder="请输入付款比例"
oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" />
<el-input
v-model="form.payRatio"
placeholder="请输入付款比例"
oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
/>
</el-form-item>
<el-form-item>
<div>
@ -146,9 +156,7 @@
</el-table>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="dialogVisible = false">
关闭
</el-button>
<el-button type="primary" @click="dialogVisible = false"> 关闭 </el-button>
</div>
</template>
</el-dialog>
@ -156,22 +164,27 @@
</template>
<script setup>
import FileUpload from '@/components/FileUpload';
import { listExpensesContract, getExpensesContract, delExpensesContract, addExpensesContract, updateExpensesContract, getTenderPlan } from '@/api/ctr/expensesContract';
import {
listExpensesContract,
getExpensesContract,
delExpensesContract,
addExpensesContract,
updateExpensesContract,
getTenderPlan
} from '@/api/ctr/expensesContract';
import { listIncomeContract, getIncomeContract, delIncomeContract, addIncomeContract, updateIncomeContract } from '@/api/ctr/incomeContract';
import { useUserStore } from '@/store/modules/user';
const active = ref(0);
const contract_type = ref("")
const form = ref({ payType: 1 })
const fileList = ref([])
const tempFileList = ref([])
const contract_type = ref('');
const form = ref({ payType: 1 });
const fileList = ref([]);
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')
);
const { expenses_contract_type, income_contract_type } = toRefs(proxy?.useDict('income_contract_type', 'expenses_contract_type'));
const fileRef = ref(null);
const incomeContractFormRef = ref(null);
const expensesContractFormRef = ref(null);
@ -181,30 +194,30 @@ const incomeContractFormRules = {
contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
contractOwner: [{ required: true, message: '请输入业主单位', trigger: 'blur' }],
amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
remark: [{ required: false, message: '请输入备注', trigger: 'blur' }],
remark: [{ required: false, message: '请输入备注', trigger: 'blur' }]
};
const expensesContractFormRules = {
contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
contractSupplier: [{ required: true, message: '请输入供应商', trigger: 'blur' }],
winningBidder: [{ required: true, message: '请输入供应商', trigger: 'blur' }],
amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
tenderId: [{ required: true, message: '请选择招标计划', trigger: 'blur' }],
remark: [{ required: false, message: '请输入备注', trigger: 'blur' }],
remark: [{ required: false, message: '请输入备注', trigger: 'blur' }]
};
const payMentRules = {
payType: [{ required: true, message: '请选择支付方式', trigger: 'change' }],
advancePayRatio: [{ required: true, message: '请输入预付款比例', trigger: 'blur' }],
balancePayRatio: [{ required: true, message: '请输入尾款比例', trigger: 'blur' }],
assuranceDepositRatio: [{ required: true, message: '请输入质保金比例', trigger: 'blur' }],
payRatio: [{ required: true, message: '请输入付款比例', trigger: 'blur' }],
payRatio: [{ required: true, message: '请输入付款比例', trigger: 'blur' }]
};
const project = computed(() => {
console.log(111);
return JSON.parse(localStorage.getItem("selectedProject"))
return JSON.parse(localStorage.getItem('selectedProject'));
});
const checkContractType = (type) => {
@ -214,8 +227,8 @@ const checkContractType = (type) => {
form.value.step = active.value;
};
const onUploadSuccess = (data) => {
fileList.value = data
}
fileList.value = data;
};
const back = async (reset) => {
console.log(active.value);
@ -223,11 +236,13 @@ const back = async (reset) => {
await ElMessageBox.confirm('返回上一步将清空目前填写的内容，确定返回？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
type: 'warning'
})
.then(() => {
resetForm();
active.value--;
}).catch(() => {
})
.catch(() => {
return;
});
} else {
@ -236,7 +251,6 @@ const back = async (reset) => {
console.log(active.value);
form.value.step = active.value;
};
const next = async () => {
if (contract_type.value === 'income') {
@ -278,7 +292,7 @@ const resetForm = () => {
tempFileList.value = [];
contract_type.value = '';
setTimeout(() => {
localStorage.removeItem("tempContractForm");
localStorage.removeItem('tempContractForm');
}, 0);
};
const submitForm = async () => {
@ -294,9 +308,9 @@ const submitForm = async () => {
return {
...data,
fileName: data.name,
fileUrl: data.url,
}
})
fileUrl: data.url
};
});
if (contract_type.value === 'income') {
await addIncomeContract({ ...form.value });
} else if (contract_type.value === 'expenses') {
@ -335,7 +349,7 @@ const submitForm = async () => {
// }
// });
// }
}
};
const handleChoose = async () => {
if (!form.value.contractType) {
ElMessage.error('请先选择合同类型');
@ -344,17 +358,16 @@ const handleChoose = async () => {
const formData = {
projectId: userStore.selectedProject.id,
dictName: form.value.contractType,
status: 1,
}
const { data } = await getTenderPlan(formData)
bidStatus: 1
};
const { data } = await getTenderPlan(formData);
if (data.length === 0) {
ElMessage.warning('当前没有招标计划，请先创建招标计划');
return;
}
planList.value = data
planList.value = data;
dialogVisible.value = true;
}
};
const handleChooseData = (row) => {
form.value.tenderId = row.id;
form.value.name = row.name;
@ -363,20 +376,29 @@ const handleChooseData = (row) => {
form.value.winningBidder = row.winningBidder;
dialogVisible.value = false;
};
watch(form, (val) => {
localStorage.setItem("tempContractForm", JSON.stringify({ ...val, fileList: fileList.value }));
}, { deep: true });
watch(fileList, (val) => {
localStorage.setItem("tempContractForm", JSON.stringify({ ...form.value, fileList: val }));
}, { deep: true });
watch(
form,
(val) => {
localStorage.setItem('tempContractForm', JSON.stringify({ ...val, fileList: fileList.value }));
},
{ deep: true }
);
watch(
fileList,
(val) => {
localStorage.setItem('tempContractForm', JSON.stringify({ ...form.value, fileList: val }));
},
{ deep: true }
);
onMounted(() => {
const tempForm = localStorage.getItem("tempContractForm");
const tempForm = localStorage.getItem('tempContractForm');
if (tempForm) {
ElMessageBox.confirm('检测到有未完成的合同录入，是否继续？', '提示', {
confirmButtonText: '继续',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
type: 'warning'
})
.then(() => {
const t = JSON.parse(tempForm);
const { fileList: files, ...rest } = JSON.parse(tempForm);
form.value = rest;
@ -384,11 +406,10 @@ onMounted(() => {
tempFileList.value = files || [];
contract_type.value = form.value.contract_type;
active.value = form.value.step || 0;
}).catch(() => {
localStorage.removeItem("tempContractForm");
})
.catch(() => {
localStorage.removeItem('tempContractForm');
});
}
});
</script>

4
src/views/materials/materialsEquipment/materialReceive/index.vue
View File

@ -485,13 +485,15 @@ const addItem = () => {
// 监听条目数据变化，自动计算缺件数量
const watchItemChanges = (index: number) => {
watch(
() => [form.value.itemList[index].quantity, form.value.itemList[index].acceptedQuantity],
() => [form.value.itemList[index]?.quantity, form.value.itemList[index]?.acceptedQuantity],
([quantity, acceptedQuantity]) => {
// 确保数量和验收数量都是数字
const qty = Number(quantity) || 0;
const acceptedQty = Number(acceptedQuantity) || 0;
// 计算缺件数量（数量 - 验收数量）
if (form.value.itemList[index]) {
form.value.itemList[index].shortageQuantity = qty - acceptedQty;
}
},
{ immediate: true }
);

36
src/views/out/settlementValueSubcontract/index.vue
View File

@ -105,7 +105,7 @@
</el-date-picker>
</el-form-item>
<el-form-item label="产值类型" prop="valueType">
<el-select v-model="form.valueType" placeholder="请选择产值类型">
<el-select v-model="form.valueType" placeholder="请选择产值类型" @change="changeValue">
<el-option v-for="item in out_value_type" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
@ -121,7 +121,9 @@
<el-input v-model="form.remark" placeholder="请输入说明" />
</el-form-item>
<el-form-item label="合同编码" prop="contractCode">
<el-input v-model="form.contractCode" placeholder="请输入合同编码" />
<el-select v-model="form.contractCode" value-key="id" placeholder="请输入合同编码" clearable filterable :disabled="!form.valueType">
<el-option v-for="item in contractCodeList" :key="item.contractCode" :label="item.contractCode" :value="item.contractCode"> </el-option>
</el-select>
</el-form-item>
<el-form-item label="合同名称" prop="contractName">
<el-input v-model="form.contractName" placeholder="请输入合同名称" />
@ -138,6 +140,7 @@
</template>
<script setup name="SettlementValueSubcontract" lang="ts">
import { listExpensesContract } from '@/api/ctr/expensesContract';
import {
listSettlementValueSubcontract,
getSettlementValueSubcontract,
@ -154,7 +157,27 @@ import { listContractor } from '@/api/project/contractor';
import { ContractorVO } from '@/api/project/contractor/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { out_value_type } = toRefs<any>(proxy?.useDict('out_value_type'));
// const { out_value_type } = toRefs<any>(proxy?.useDict('out_value_type'));
const out_value_type = [
{
'label': '设计',
'value': '3',
'elTagType': 'primary',
'elTagClass': ''
},
{
'label': '采购',
'value': '2',
'elTagType': 'warning',
'elTagClass': ''
},
{
'label': '施工',
'value': '1',
'elTagType': 'success',
'elTagClass': ''
}
];
import { useUserStoreHook } from '@/store/modules/user';
// 获取用户 store
const userStore = useUserStoreHook();
@ -239,6 +262,13 @@ const getContractorList = async () => {
contractorList.value = res.rows;
};
//获取合同编码
const contractCodeList = ref<any[]>([]);
const changeValue = async (contractType: string) => {
const res = await listExpensesContract({ projectId: currentProject.value?.id, contractType } as any);
contractCodeList.value = res.rows as any;
};
/** 取消按钮 */
const cancel = () => {
reset();

4
src/views/patch/index.vue
View File

@ -632,6 +632,10 @@ const handleExport = () => {
proxy?.download('patch/patch/export', { ...queryParams.value }, `任务列表_${new Date().getTime()}.xlsx`);
};
onMounted(() => {
getList();
});
// 监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value?.id,

2
src/views/progress/progressCategory/index.vue
View File

@ -66,7 +66,7 @@
{{ row.parentId == 0 ? '' : row.outputValue }}
</template>
</el-table-column>
<el-table-column label="总数量/百分比" align="center" prop="total">
<el-table-column label="总数量" align="center" prop="total">
<template #default="{ row }">
{{ row.parentId == 0 ? '' : row.total }}
</template>