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' VITE_APP_ENV = 'development'
# 开发环境 # 开发环境
# 李陈杰 209
VITE_APP_BASE_API = 'http://192.168.110.209:8899' 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' VITE_APP_BASE_DRONE_API = 'http://58.17.134.85:9512'

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

@ -1,408 +1,429 @@
<template> <template>
<div class="container"> <div class="container">
<el-steps style="max-width: 100%" :active="active" finish-status="success" align-center> <el-steps style="max-width: 100%" :active="active" finish-status="success" align-center>
<el-step title="选择合同类型" /> <el-step title="选择合同类型" />
<el-step title="录入合同内容" /> <el-step title="录入合同内容" />
<el-step title="录入收款方式" /> <el-step title="录入收款方式" />
</el-steps> </el-steps>
<div class="content"> <div class="content">
<template v-if="active == 0"> <template v-if="active == 0">
<div> <div>
<el-button type="success" size="large" @click="checkContractType('income')">收入合同</el-button> <el-button type="success" size="large" @click="checkContractType('income')">收入合同</el-button>
<el-button type="primary" size="large" @click="checkContractType('expenses')">支出合同</el-button> <el-button type="primary" size="large" @click="checkContractType('expenses')">支出合同</el-button>
</div> </div>
</template>
</template> <template v-else-if="active == 1">
<template v-else-if="active == 1"> <h1>{{ contract_type == 'income' ? '收入合同' : '支出合同' }}</h1>
<h1>{{ contract_type == "income" ? "收入合同" : "支出合同" }}</h1> <template v-if="contract_type == 'income'">
<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" <!-- <el-form-item label="项目名称">
label-width="80px">
<!-- <el-form-item label="项目名称">
<el-input :model-value="project.name" disabled /> <el-input :model-value="project.name" disabled />
</el-form-item> --> </el-form-item> -->
<el-form-item label="合同编号" prop="contractCode"> <el-form-item label="合同编号" prop="contractCode">
<el-input v-model="form.contractCode" placeholder="请输入合同编号" /> <el-input v-model="form.contractCode" placeholder="请输入合同编号" />
</el-form-item> </el-form-item>
<el-form-item label="合同类型" prop="contractType"> <el-form-item label="合同类型" prop="contractType">
<el-select v-model="form.contractType" placeholder="请选择合同类型"> <el-select v-model="form.contractType" placeholder="请选择合同类型">
<el-option v-for="item in income_contract_type" :key="item.value" :label="item.label" <el-option v-for="item in income_contract_type" :key="item.value" :label="item.label" :value="item.value" />
:value="item.value" /> </el-select>
</el-select> </el-form-item>
</el-form-item> <el-form-item label="业主单位" prop="contractOwner">
<el-form-item label="业主单位" prop="contractOwner"> <el-input v-model="form.contractOwner" placeholder="请输入业主单位" />
<el-input v-model="form.contractOwner" placeholder="请输入业主单位" /> </el-form-item>
</el-form-item> <el-form-item label="承包内容">
<el-form-item label="承包内容"> <editor v-model="form.contractedContent" :min-height="192" />
<editor v-model="form.contractedContent" :min-height="192" /> </el-form-item>
</el-form-item> <el-form-item label="合同金额" prop="amount">
<el-form-item label="合同金额" prop="amount"> <el-input
<el-input v-model="form.amount" placeholder="请输入合同金额" v-model="form.amount"
oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" /> placeholder="请输入合同金额"
</el-form-item> oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
<el-form-item label="备注" prop="remark"> />
<el-input v-model="form.remark" placeholder="请输入备注" /> </el-form-item>
</el-form-item> <el-form-item label="备注" prop="remark">
<el-form-item label="附件"> <el-input v-model="form.remark" placeholder="请输入备注" />
<FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess" </el-form-item>
:ref="fileRef" :defaultFileList="tempFileList" /> <el-form-item label="附件">
</el-form-item> <FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess" :ref="fileRef" :defaultFileList="tempFileList" />
</el-form> </el-form-item>
</template> </el-form>
<template v-else-if="contract_type == 'expenses'"> </template>
<el-form ref="expensesContractFormRef" :model="form" :rules="expensesContractFormRules" <template v-else-if="contract_type == 'expenses'">
label-width="80px"> <el-form ref="expensesContractFormRef" :model="form" :rules="expensesContractFormRules" label-width="80px">
<!-- <el-form-item label="项目名称"> <!-- <el-form-item label="项目名称">
<el-input :model-value="projectName" placeholder="请输入项目ID" disabled /> <el-input :model-value="projectName" placeholder="请输入项目ID" disabled />
</el-form-item> --> </el-form-item> -->
<el-form-item label="合同编号" prop="contractCode"> <el-form-item label="合同编号" prop="contractCode">
<el-input v-model="form.contractCode" placeholder="请输入合同编号" /> <el-input v-model="form.contractCode" placeholder="请输入合同编号" />
</el-form-item> </el-form-item>
<el-form-item label="合同类型" prop="contractType"> <el-form-item label="合同类型" prop="contractType">
<el-select v-model="form.contractType" placeholder="请选择合同类型"> <el-select v-model="form.contractType" placeholder="请选择合同类型">
<el-option v-for="item in expenses_contract_type" :key="item.value" :label="item.label" <el-option v-for="item in expenses_contract_type" :key="item.value" :label="item.label" :value="item.value" />
:value="item.value" /> </el-select>
</el-select> </el-form-item>
</el-form-item> <el-form-item label="招标计划" prop="tenderId">
<el-form-item label="招标计划" prop="tenderId"> <!-- <el-input v-model="form.tenderId" placeholder="请输入招标Id" /> -->
<!-- <el-input v-model="form.tenderId" placeholder="请输入招标Id" /> --> <el-input v-model="form.name" placeholder="请选择招标计划" disabled />
<el-input v-model="form.name" placeholder="请选择招标计划" disabled /> <el-button type="primary" @click="handleChoose">选择招标</el-button>
<el-button type="primary" @click="handleChoose">选择招标</el-button> </el-form-item>
</el-form-item> <el-form-item label="供应商" prop="winningBidder">
<el-form-item label="供应商" prop="contractSupplier"> <el-input v-model="form.winningBidder" placeholder="请输入供应商" disabled />
<el-input v-model="form.contractSupplier" placeholder="请输入供应商" disabled /> </el-form-item>
</el-form-item> <el-form-item label="分包内容">
<el-form-item label="分包内容"> <!-- <editor v-model="form.contractedContent" :min-height="192" disabled /> -->
<!-- <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" </el-form-item>
:autosize="{ minRows: 2, maxRows: 4 }" type="textarea" disabled /> <el-form-item label="合同金额" prop="contractPrice">
</el-form-item> <el-input
<el-form-item label="合同金额" prop="amount"> oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
<el-input v-model="form.contractPrice"
oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" placeholder="请输入合同金额"
v-model="form.amount" placeholder="请输入合同金额" disabled /> disabled
</el-form-item> />
</el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" /> <el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item> </el-form-item>
<el-form-item label="附件"> <el-form-item label="附件">
<FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess" <FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess" :ref="fileRef" :defaultFileList="tempFileList" />
:ref="fileRef" :defaultFileList="tempFileList" /> </el-form-item>
</el-form-item> </el-form>
</el-form> </template>
</template> <div>
<div> <el-button @click="back(true)">上一步</el-button>
<el-button @click="back(true)">上一步</el-button> <el-button type="primary" @click="next">下一步</el-button>
<el-button type="primary" @click="next">下一步</el-button>
</div>
</template>
<template v-else-if="active == 2">
<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">
<el-option :value="1" label="月结算">月结算</el-option>
<el-option :value="2" label="形象节点">形象节点</el-option>
</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-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-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-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-form-item>
<el-form-item>
<div>
<el-button @click="back(false)">上一步</el-button>
<el-button type="success" @click="submitForm">提交</el-button>
</div>
</el-form-item>
</el-form>
</template>
</div> </div>
<el-dialog v-model="dialogVisible" title="选择招标计划" width="45%"> </template>
<el-table :data="planList"> <template v-else-if="active == 2">
<el-table-column type="index" width="50" label="序号" /> <h1>{{ contract_type == 'income' ? '收入合同' : '支出合同' }}</h1>
<el-table-column label="名称" align="center" prop="name" /> <el-form :model="form" :rules="payMentRules" label-width="150" ref="payMentRef">
<el-table-column label="合同额" align="center" prop="contractPrice" /> <el-form-item label="支付方式" placeholder="请选择支付方式" prop="payType">
<el-table-column label="分包内容" align="center" prop="content" /> <el-select v-model="form.payType">
<el-table-column label="中标单位" align="center" prop="winningBidder" /> <el-option :value="1" label="月结算">月结算</el-option>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-option :value="2" label="形象节点">形象节点</el-option>
<template #default="scope"> </el-select>
<el-button type="primary" @click="handleChooseData(scope.row)">选择</el-button> </el-form-item>
</template> <el-form-item label="预付款比例（%）" prop="advancePayRatio">
</el-table-column> <el-input
</el-table> v-model="form.advancePayRatio"
<template #footer> placeholder="请输入预付款比例"
<div class="dialog-footer"> oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
<el-button type="primary" @click="dialogVisible = false"> />
关闭 </el-form-item>
</el-button> <el-form-item label="尾款比例（%）" prop="balancePayRatio">
</div> <el-input
</template> v-model="form.balancePayRatio"
</el-dialog> 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-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-form-item>
<el-form-item>
<div>
<el-button @click="back(false)">上一步</el-button>
<el-button type="success" @click="submitForm">提交</el-button>
</div>
</el-form-item>
</el-form>
</template>
</div> </div>
<el-dialog v-model="dialogVisible" title="选择招标计划" width="45%">
<el-table :data="planList">
<el-table-column type="index" width="50" label="序号" />
<el-table-column label="名称" align="center" prop="name" />
<el-table-column label="合同额" align="center" prop="contractPrice" />
<el-table-column label="分包内容" align="center" prop="content" />
<el-table-column label="中标单位" align="center" prop="winningBidder" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button type="primary" @click="handleChooseData(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="dialogVisible = false"> 关闭 </el-button>
</div>
</template>
</el-dialog>
</div>
</template> </template>
<script setup> <script setup>
import FileUpload from '@/components/FileUpload'; 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 { listIncomeContract, getIncomeContract, delIncomeContract, addIncomeContract, updateIncomeContract } from '@/api/ctr/incomeContract';
import { useUserStore } from '@/store/modules/user'; import { useUserStore } from '@/store/modules/user';
const active = ref(0); const active = ref(0);
const contract_type = ref("") const contract_type = ref('');
const form = ref({ payType: 1 }) const form = ref({ payType: 1 });
const fileList = ref([]) const fileList = ref([]);
const tempFileList = ref([]) const tempFileList = ref([]);
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const userStore = useUserStore(); const userStore = useUserStore();
const planList = ref([]); const planList = ref([]);
const dialogVisible = ref(false); const dialogVisible = ref(false);
const { expenses_contract_type, income_contract_type } = toRefs( const { expenses_contract_type, income_contract_type } = toRefs(proxy?.useDict('income_contract_type', 'expenses_contract_type'));
proxy?.useDict('income_contract_type', 'expenses_contract_type')
);
const fileRef = ref(null); const fileRef = ref(null);
const incomeContractFormRef = ref(null); const incomeContractFormRef = ref(null);
const expensesContractFormRef = ref(null); const expensesContractFormRef = ref(null);
const payMentRef = ref(null); const payMentRef = ref(null);
const incomeContractFormRules = { const incomeContractFormRules = {
contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }], contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }], contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
contractOwner: [{ required: true, message: '请输入业主单位', trigger: 'blur' }], contractOwner: [{ required: true, message: '请输入业主单位', trigger: 'blur' }],
amount: [{ 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 = { const expensesContractFormRules = {
contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }], contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }], contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
contractSupplier: [{ required: true, message: '请输入供应商', trigger: 'blur' }], winningBidder: [{ required: true, message: '请输入供应商', trigger: 'blur' }],
amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }], amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
tenderId: [{ 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 = { const payMentRules = {
payType: [{ required: true, message: '请选择支付方式', trigger: 'change' }], payType: [{ required: true, message: '请选择支付方式', trigger: 'change' }],
advancePayRatio: [{ required: true, message: '请输入预付款比例', trigger: 'blur' }], advancePayRatio: [{ required: true, message: '请输入预付款比例', trigger: 'blur' }],
balancePayRatio: [{ required: true, message: '请输入尾款比例', trigger: 'blur' }], balancePayRatio: [{ required: true, message: '请输入尾款比例', trigger: 'blur' }],
assuranceDepositRatio: [{ 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(() => { const project = computed(() => {
console.log(111); console.log(111);
return JSON.parse(localStorage.getItem("selectedProject")) return JSON.parse(localStorage.getItem('selectedProject'));
}); });
const checkContractType = (type) => { const checkContractType = (type) => {
contract_type.value = type; contract_type.value = type;
form.value.contract_type = type; form.value.contract_type = type;
active.value = 1; active.value = 1;
form.value.step = active.value; form.value.step = active.value;
}; };
const onUploadSuccess = (data) => { const onUploadSuccess = (data) => {
fileList.value = data fileList.value = data;
} };
const back = async (reset) => { const back = async (reset) => {
console.log(active.value); console.log(active.value);
if (reset) { if (reset) {
await ElMessageBox.confirm('返回上一步将清空目前填写的内容，确定返回？', '提示', { await ElMessageBox.confirm('返回上一步将清空目前填写的内容，确定返回？', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning'
}).then(() => { })
resetForm(); .then(() => {
active.value--; resetForm();
}).catch(() => {
return;
});
} else {
active.value--; active.value--;
} })
console.log(active.value); .catch(() => {
return;
form.value.step = active.value; });
} else {
active.value--;
}
console.log(active.value);
form.value.step = active.value;
}; };
const next = async () => { const next = async () => {
if (contract_type.value === 'income') { if (contract_type.value === 'income') {
await incomeContractFormRef.value.validate((valid) => { await incomeContractFormRef.value.validate((valid) => {
if (valid) { if (valid) {
active.value++; active.value++;
} else { } else {
ElMessage.error('请填写完整的收入合同信息'); ElMessage.error('请填写完整的收入合同信息');
} }
}); });
} else if (contract_type.value === 'expenses') { } else if (contract_type.value === 'expenses') {
await expensesContractFormRef.value.validate((valid) => { await expensesContractFormRef.value.validate((valid) => {
if (valid) { if (valid) {
active.value++; active.value++;
} else { } else {
ElMessage.error('请填写完整的支出合同信息'); ElMessage.error('请填写完整的支出合同信息');
} }
}); });
} }
console.log(active.value); console.log(active.value);
form.value.step = active.value; form.value.step = active.value;
}; };
const resetForm = () => { const resetForm = () => {
form.value = { form.value = {
payType: 1, payType: 1,
contractCode: '', contractCode: '',
contractType: '', contractType: '',
contractOwner: '', contractOwner: '',
contractedContent: '', contractedContent: '',
amount: '', amount: '',
remark: '', remark: '',
advancePayRatio: '', advancePayRatio: '',
balancePayRatio: '', balancePayRatio: '',
assuranceDepositRatio: '', assuranceDepositRatio: '',
payRatio: '' payRatio: ''
}; };
fileList.value = []; fileList.value = [];
tempFileList.value = []; tempFileList.value = [];
contract_type.value = ''; contract_type.value = '';
setTimeout(() => { setTimeout(() => {
localStorage.removeItem("tempContractForm"); localStorage.removeItem('tempContractForm');
}, 0); }, 0);
}; };
const submitForm = async () => { const submitForm = async () => {
console.log(payMentRef.value); console.log(payMentRef.value);
await payMentRef.value.validate(async (valid) => { await payMentRef.value.validate(async (valid) => {
if (valid) { if (valid) {
// 提交付款信息逻辑 // 提交付款信息逻辑
console.log('提交付款信息', form.value, fileList.value); console.log('提交付款信息', form.value, fileList.value);
// 这里可以调用API提交数据 // 这里可以调用API提交数据
form.value.projectId = project.value.id; form.value.projectId = project.value.id;
form.value.fileList = fileList.value.map((data) => { form.value.fileList = fileList.value.map((data) => {
return { return {
...data, ...data,
fileName: data.name, fileName: data.name,
fileUrl: data.url, fileUrl: data.url
} };
}) });
if (contract_type.value === 'income') { if (contract_type.value === 'income') {
await addIncomeContract({ ...form.value }); await addIncomeContract({ ...form.value });
} else if (contract_type.value === 'expenses') { } else if (contract_type.value === 'expenses') {
await addExpensesContract({ ...form.value }); await addExpensesContract({ ...form.value });
} }
resetForm(); resetForm();
ElMessage.success('合同提交成功'); ElMessage.success('合同提交成功');
} else { } else {
ElMessage.error('请填写完整的付款信息'); ElMessage.error('请填写完整的付款信息');
}
});
// if (contract_type.value === 'income') {
// const incomeContractFormRef = ref(null);
// await incomeContractFormRef.value.validate(async (valid) => {
// if (valid) {
// // 提交收入合同逻辑
// console.log('提交收入合同', form.value, fileList.value);
// // 这里可以调用API提交数据
// resetForm();
// ElMessage.success('收入合同提交成功');
// } else {
// ElMessage.error('请填写完整的收入合同信息');
// }
// });
// } else if (contract_type.value === 'expenses') {
// const expensesContractFormRef = ref(null);
// await expensesContractFormRef.value.validate(async (valid) => {
// if (valid) {
// // 提交支出合同逻辑
// console.log('提交支出合同', form.value, fileList.value);
// // 这里可以调用API提交数据
// resetForm();
// ElMessage.success('支出合同提交成功');
// } else {
// ElMessage.error('请填写完整的支出合同信息');
// }
// });
// }
}
const handleChoose = async () => {
if (!form.value.contractType) {
ElMessage.error('请先选择合同类型');
return;
} }
const formData = { });
projectId: userStore.selectedProject.id, // if (contract_type.value === 'income') {
dictName: form.value.contractType, // const incomeContractFormRef = ref(null);
status: 1, // await incomeContractFormRef.value.validate(async (valid) => {
} // if (valid) {
const { data } = await getTenderPlan(formData) // // 提交收入合同逻辑
if (data.length === 0) { // console.log('提交收入合同', form.value, fileList.value);
ElMessage.warning('当前没有招标计划，请先创建招标计划'); // // 这里可以调用API提交数据
return; // resetForm();
} // ElMessage.success('收入合同提交成功');
planList.value = data // } else {
dialogVisible.value = true; // ElMessage.error('请填写完整的收入合同信息');
// }
} // });
const handleChooseData = (row) => { // } else if (contract_type.value === 'expenses') {
form.value.tenderId = row.id; // const expensesContractFormRef = ref(null);
form.value.name = row.name; // await expensesContractFormRef.value.validate(async (valid) => {
form.value.contractPrice = row.contractPrice; // if (valid) {
form.value.content = row.content; // // 提交支出合同逻辑
form.value.winningBidder = row.winningBidder; // console.log('提交支出合同', form.value, fileList.value);
dialogVisible.value = false; // // 这里可以调用API提交数据
// resetForm();
// ElMessage.success('支出合同提交成功');
// } else {
// ElMessage.error('请填写完整的支出合同信息');
// }
// });
// }
}; };
watch(form, (val) => { const handleChoose = async () => {
localStorage.setItem("tempContractForm", JSON.stringify({ ...val, fileList: fileList.value })); if (!form.value.contractType) {
}, { deep: true }); ElMessage.error('请先选择合同类型');
watch(fileList, (val) => { return;
localStorage.setItem("tempContractForm", JSON.stringify({ ...form.value, fileList: val })); }
}, { deep: true }); const formData = {
projectId: userStore.selectedProject.id,
dictName: form.value.contractType,
bidStatus: 1
};
const { data } = await getTenderPlan(formData);
if (data.length === 0) {
ElMessage.warning('当前没有招标计划，请先创建招标计划');
return;
}
planList.value = data;
dialogVisible.value = true;
};
const handleChooseData = (row) => {
form.value.tenderId = row.id;
form.value.name = row.name;
form.value.contractPrice = row.contractPrice;
form.value.content = row.content;
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 }
);
onMounted(() => { onMounted(() => {
const tempForm = localStorage.getItem("tempContractForm"); const tempForm = localStorage.getItem('tempContractForm');
if (tempForm) { if (tempForm) {
ElMessageBox.confirm('检测到有未完成的合同录入，是否继续？', '提示', { ElMessageBox.confirm('检测到有未完成的合同录入，是否继续？', '提示', {
confirmButtonText: '继续', confirmButtonText: '继续',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning'
}).then(() => { })
const t = JSON.parse(tempForm); .then(() => {
const { fileList: files, ...rest } = JSON.parse(tempForm); const t = JSON.parse(tempForm);
form.value = rest; const { fileList: files, ...rest } = JSON.parse(tempForm);
fileList.value = files || []; form.value = rest;
tempFileList.value = files || []; fileList.value = files || [];
contract_type.value = form.value.contract_type; tempFileList.value = files || [];
active.value = form.value.step || 0; contract_type.value = form.value.contract_type;
active.value = form.value.step || 0;
}).catch(() => { })
localStorage.removeItem("tempContractForm"); .catch(() => {
}); localStorage.removeItem('tempContractForm');
});
} }
}); });
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.container { .container {
padding: 20px; padding: 20px;
.content { .content {
width: 100%; width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
padding: 30px; padding: 30px;
flex-direction: column; flex-direction: column;
} }
} }
</style> </style>

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

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

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

@ -105,7 +105,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="产值类型" prop="valueType"> <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-option v-for="item in out_value_type" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -121,7 +121,9 @@
<el-input v-model="form.remark" placeholder="请输入说明" /> <el-input v-model="form.remark" placeholder="请输入说明" />
</el-form-item> </el-form-item>
<el-form-item label="合同编码" prop="contractCode"> <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>
<el-form-item label="合同名称" prop="contractName"> <el-form-item label="合同名称" prop="contractName">
<el-input v-model="form.contractName" placeholder="请输入合同名称" /> <el-input v-model="form.contractName" placeholder="请输入合同名称" />
@ -138,6 +140,7 @@
</template> </template>
<script setup name="SettlementValueSubcontract" lang="ts"> <script setup name="SettlementValueSubcontract" lang="ts">
import { listExpensesContract } from '@/api/ctr/expensesContract';
import { import {
listSettlementValueSubcontract, listSettlementValueSubcontract,
getSettlementValueSubcontract, getSettlementValueSubcontract,
@ -154,7 +157,27 @@ import { listContractor } from '@/api/project/contractor';
import { ContractorVO } from '@/api/project/contractor/types'; import { ContractorVO } from '@/api/project/contractor/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance; 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'; import { useUserStoreHook } from '@/store/modules/user';
// 获取用户 store // 获取用户 store
const userStore = useUserStoreHook(); const userStore = useUserStoreHook();
@ -239,6 +262,13 @@ const getContractorList = async () => {
contractorList.value = res.rows; 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 = () => { const cancel = () => {
reset(); 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`); proxy?.download('patch/patch/export', { ...queryParams.value }, `任务列表_${new Date().getTime()}.xlsx`);
}; };
onMounted(() => {
getList();
});
// 监听项目id刷新数据 // 监听项目id刷新数据
const listeningProject = watch( const listeningProject = watch(
() => currentProject.value?.id, () => currentProject.value?.id,

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

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

4
src/views/tender/plan/index.vue
View File

@ -77,8 +77,8 @@
['1', 1].includes(scope.row.plannedBiddingMethod) ['1', 1].includes(scope.row.plannedBiddingMethod)
? '公招' ? '公招'
: ['2', 2].includes(scope.row.plannedBiddingMethod) : ['2', 2].includes(scope.row.plannedBiddingMethod)
? '邀标' ? '邀标'
: scope.row.plannedBiddingMethod || '-' : scope.row.plannedBiddingMethod || '-'
}} }}
</template> </template>
</el-table-column> </el-table-column>

2
vite.config.ts
View File

@ -48,7 +48,7 @@ export default defineConfig(({ mode, command }: ConfigEnv): UserConfig => {
ws: true, ws: true,
rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '') rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')
}, },
'/auth': { '/auth': {
target: env.VITE_APP_BASE_API, target: env.VITE_APP_BASE_API,
changeOrigin: true, changeOrigin: true,
ws: true, ws: true,