From 3f588d0846a38b8b75cf6c61af7d3e4b8bb2862d Mon Sep 17 00:00:00 2001
From: Teo <2642673902@qq.com>
Date: Fri, 15 Aug 2025 17:25:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                             |  2 +-
 src/views/materials/appointment/index.vue    |  9 ++++++---
 src/views/materials/orderMaterials/index.vue | 19 ++++++-------------
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/.env.development b/.env.development
index fe20df3..d56a5f3 100644
--- a/.env.development
+++ b/.env.development
@@ -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'
 
 # 无人机接口地址
 
diff --git a/src/views/materials/appointment/index.vue b/src/views/materials/appointment/index.vue
index 3bd6d79..275a232 100644
--- a/src/views/materials/appointment/index.vue
+++ b/src/views/materials/appointment/index.vue
@@ -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-40 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;
diff --git a/src/views/materials/orderMaterials/index.vue b/src/views/materials/orderMaterials/index.vue
index ef93076..9612746 100644
--- a/src/views/materials/orderMaterials/index.vue
+++ b/src/views/materials/orderMaterials/index.vue
@@ -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;