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:
fengsen
2025-08-15 22:48:31 +08:00
parent c92db7241e e1617585ab
commit 65a86571d7
23 changed files with 96 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -1,11 +1,11 @@
# 页面标题 # 页面标题
VITE_APP_TITLE = 新能源项目管理平台 VITE_APP_TITLE = 煤科建管平台
# 开发环境配置 # 开发环境配置
VITE_APP_ENV = 'development' VITE_APP_ENV = 'development'
# 开发环境 # 开发环境
VITE_APP_BASE_API = 'http://192.168.110.159:8898' VITE_APP_BASE_API = 'http://192.168.110.163:8898'
# 无人机接口地址 # 无人机接口地址

2
.env.production
View File

@ -1,5 +1,5 @@
# 页面标题 # 页面标题
VITE_APP_TITLE = 新能源项目管理平台 VITE_APP_TITLE = 煤科建管平台
# 生产环境配置 # 生产环境配置
VITE_APP_ENV = 'production' VITE_APP_ENV = 'production'

2
index.html
View File

@ -6,7 +6,7 @@
<meta name="renderer" content="webkit" /> <meta name="renderer" content="webkit" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0" />
<link rel="icon" href="/favicon.ico" /> <link rel="icon" href="/favicon.ico" />
<title>新能源项目管理平台</title> <title>煤科建管平台</title>
<!--[if lt IE 11 <!--[if lt IE 11
]><script> ]><script>
window.location.href = '/html/ie.html'; window.location.href = '/html/ie.html';

2
src/components/FileUpload/index.vue
View File

@ -314,7 +314,7 @@ const uploadedSuccessfully = (res: any) => {
emit('update:modelValue', listToString(fileList.value)); emit('update:modelValue', listToString(fileList.value));
proxy?.$modal.closeLoading(); proxy?.$modal.closeLoading();
} }
if (props.autoUpload) { if (props.autoUpload && props.limit === fileList.value.length) {
fileUploadRef.value?.clearFiles(); fileUploadRef.value?.clearFiles();
fileList.value = []; fileList.value = [];
emit('update:modelValue', ''); // 同步到外部 v-model emit('update:modelValue', ''); // 同步到外部 v-model

2
src/layout/components/Sidebar/Logo.vue
View File

@ -34,7 +34,7 @@ defineProps({
} }
}); });
const title = ref('新能源项目管理平台'); const title = ref('煤科建管平台');
const settingsStore = useSettingsStore(); const settingsStore = useSettingsStore();
const sideTheme = computed(() => settingsStore.sideTheme); const sideTheme = computed(() => settingsStore.sideTheme);
</script> </script>

3
src/store/modules/notice.ts
View File

@ -16,7 +16,8 @@ export const useNoticeStore = defineStore('notice', () => {
const addNotice = (notice: NoticeItem) => { const addNotice = (notice: NoticeItem) => {
console.log('🚀 ~ addNotice ~ notice:', notice); console.log('🚀 ~ addNotice ~ notice:', notice);
state.notices.push(notice); // 从前面录入
state.notices.unshift(notice);
}; };
const removeNotice = (notice: NoticeItem) => { const removeNotice = (notice: NoticeItem) => {

20
src/views/design/Professional/index.vue
View File

@ -45,10 +45,26 @@
<el-button link type="primary" icon="Download" @click="handleDownload(scope.row)">导出</el-button> <el-button link type="primary" icon="Download" @click="handleDownload(scope.row)">导出</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button link type="warning" icon="View" v-if="scope.row.status != 'draft'" @click="handleViewInfo(scope.row)">查看流程</el-button> <el-button
link
type="warning"
icon="View"
v-if="scope.row.status != 'draft'"
v-hasPermi="['design:extract:query']"
@click="handleViewInfo(scope.row)"
>查看流程</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button link type="warning" icon="View" v-if="scope.row.status != 'draft'" @click="handleFile(scope.row)">查看文件</el-button> <el-button
link
type="warning"
icon="View"
v-if="scope.row.status != 'draft'"
v-hasPermi="['design:extract:query']"
@click="handleFile(scope.row)"
>查看文件</el-button
>
</el-col> </el-col>
</el-row> </el-row>
</template> </template>

16
src/views/design/billofQuantities/index.vue
View File

@ -265,18 +265,20 @@ function importExcel(options) {
proxy.$modal.msgSuccess(res.msg || '导入成功'); proxy.$modal.msgSuccess(res.msg || '导入成功');
// 更新列表 // 更新列表
if (state.work_order_type == 3) { if (state.work_order_type == 3) {
getVersionNums(false); getVersionNums(false);
}else{ } else {
getVersionNums(); getVersionNums();
} }
} else { } else {
proxy.$modal.msgError(res.msg || '导入失败'); proxy.$modal.msgError(res.msg || '导入失败');
} }
}).catch((err)=>{
proxy.$modal.msgError(err.msg || '导入失败');
}).finally(() => {
state.loading.list = false;
}) })
.catch((err) => {
proxy.$modal.msgError(err.msg || '导入失败');
})
.finally(() => {
state.loading.list = false;
});
} }
// 切换表名 // 切换表名
function handleChange(sheet) { function handleChange(sheet) {

19
src/views/design/designChange/index.vue
View File

@ -27,7 +27,7 @@
<el-date-picker clearable v-model="queryParams.submitDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择提出日期" /> <el-date-picker clearable v-model="queryParams.submitDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择提出日期" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery" v-hasPermi="['design:designChange:list']">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -89,13 +89,24 @@
v-if="scope.row.status == 'draft' || scope.row.status == 'back'" v-if="scope.row.status == 'draft' || scope.row.status == 'back'"
>上传</el-button >上传</el-button
> >
<el-button type="success" link icon="View" v-if="scope.row.status != 'draft'" @click="handleViewInfo(scope.row)">查看</el-button> <el-button
<el-button type="success" link icon="View" @click="handleViewDetail(scope.row)">通知单</el-button> type="success"
link
icon="View"
v-if="scope.row.status != 'draft'"
v-hasPermi="['design:designChange:query']"
@click="handleViewInfo(scope.row)"
>查看</el-button
>
<el-button type="success" link icon="View" v-hasPermi="['design:designChange:query']" @click="handleViewDetail(scope.row)"
>通知单</el-button
>
<el-button <el-button
type="warning" type="warning"
link link
icon="View" icon="View"
v-if="scope.row.status == 'draft' || scope.row.status == 'termination'" v-hasPermi="['design:designChange:query']"
v-if="scope.row.status == 'back' || scope.row.status == 'termination'"
@click="handleViewHistory(scope.row)" @click="handleViewHistory(scope.row)"
>查看单据</el-button >查看单据</el-button
> >

2
src/views/design/drawing/indexEdit.vue
View File

@ -29,7 +29,7 @@
> >
<div class="grid grid-cols-1 md:grid-cols-2 gap-4"> <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
<el-form-item label="图纸文件" prop="fileId" class="mb-2 md:col-span-2"> <el-form-item label="图纸文件" prop="fileId" class="mb-2 md:col-span-2">
<file-upload :fileType="['pdf']" :fileSize="''" v-model="form.fileId" class="w-full"></file-upload> <file-upload :fileType="['pdf']" v-model="form.fileId" class="w-full"></file-upload>
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>

10
src/views/design/prelimScheme/index.vue
View File

@ -8,7 +8,7 @@
<el-input v-model="queryParams.fileName" placeholder="请输入文件名称" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.fileName" placeholder="请输入文件名称" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery" v-hasPermi="['design:prelimScheme:list']">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -20,7 +20,7 @@
<template #header> <template #header>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['design:scheme:add']">新增</el-button> <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['design:prelimScheme:add']">新增</el-button>
</el-col> </el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
@ -48,7 +48,7 @@
v-if="scope.row.status !== 'draft'" v-if="scope.row.status !== 'draft'"
icon="Edit" icon="Edit"
@click="handleView(scope.row)" @click="handleView(scope.row)"
v-hasPermi="['design:PrelimScheme:edit']" v-hasPermi="['design:PrelimScheme:query']"
>查看流程</el-button >查看流程</el-button
> >
<el-button <el-button
@ -60,7 +60,7 @@
v-hasPermi="['design:PrelimScheme:edit']" v-hasPermi="['design:PrelimScheme:edit']"
>修改</el-button >修改</el-button
> >
<el-button <!-- <el-button
link link
type="primary" type="primary"
v-if="scope.row.status === 'draft'" v-if="scope.row.status === 'draft'"
@ -68,7 +68,7 @@
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['design:PrelimScheme:remove']" v-hasPermi="['design:PrelimScheme:remove']"
>删除</el-button >删除</el-button
> > -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

8
src/views/design/scheme/index.vue
View File

@ -8,7 +8,7 @@
<el-input v-model="queryParams.fileName" placeholder="请输入文件名称" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.fileName" placeholder="请输入文件名称" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" v-hasPermi="['design:scheme:add']" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -48,7 +48,7 @@
v-if="scope.row.status !== 'draft'" v-if="scope.row.status !== 'draft'"
icon="Edit" icon="Edit"
@click="handleView(scope.row)" @click="handleView(scope.row)"
v-hasPermi="['design:PrelimScheme:edit']" v-hasPermi="['design:PrelimScheme:query']"
>查看流程</el-button >查看流程</el-button
> >
<el-button <el-button
@ -60,7 +60,7 @@
v-hasPermi="['design:scheme:edit']" v-hasPermi="['design:scheme:edit']"
>修改</el-button >修改</el-button
> >
<el-button <!-- <el-button
link link
type="primary" type="primary"
v-if="scope.row.status === 'draft'" v-if="scope.row.status === 'draft'"
@ -68,7 +68,7 @@
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['design:scheme:remove']" v-hasPermi="['design:scheme:remove']"
>删除</el-button >删除</el-button
> > -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

15
src/views/design/subcontract/index.vue
View File

@ -8,7 +8,7 @@
<el-input v-model="queryParams.subContent" placeholder="请输入分包内容" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.subContent" placeholder="请输入分包内容" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery" v-hasPermi="['design:subcontract:add']">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -22,7 +22,7 @@
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['design:subcontract:add']">新增</el-button> <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['design:subcontract:add']">新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['design:subcontract:edit']" <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['design:subcontract:edit']"
>修改</el-button >修改</el-button
> >
@ -34,7 +34,7 @@
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['design:subcontract:export']">导出</el-button> <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['design:subcontract:export']">导出</el-button>
</el-col> </el-col> -->
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
</template> </template>
@ -43,14 +43,11 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" type="index" width="50" /> <el-table-column label="序号" align="center" type="index" width="50" />
<el-table-column label="分包内容" align="center" prop="subContent" /> <el-table-column label="分包内容" align="center" prop="subContent" />
<el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-tooltip content="修改" placement="top"> <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['design:subcontract:edit']">修改</el-button>
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['design:subcontract:edit']"></el-button> <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['design:subcontract:remove']">删除</el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['design:subcontract:remove']"></el-button>
</el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

18
src/views/design/volumeCatalog/index.vue
View File

@ -11,8 +11,8 @@
<el-input v-model="queryParams.documentName" placeholder="请输入资料名称" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.documentName" placeholder="请输入资料名称" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery" v-hasPermi="['design:volumeCatalog:query']">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery" v-hasPermi="['design:volumeCatalog:query']">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-card> </el-card>
@ -71,7 +71,7 @@
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="图纸文件" align="center" prop="remark" width="150"> <el-table-column label="图纸文件" align="center" prop="remark" width="150">
<template #default="scope"> <template #default="scope">
<el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['out:monthPlan:remove']">查看文件</el-button> <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['design:volumeFile:query']">查看文件</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="200"> <el-table-column label="操作" align="center" fixed="right" width="200">
@ -82,7 +82,7 @@
v-if="scope.row.auditStatus != 'finish' && scope.row.auditStatus != 'termination' && scope.row.auditStatus != 'waiting'" v-if="scope.row.auditStatus != 'finish' && scope.row.auditStatus != 'termination' && scope.row.auditStatus != 'waiting'"
icon="Edit" icon="Edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['design:volumeCatalog:edit']" v-hasPermi="['design:volumeFile:edit']"
>修改</el-button >修改</el-button
> >
<el-button <el-button
@ -91,6 +91,7 @@
icon="Upload" icon="Upload"
@click="handleUpload(scope.row)" @click="handleUpload(scope.row)"
v-if="scope.row.auditStatus == 'draft' || scope.row.auditStatus == 'back'" v-if="scope.row.auditStatus == 'draft' || scope.row.auditStatus == 'back'"
v-hasPermi="['design:volumeFile:add']"
>上传图纸</el-button >上传图纸</el-button
> >
<el-button <el-button
@ -99,16 +100,9 @@
icon="edit" icon="edit"
@click="handleAudit(scope.row)" @click="handleAudit(scope.row)"
v-if="scope.row.auditStatus == 'draft' || scope.row.auditStatus == 'back'" v-if="scope.row.auditStatus == 'draft' || scope.row.auditStatus == 'back'"
v-hasPermi="['out:monthPlan:remove']"
>审核</el-button >审核</el-button
> >
<el-button <el-button link type="primary" icon="View" v-if="scope.row.auditStatus != 'draft'" @click="handleAuditView(scope.row)"
link
type="primary"
icon="View"
v-if="scope.row.auditStatus != 'draft'"
@click="handleAuditView(scope.row)"
v-hasPermi="['out:monthPlan:remove']"
>查看流程</el-button >查看流程</el-button
> >
<el-button <el-button

2
src/views/login.vue
View File

@ -2,7 +2,7 @@
<div class="login"> <div class="login">
<el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form"> <el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
<div class="title-box"> <div class="title-box">
<h3 class="title">新能源项目管理平台</h3> <h3 class="title">煤科建管平台</h3>
<lang-select /> <lang-select />
</div> </div>
<el-form-item v-if="tenantEnabled" prop="tenantId"> <el-form-item v-if="tenantEnabled" prop="tenantId">

9
src/views/materials/appointment/index.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="p-6 bg-gray-50 h100%"> <div class="p-6 bg-gray-50 main">
<div class="appWidth mx-auto mt-50 bg-white rounded-xl shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md"> <div class="appWidth mx-auto mt-38 bg-white rounded-xl shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md">
<!-- 表单标题区域 --> <!-- 表单标题区域 -->
<div class="bg-gradient-to-r from-blue-500 to-blue-600 text-white p-6"> <div class="bg-gradient-to-r from-blue-500 to-blue-600 text-white p-6">
<h2 class="text-2xl font-bold flex items-center"><i class="el-icon-user-circle mr-3"></i>人员配置</h2> <h2 class="text-2xl font-bold flex items-center"><i class="el-icon-user-circle mr-3"></i>人员配置</h2>
@ -12,7 +12,7 @@
<!-- 表单内容区域 --> <!-- 表单内容区域 -->
<el-form ref="leaveFormRef" :model="form" :rules="rules" label-width="120px" class="p-6 pt30 space-y-6 h75" :disabled="isDisabled"> <el-form ref="leaveFormRef" :model="form" :rules="rules" label-width="120px" class="p-6 pt30 space-y-6 h75" :disabled="isDisabled">
<!-- 设计负责人 --> <!-- 设计负责人 -->
<div class="fonts"> <div class="fonts w60% ma">
<el-form-item label="采购专员" prop="userId" class="mb-4"> <el-form-item label="采购专员" prop="userId" class="mb-4">
<el-select <el-select
v-model="form.userId" v-model="form.userId"
@ -185,6 +185,9 @@ onUnmounted(() => {
</script> </script>
<style lang="scss"> <style lang="scss">
.main {
height: calc(100vh - 90px);
}
.appWidth { .appWidth {
width: 50vw; width: 50vw;
max-width: 1200px; max-width: 1200px;

2
src/views/materials/cailiaoshebei/index.vue
View File

@ -125,7 +125,7 @@
> >
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button plain type="warning" icon="Finished" @click="handleAudit()" v-hasPermi="['out:monthPlan:remove']">审核</el-button> <el-button plain type="warning" icon="Finished" @click="handleAudit()">审核</el-button>
</el-col> </el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>

2
src/views/materials/materialsEquipment/materialIssue/index.vue
View File

@ -61,7 +61,7 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-tooltip content="查看" placement="top"> <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)" v-hasPermi="['materials:materialIssue:query']"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip content="修改" placement="top"> <el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['materials:materialIssue:edit']"></el-button> <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['materials:materialIssue:edit']"></el-button>

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

@ -69,7 +69,7 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-tooltip content="查看" placement="top"> <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)" v-hasPermi="['materials:materialReceive:query']"></el-button>
</el-tooltip> </el-tooltip>
<!-- <el-tooltip content="修改" placement="top"> <!-- <el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['materials:materialReceive:edit']"></el-button> <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['materials:materialReceive:edit']"></el-button>

19
src/views/materials/orderMaterials/index.vue
View File

@ -135,18 +135,7 @@
<el-option label="退货单" value="2" /> <el-option label="退货单" value="2" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="上传单据" prop="file" v-if="form.bo.materialStatus < 4 || form.bo.materialStatus == 10">
label="上传单据"
prop="file"
v-if="form.bo.materialStatus < 4 || form.bo.materialStatus == 10"
:rules="[
{
required: isFileRequired,
message: '请上传单据',
trigger: 'blur'
}
]"
>
<file-upload <file-upload
v-model="form.file" v-model="form.file"
:fileType="['pdf', 'png', 'jpg', 'jpeg']" :fileType="['pdf', 'png', 'jpg', 'jpeg']"
@ -385,7 +374,11 @@ const submitForm = () => {
}); });
if (fileUploadRef.value) { if (fileUploadRef.value) {
fileUploadRef.value!.submitUpload(); fileUploadRef.value!.submitUpload().then((res) => {
if (res == 'noFile') {
proxy?.$modal.msgError('请上传文件');
}
});
} else { } else {
await addCailiaoshebei(form.value.bo).finally(() => (buttonLoading.value = false)); await addCailiaoshebei(form.value.bo).finally(() => (buttonLoading.value = false));
dialog.visible = false; dialog.visible = false;

2
src/views/materials/purchaseDoc/index.vue
View File

@ -558,6 +558,8 @@ const listeningProject = watch(
queryParams.value.projectId = nid; queryParams.value.projectId = nid;
form.value.projectId = nid; form.value.projectId = nid;
getList(); getList();
getSupplierList();
getBatchList();
} }
); );

6
src/views/materials/repertory/index.vue
View File

@ -152,7 +152,11 @@ const data = reactive<PageData<RepertoryDetailsForm, RepertoryDetailsQuery>>({
params: {} params: {}
}, },
rules: { rules: {
id: [{ required: true, message: 'ID不能为空', trigger: 'blur' }] id: [{ required: true, message: 'ID不能为空', trigger: 'blur' }],
operationPhone: [
{ required: true, message: '请输入电话', trigger: 'blur' },
{ pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' }
]
} }
}); });

2
src/views/register.vue
View File

@ -2,7 +2,7 @@
<div class="register"> <div class="register">
<el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form"> <el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form">
<div class="title-box"> <div class="title-box">
<h3 class="title">新能源项目管理平台</h3> <h3 class="title">煤科建管平台</h3>
<lang-select /> <lang-select />
</div> </div>
<el-form-item v-if="tenantEnabled" prop="tenantId"> <el-form-item v-if="tenantEnabled" prop="tenantId">