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:
taoge1020
2025-08-15 19:15:19 +08:00
parent d5092e7a58 2e24c41b60
commit 0df7221c10
7 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@ -5,7 +5,7 @@ VITE_APP_TITLE = 新能源项目管理平台
VITE_APP_ENV = 'development'
# 开发环境
VITE_APP_BASE_API = 'http://192.168.110.159:8898'
VITE_APP_BASE_API = 'http://192.168.110.163:8898'
# 无人机接口地址

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-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="Search" @click="handleQuery" v-hasPermi="['design:volumeCatalog:query']">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery" v-hasPermi="['design:volumeCatalog:query']">重置</el-button>
</el-form-item>
</el-form>
</el-card>
@ -71,7 +71,7 @@
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="图纸文件" align="center" prop="remark" width="150">
<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>
</el-table-column>
<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'"
icon="Edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['design:volumeCatalog:edit']"
v-hasPermi="['design:volumeFile:edit']"
>修改</el-button
>
<el-button
@ -91,6 +91,7 @@
icon="Upload"
@click="handleUpload(scope.row)"
v-if="scope.row.auditStatus == 'draft' || scope.row.auditStatus == 'back'"
v-hasPermi="['design:volumeFile:add']"
>上传图纸</el-button
>
<el-button
@ -99,16 +100,9 @@
icon="edit"
@click="handleAudit(scope.row)"
v-if="scope.row.auditStatus == 'draft' || scope.row.auditStatus == 'back'"
v-hasPermi="['out:monthPlan:remove']"
>审核</el-button
>
<el-button
link
type="primary"
icon="View"
v-if="scope.row.auditStatus != 'draft'"
@click="handleAuditView(scope.row)"
v-hasPermi="['out:monthPlan:remove']"
<el-button link type="primary" icon="View" v-if="scope.row.auditStatus != 'draft'" @click="handleAuditView(scope.row)"
>查看流程</el-button
>
<el-button

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

@ -1,6 +1,6 @@
<template>
<div class="p-6 bg-gray-50 h100%">
<div class="appWidth mx-auto mt-50 bg-white rounded-xl shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md">
<div class="p-6 bg-gray-50 main">
<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">
<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">
<!-- 设计负责人 -->
<div class="fonts">
<div class="fonts w60% ma">
<el-form-item label="采购专员" prop="userId" class="mb-4">
<el-select
v-model="form.userId"
@ -185,6 +185,9 @@ onUnmounted(() => {
</script>
<style lang="scss">
.main {
height: calc(100vh - 90px);
}
.appWidth {
width: 50vw;
max-width: 1200px;

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

@ -125,7 +125,7 @@
>
</el-col>
<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>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</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">
<template #default="scope">
<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 content="修改" placement="top">
<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">
<template #default="scope">
<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 content="修改" placement="top">
<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-select>
</el-form-item>
<el-form-item
label="上传单据"
prop="file"
v-if="form.bo.materialStatus < 4 || form.bo.materialStatus == 10"
:rules="[
{
required: isFileRequired,
message: '请上传单据',
trigger: 'blur'
}
]"
>
<el-form-item label="上传单据" prop="file" v-if="form.bo.materialStatus < 4 || form.bo.materialStatus == 10">
<file-upload
v-model="form.file"
:fileType="['pdf', 'png', 'jpg', 'jpeg']"
@ -385,7 +374,11 @@ const submitForm = () => {
});
if (fileUploadRef.value) {
fileUploadRef.value!.submitUpload();
fileUploadRef.value!.submitUpload().then((res) => {
if (res == 'noFile') {
proxy?.$modal.msgError('请上传文件');
}
});
} else {
await addCailiaoshebei(form.value.bo).finally(() => (buttonLoading.value = false));
dialog.visible = false;