违规记录

This commit is contained in:
Teo
2025-07-23 11:47:11 +08:00
parent e7b0b54f01
commit d503e64098
15 changed files with 1114 additions and 146 deletions

View File

@ -40,7 +40,7 @@
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['project:constructionUser:add']">新增 </el-button>
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['contractor:constructionUser:add']">新增 </el-button>
</el-col>
<el-col :span="1.5">
@ -50,13 +50,15 @@
icon="Delete"
:disabled="multiple"
@click="handleDelete()"
v-hasPermi="['project:constructionUser:remove']"
v-hasPermi="['contractor:constructionUser:remove']"
>
删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['project:constructionUser:export']">导出 </el-button>
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['contractor:constructionUser:export']"
>导出
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Edit" :disabled="multiple" @click="statusDialog = true">用户状态编辑 </el-button>
@ -78,7 +80,7 @@
<el-button type="success" plain>员工资料 </el-button>
</el-col>
<el-col :span="1.5" v-show="informationStatus">
<el-button type="primary" plain icon="Edit" @click="downloadTemplate" v-hasPermi="['project:constructionUserFile:download']"
<el-button type="primary" plain icon="Edit" @click="downloadTemplate" v-hasPermi="['contractor:constructionUserFile:download']"
>下载资料模板
</el-button>
</el-col>
@ -91,7 +93,7 @@
:limit="1"
:file-size="50"
>
<el-button type="warning" plain icon="Edit" v-hasPermi="['project:constructionUserFile:upload']">导入员工资料 </el-button>
<el-button type="warning" plain icon="Edit" v-hasPermi="['contractor:constructionUserFile:upload']">导入员工资料 </el-button>
</file-upload>
</el-col>
</el-row>
@ -163,20 +165,28 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="300">
<template #default="scope">
<el-space wrap>
<el-button link type="primary" icon="View" @click="handleShowDrawer(scope.row)" v-hasPermi="['project:constructionUser:query']">
<el-button link type="primary" icon="View" @click="handleShowDrawer(scope.row)" v-hasPermi="['contractor:constructionUser:query']">
详情
</el-button>
<el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['project:constructionUser:edit']">
<el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['contractor:constructionUser:edit']">
修改
</el-button>
<el-button link type="warning" icon="Female" @click="handlePlayCard(scope.row)"> 打卡 </el-button>
<el-button link type="danger" icon="Avatar" @click="handleJoinBlacklist(scope.row)" v-hasPermi="['project:constructionBlacklist:add']">
<el-button
link
type="danger"
icon="Avatar"
@click="handleJoinBlacklist(scope.row)"
v-hasPermi="['contractor:constructionBlacklist:add']"
>
黑名单
</el-button>
<!-- <el-button link type="primary" icon="Switch" @click="handleToggle(scope.row)"> 切换人脸 </el-button> -->
<el-button link type="primary" icon="Switch" @click="handleChange(scope.row)"> 人员迁移 </el-button>
<el-button link type="primary" icon="Switch" @click="handleChange(scope.row)" v-hasPermi="['contractor:constructionUser:migration']">
人员迁移
</el-button>
<el-button link type="primary" icon="ChatLineSquare" @click="handleExit(scope.row)"> 入退场记录 </el-button>
<el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['project:constructionUser:remove']">
<el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['contractor:constructionUser:remove']">
删除
</el-button>
<el-tooltip content="红点:部分上传,绿点:已上传,无点:未上传" placement="right" effect="dark">
@ -779,6 +789,7 @@ const getContractorList = async () => {
label: contractor.name
}));
loading.value = false;
handleQuery();
};
const handleMonth = async (e: any) => {
@ -838,6 +849,7 @@ const reset = () => {
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
if (contractorOpt.value.length == 1) queryParams.value.contractorId = contractorOpt.value[0].value;
getList();
};
@ -1062,7 +1074,7 @@ const listeningProject = watch(
(nid, oid) => {
queryParams.value.projectId = nid;
form.value.projectId = nid;
getList();
getContractorList();
}
);
@ -1071,7 +1083,6 @@ onUnmounted(() => {
});
onMounted(() => {
getList();
getContractorList();
});
</script>

View File

@ -89,7 +89,7 @@
></el-button>
</el-tooltip>
<el-tooltip content="出入库" placement="top">
<el-button link type="primary" icon="view" @click="handleView(scope.row)" ></el-button>
<el-button link type="primary" icon="view" @click="handleView(scope.row)"></el-button>
</el-tooltip>
</template>
</el-table-column>
@ -131,10 +131,10 @@
</div>
</template>
</el-dialog>
<el-dialog draggable :title="dialogRecord.title" v-model="dialogRecord.visible" width="1500px" append-to-body>
<div>
<contractorMaterialRecord ref="contractorMaterialRecordRef" ></contractorMaterialRecord>
</div>
<el-dialog draggable :title="dialogRecord.title" v-model="dialogRecord.visible" width="1500px" append-to-body>
<div>
<contractorMaterialRecord ref="contractorMaterialRecordRef"></contractorMaterialRecord>
</div>
</el-dialog>
</div>
</template>
@ -159,7 +159,7 @@ const currentProject = computed(() => userStore.selectedProject);
const contractorMaterialList = ref<ContractorMaterialVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const contractorMaterialRecordRef=ref(null)
const contractorMaterialRecordRef = ref(null);
const showSearch = ref(true);
const ids = ref<Array<string | number>>([]);
const single = ref(true);
@ -218,6 +218,7 @@ const getSubList = async () => {
projectId: currentProject.value.id
});
contractorList.value = res.rows;
handleQuery();
};
/** 查询分包方物料列表 */
@ -244,6 +245,7 @@ const reset = () => {
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
if (contractorList.value.length == 1) queryParams.value.contractorId = contractorList.value[0].id;
getList();
};
@ -310,7 +312,6 @@ const listeningProject = watch(
queryParams.value.projectId = nid;
form.value.projectId = nid;
getSubList();
getList();
}
);
onUnmounted(() => {
@ -318,13 +319,12 @@ onUnmounted(() => {
});
const handleView = async (row: ContractorToolVO) => {
// 打开弹框
dialogRecord.visible=true;
dialogRecord.title=row.materialName+"-物料出入库";
dialogRecord.visible = true;
dialogRecord.title = row.materialName + '-物料出入库';
await nextTick();
contractorMaterialRecordRef.value.getAll(row);
};
onMounted(() => {
getSubList();
getList();
});
</script>

View File

@ -13,8 +13,8 @@
<el-input v-model="queryParams.toolName" placeholder="请输入工具名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="工具类型" prop="toolType">
<el-select v-model="queryParams.toolType" placeholder="请选择工具类型" clearable >
<el-option v-for="dict in contractor_tool_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
<el-select v-model="queryParams.toolType" placeholder="请选择工具类型" clearable>
<el-option v-for="dict in contractor_tool_type" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="工具型号" prop="toolModel">
@ -35,13 +35,23 @@
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['project:contractorTool:add']">新增</el-button>
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['contractor:contractorTool:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['project:contractorTool:edit']">修改</el-button>
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['contractor:contractorTool:edit']"
>修改</el-button
>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['project:contractorTool:remove']">删除</el-button>
<el-button
type="danger"
plain
icon="Delete"
:disabled="multiple"
@click="handleDelete()"
v-hasPermi="['contractor:contractorTool:remove']"
>删除</el-button
>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -52,7 +62,7 @@
<el-table-column label="工具名称" align="center" prop="toolName" />
<el-table-column label="工具类型" align="center" prop="toolType">
<template #default="scope">
<dict-tag :options="contractor_tool_type" :value="scope.row.toolType"/>
<dict-tag :options="contractor_tool_type" :value="scope.row.toolType" />
</template>
</el-table-column>
<el-table-column label="工具型号" align="center" prop="toolModel" />
@ -66,13 +76,19 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['project:contractorTool:edit']"></el-button>
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['contractor:contractorTool:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['project:contractorTool:remove']"></el-button>
<el-button
link
type="primary"
icon="Delete"
@click="handleDelete(scope.row)"
v-hasPermi="['contractor:contractorTool:remove']"
></el-button>
</el-tooltip>
<el-tooltip content="出入库" placement="top">
<el-button link type="primary" icon="view" @click="handleView(scope.row)" ></el-button>
<el-button link type="primary" icon="view" @click="handleView(scope.row)"></el-button>
</el-tooltip>
</template>
</el-table-column>
@ -83,20 +99,15 @@
<el-form ref="contractorToolFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="分包方" prop="contractorId">
<el-select v-model="form.contractorId" filterable placeholder="请选择分包方">
<el-option v-for="(item, i) of contractorList" :key="i" :label="item.name" :value="item.id"> </el-option>
</el-select>
<el-option v-for="(item, i) of contractorList" :key="i" :label="item.name" :value="item.id"> </el-option>
</el-select>
</el-form-item>
<el-form-item label="工具名称" prop="toolName">
<el-input v-model="form.toolName" placeholder="请输入工具名称" />
</el-form-item>
<el-form-item label="工具类型" prop="toolType">
<el-select v-model="form.toolType" placeholder="请选择工具类型">
<el-option
v-for="dict in contractor_tool_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
<el-option v-for="dict in contractor_tool_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="工具型号" prop="toolModel">
@ -106,7 +117,7 @@
<file-upload v-model="form.file"/>
</el-form-item> -->
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-form>
<template #footer>
@ -116,10 +127,10 @@
</div>
</template>
</el-dialog>
<el-dialog draggable :title="dialogLevan.title" v-model="dialogLevan.visible" width="1500px" append-to-body>
<div>
<LevanAutbound ref="LevanAutboundRef" ></LevanAutbound>
</div>
<el-dialog draggable :title="dialogLevan.title" v-model="dialogLevan.visible" width="1500px" append-to-body>
<div>
<LevanAutbound ref="LevanAutboundRef"></LevanAutbound>
</div>
</el-dialog>
</div>
</template>
@ -127,7 +138,7 @@
<script setup name="ContractorTool" lang="ts">
import { listContractorTool, getContractorTool, delContractorTool, addContractorTool, updateContractorTool } from '@/api/project/contractorTool';
import { ContractorToolVO, ContractorToolQuery, ContractorToolForm } from '@/api/project/contractorTool/types';
import { listContractor, } from '@/api/project/contractor';
import { listContractor } from '@/api/project/contractor';
import { useUserStoreHook } from '@/store/modules/user';
import LevanAutbound from '@/views/project/contractorTool/component/LevanAutbound.vue';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@ -139,13 +150,13 @@ const { contractor_tool_type } = toRefs<any>(proxy?.useDict('contractor_tool_typ
const contractorToolList = ref<ContractorToolVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const LevanAutboundRef=ref(null)
const LevanAutboundRef = ref(null);
const showSearch = ref(true);
const ids = ref<Array<string | number>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const contractorList=ref([]);//分包列表
const contractorList = ref([]); //分包列表
const queryFormRef = ref<ElFormInstance>();
const contractorToolFormRef = ref<ElFormInstance>();
@ -168,10 +179,10 @@ const initFormData: ContractorToolForm = {
toolModel: undefined,
toolNumber: undefined,
file: undefined,
remark: undefined,
}
remark: undefined
};
const data = reactive<PageData<ContractorToolForm, ContractorToolQuery>>({
form: {...initFormData},
form: { ...initFormData },
queryParams: {
pageNum: 1,
pageSize: 10,
@ -181,30 +192,15 @@ const data = reactive<PageData<ContractorToolForm, ContractorToolQuery>>({
toolType: undefined,
toolModel: undefined,
toolNumber: undefined,
params: {
}
params: {}
},
rules: {
contractorId: [
{ required: true, message: "分包方不能为空", trigger: "blur" },
],
toolName: [
{ required: true, message: "工具名称不能为空", trigger: "blur" },
],
toolType: [
{ required: true, message: "工具类型不能为空", trigger: "blur" },
],
toolModel: [
{ required: true, message: "工具数量不能为空", trigger: "blur" },
],
toolNumber: [
{ required: true, message: "分包方不能为空", trigger: "blur" },
],
},
contractorId: [{ required: true, message: '分包方不能为空', trigger: 'blur' }],
toolName: [{ required: true, message: '工具名称不能为空', trigger: 'blur' }],
toolType: [{ required: true, message: '工具类型不能为空', trigger: 'blur' }],
toolModel: [{ required: true, message: '工具数量不能为空', trigger: 'blur' }],
toolNumber: [{ required: true, message: '分包方不能为空', trigger: 'blur' }]
}
});
const { contractor_tool_record_type } = toRefs<any>(proxy?.useDict('contractor_tool_record_type'));
@ -214,9 +210,10 @@ const getSubList = async () => {
const res = await listContractor({
pageNum: 1,
pageSize: 10000,
projectId: currentProject.value.id,
projectId: currentProject.value.id
});
contractorList.value = res.rows;
handleQuery();
};
/** 查询分包方工器具列表 */
@ -226,55 +223,56 @@ const getList = async () => {
contractorToolList.value = res.rows;
total.value = res.total;
loading.value = false;
}
};
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
}
};
/** 表单重置 */
const reset = () => {
form.value = {...initFormData};
form.value = { ...initFormData };
contractorToolFormRef.value?.resetFields();
}
};
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
if (contractorList.value.length == 1) queryParams.value.contractorId = contractorList.value[0].id;
getList();
}
};
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
}
};
/** 多选框选中数据 */
const handleSelectionChange = (selection: ContractorToolVO[]) => {
ids.value = selection.map(item => item.id);
ids.value = selection.map((item) => item.id);
single.value = selection.length != 1;
multiple.value = !selection.length;
}
};
/** 新增按钮操作 */
const handleAdd = () => {
reset();
dialog.visible = true;
dialog.title = "添加工器具";
}
dialog.title = '添加工器具';
};
/** 修改按钮操作 */
const handleUpdate = async (row?: ContractorToolVO) => {
reset();
const _id = row?.id || ids.value[0]
const _id = row?.id || ids.value[0];
const res = await getContractorTool(_id);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = "修改工器具";
}
dialog.title = '修改工器具';
};
/** 提交按钮 */
const submitForm = () => {
@ -282,25 +280,25 @@ const submitForm = () => {
if (valid) {
buttonLoading.value = true;
if (form.value.id) {
await updateContractorTool(form.value).finally(() => buttonLoading.value = false);
await updateContractorTool(form.value).finally(() => (buttonLoading.value = false));
} else {
await addContractorTool(form.value).finally(() => buttonLoading.value = false);
await addContractorTool(form.value).finally(() => (buttonLoading.value = false));
}
proxy?.$modal.msgSuccess("操作成功");
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
await getList();
}
});
}
};
/** 删除按钮操作 */
const handleDelete = async (row?: ContractorToolVO) => {
const _ids = row?.id || ids.value;
await proxy?.$modal.confirm('是否确认删除分包方工器具编号为"' + _ids + '"的数据项?').finally(() => loading.value = false);
await proxy?.$modal.confirm('是否确认删除分包方工器具编号为"' + _ids + '"的数据项?').finally(() => (loading.value = false));
await delContractorTool(_ids);
proxy?.$modal.msgSuccess("删除成功");
proxy?.$modal.msgSuccess('删除成功');
await getList();
}
};
//监听项目id刷新数据
const listeningProject = watch(
@ -308,8 +306,7 @@ const listeningProject = watch(
(nid, oid) => {
queryParams.value.projectId = nid;
form.value.projectId = nid;
getSubList()
getList();
getSubList();
}
);
onUnmounted(() => {
@ -317,13 +314,12 @@ onUnmounted(() => {
});
const handleView = async (row: ContractorToolVO) => {
// 打开弹框
dialogLevan.visible=true;
dialogLevan.title=row.toolName+"-工器具出入库";
dialogLevan.visible = true;
dialogLevan.title = row.toolName + '-工器具出入库';
await nextTick();
LevanAutboundRef.value.getAll(row);
};
onMounted(() => {
getSubList();
getList();
});
</script>

View File

@ -40,7 +40,7 @@
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['project:constructionUser:add']">新增 </el-button>
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['contractor:constructionUser:add']">新增 </el-button>
</el-col>
<el-col :span="1.5">
<el-button
@ -49,13 +49,15 @@
icon="Delete"
:disabled="multiple"
@click="handleDelete()"
v-hasPermi="['project:constructionUser:remove']"
v-hasPermi="['contractor:constructionUser:remove']"
>
删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['project:constructionUser:export']">导出 </el-button>
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['contractor:constructionUser:export']"
>导出
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Edit" :disabled="multiple" @click="statusDialog = true">用户状态编辑 </el-button>
@ -77,7 +79,9 @@
<el-button type="success" plain>员工资料 </el-button>
</el-col>
<el-col :span="1.5" v-show="informationStatus">
<el-button type="primary" plain icon="Edit" @click="downloadTemplate"v-hasPermi="['project:constructionUserFile:download']">下载资料模板 </el-button>
<el-button type="primary" plain icon="Edit" @click="downloadTemplate" v-hasPermi="['contractor:constructionUserFile:download']"
>下载资料模板
</el-button>
</el-col>
<el-col :span="1.5" v-show="informationStatus">
<file-upload
@ -88,7 +92,7 @@
:limit="1"
:file-size="50"
>
<el-button type="warning" plain icon="Edit"v-hasPermi="['project:constructionUserFile:upload']">导入员工资料 </el-button>
<el-button type="warning" plain icon="Edit" v-hasPermi="['contractor:constructionUserFile:upload']">导入员工资料 </el-button>
</file-upload>
</el-col>
</el-row>
@ -160,20 +164,26 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="300">
<template #default="scope">
<el-space wrap>
<el-button link type="primary" icon="View" @click="handleShowDrawer(scope.row)" v-hasPermi="['project:constructionUser:query']">
<el-button link type="primary" icon="View" @click="handleShowDrawer(scope.row)" v-hasPermi="['contractor:constructionUser:query']">
详情
</el-button>
<el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['project:constructionUser:edit']">
<el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['contractor:constructionUser:edit']">
修改
</el-button>
<el-button link type="warning" icon="Female" @click="handlePlayCard(scope.row)"> 打卡 </el-button>
<el-button link type="danger" icon="Avatar" @click="handleJoinBlacklist(scope.row)" v-hasPermi="['project:constructionBlacklist:add']">
<el-button
link
type="danger"
icon="Avatar"
@click="handleJoinBlacklist(scope.row)"
v-hasPermi="['contractor:constructionBlacklist:add']"
>
黑名单
</el-button>
<!-- <el-button link type="primary" icon="Switch" @click="handleToggle(scope.row)"> 切换人脸 </el-button> -->
<el-button link type="primary" icon="Switch" @click="handleChange(scope.row)"> 人员迁移 </el-button>
<el-button link type="primary" icon="ChatLineSquare" @click="handleExit(scope.row)"> 入退场记录 </el-button>
<el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['project:constructionUser:remove']">
<el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['contractor:constructionUser:remove']">
删除
</el-button>
<el-tooltip content="红点:部分上传,绿点:已上传,无点:未上传" placement="right" effect="dark">
@ -189,7 +199,7 @@
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改施工人员对话框 -->
<el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="930px" append-to-body>
<el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="930px" append-to-body>
<el-form ref="constructionUserFormRef" :model="form" :rules="rules" label-width="130px" :inline="true">
<div class="block_box">
<div class="msg">用户信息</div>
@ -775,6 +785,7 @@ const getContractorList = async () => {
label: contractor.name
}));
loading.value = false;
handleQuery();
};
const handleMonth = async (e: any) => {
@ -834,6 +845,7 @@ const reset = () => {
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
if (contractorOpt.value.length == 1) queryParams.value.contractorId = contractorOpt.value[0].value;
getList();
};
@ -1058,7 +1070,7 @@ const listeningProject = watch(
(nid, oid) => {
queryParams.value.projectId = nid;
form.value.projectId = nid;
getList();
getContractorList();
}
);
@ -1067,7 +1079,6 @@ onUnmounted(() => {
});
onMounted(() => {
getList();
getContractorList();
});
</script>

View File

@ -33,15 +33,15 @@
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['project:subcontract:add']">新增</el-button>
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['contractor:subcontract:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['project:subcontract:edit']"
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['contractor:subcontract:edit']"
>修改</el-button
>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['project:subcontract:remove']"
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['contractor:subcontract:remove']"
>删除</el-button
>
</el-col>
@ -69,10 +69,16 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['project:subcontract:edit']"></el-button>
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['contractor:subcontract:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['project:subcontract:remove']"></el-button>
<el-button
link
type="primary"
icon="Delete"
@click="handleDelete(scope.row)"
v-hasPermi="['contractor:subcontract:remove']"
></el-button>
</el-tooltip>
</template>
</el-table-column>
@ -80,15 +86,15 @@
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改分包合同对话框 -->
<el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="subcontractFormRef" :model="form" :rules="rules" label-width="110px">
<el-form-item label="分包方" prop="contractorId">
<el-select v-model="form.contractorId" filterable placeholder="请选择分包方">
<el-option v-for="(item, i) of contractorList" :key="i" :label="item.name" :value="item.id"> </el-option>
</el-select>
<el-option v-for="(item, i) of contractorList" :key="i" :label="item.name" :value="item.id"> </el-option>
</el-select>
</el-form-item>
<el-form-item label="合同文件" prop="contractFileId">
<file-upload fileSize="" :fileType="['doc', 'xls', 'ppt', 'txt', 'pdf', 'png', 'jpg', 'jpeg']" v-model="form.contractFileId" />
<file-upload :fileType="['doc', 'xls', 'ppt', 'txt', 'pdf', 'png', 'jpg', 'jpeg']" v-model="form.contractFileId" />
</el-form-item>
<el-form-item label="合同名称" prop="contractName">
<el-input v-model="form.contractName" placeholder="请输入合同名称" />
@ -105,8 +111,7 @@
<el-input v-model="form.contractAmount" type="number" placeholder="请输入合同金额" />
</el-form-item>
<el-form-item label="合同日期" prop="contractTime">
<el-date-picker clearable v-model="form.contractTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择合同日期">
</el-date-picker>
<el-date-picker clearable v-model="form.contractTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择合同日期"> </el-date-picker>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@ -125,7 +130,7 @@
<script setup name="Subcontract" lang="ts">
import { listSubcontract, getSubcontract, delSubcontract, addSubcontract, updateSubcontract } from '@/api/project/subcontract';
import { SubcontractVO, SubcontractQuery, SubcontractForm } from '@/api/project/subcontract/types';
import { listContractor, } from '@/api/project/contractor';
import { listContractor } from '@/api/project/contractor';
import { useUserStoreHook } from '@/store/modules/user';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@ -141,7 +146,7 @@ const ids = ref<Array<string | number>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const contractorList=ref([]);//分包列表
const contractorList = ref([]); //分包列表
const queryFormRef = ref<ElFormInstance>();
const subcontractFormRef = ref<ElFormInstance>();
@ -181,7 +186,7 @@ const data = reactive<PageData<SubcontractForm, SubcontractQuery>>({
contractNumber: [{ required: true, message: '合同编号不能为空', trigger: 'change' }],
contractName: [{ required: true, message: '合同名称不能为空', trigger: 'change' }],
contractAmount: [{ required: true, message: '合同金额不能为空', trigger: 'change' }],
contractTime: [{ required: true, message: '合同时间不能为空', trigger: 'change' }],
contractTime: [{ required: true, message: '合同时间不能为空', trigger: 'change' }]
}
});
@ -200,9 +205,11 @@ const getSubList = async () => {
const res = await listContractor({
pageNum: 1,
pageSize: 10000,
projectId: currentProject.value.id,
projectId: currentProject.value.id
});
contractorList.value = res.rows;
handleQuery();
};
/** 取消按钮 */
@ -220,6 +227,7 @@ const reset = () => {
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
if (contractorList.value.length == 1) queryParams.value.contractorId = contractorList.value[0].id;
getList();
};
@ -285,7 +293,7 @@ const listeningProject = watch(
(nid, oid) => {
queryParams.value.projectId = nid;
form.value.projectId = nid;
getList();
getSubList();
}
);
@ -294,6 +302,5 @@ onUnmounted(() => {
});
onMounted(() => {
getSubList();
getList();
});
</script>