合并

.env.development

@@ -6,11 +6,11 @@ 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.188:8899'
 # 朱银
 # VITE_APP_BASE_API = 'http://192.168.110.180:8899'
 

src/views/design/received/index.vue

@@ -17,6 +17,7 @@
               <el-select
                 :disabled="disabledAll"
                 v-model="form.userId"
+                filterable
                 placeholder="请选择收资人"
                 class="w-full transition-all duration-300 border-gray-300 focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
               >
@@ -93,6 +94,7 @@
                   <el-select
                     :disabled="disabledAll"
                     v-model="item.userId"
+                    filterable
                     placeholder="请选择人员"
                     class="w-full transition-all duration-300 border-gray-300 focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
                   >
@@ -181,6 +183,7 @@ import { systemUserList } from '@/api/design/appointment';
 import { collectBatch, byProjectId, exportWord } from '@/api/design/received';
 import { getUser } from '@/api/system/user';
 import type { ComponentInternalInstance, ElFormInstance } from 'element-plus';
+import { getInfo } from '@/api/login';
 
 // 全局实例与状态管理
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -202,7 +205,7 @@ const disabledAll = ref(false); // 表单是否全部禁用
 const form = reactive({
   projectId: currentProject.value?.id,
   userId: '', // 收资人
-  user_major: '', // 专业
+  user_major: '1', // 专业
   phone: '', // 电话
   email: '', // 邮箱
   id: '', // 表单ID
@@ -273,6 +276,8 @@ const byProjectIdAll = async () => {
     disabledAll.value = false;
 
     if (res.code == 200 && res.data) {
+      console.log('🚀 ~ byProjectIdAll ~ res:', res);
+
       const data = res.data;
       // 回显基本信息
       form.userId = data.userId || '';
@@ -415,7 +420,7 @@ const onView = () => {
 /** 获取当前用户详情（回显个人信息） */
 const getUserDetail = async () => {
   try {
-    const res = await getUser(userId.value);
+    const res = await getInfo();
     if (res.data?.user) {
       form.userId = res.data.user.userId;
       form.phone = res.data.user.phonenumber || '';

src/views/out/monthPlan/index.vue

@@ -40,9 +40,9 @@
       <el-table v-loading="loading" :data="monthPlanList">
         <el-table-column type="index" label="序号" width="55" align="center" />
         <el-table-column label="计划月份" align="center" prop="planMonth" />
-        <el-table-column label="计划产值" align="center" prop="planValue" />
+        <el-table-column label="计划产值(元)" align="center" prop="planValue" />
-        <el-table-column label="完成产值" align="center" prop="completeValue" />
+        <el-table-column label="完成产值(元)" align="center" prop="completeValue" />
-        <el-table-column label="差额" align="center" prop="differenceValue" />
+        <el-table-column label="差额(元)" align="center" prop="differenceValue" />
         <el-table-column label="产值类型" align="center" prop="valueType">
           <template #default="scope">
             <dict-tag :options="out_value_type" :value="scope.row.valueType" />
@@ -72,17 +72,17 @@
     </el-card>
     <!-- 添加或修改月度产值计划对话框 -->
     <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="monthPlanFormRef" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="monthPlanFormRef" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="类型" prop="planValue">
           <el-select v-model="form.type" placeholder="请选择类型">
             <el-option label="对甲" value="1" />
             <el-option label="对乙" value="2" />
           </el-select>
         </el-form-item>
-        <el-form-item label="计划产值" prop="planValue">
+        <el-form-item label="计划产值(元)" prop="planValue">
           <el-input v-model="form.planValue" placeholder="请输入计划产值" type="number" />
         </el-form-item>
-        <el-form-item label="计划月份" prop="planMonth">
+        <el-form-item label="计划月份(元)" prop="planMonth">
           <el-date-picker v-model="form.planMonth" type="month" value-format="YYYY-MM" placeholder="请选择计划月份" />
         </el-form-item>
         <el-form-item label="产值类型" prop="valueType">

src/views/out/monthPlanAudit/index.vue

@@ -32,10 +32,10 @@
 
       <el-table v-loading="loading" :data="monthPlanAuditList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="设计产值" align="center" prop="designValue" />
+        <el-table-column label="设计产值(元)" align="center" prop="designValue" />
-        <el-table-column label="采购产值" align="center" prop="purchaseValue" />
+        <el-table-column label="采购产值(元)" align="center" prop="purchaseValue" />
-        <el-table-column label="施工产值" align="center" prop="constructionValue" />
+        <el-table-column label="施工产值(元)" align="center" prop="constructionValue" />
-        <el-table-column label="总产值" align="center" prop="totalValue" />
+        <el-table-column label="总产值(元)" align="center" prop="totalValue" />
         <el-table-column label="计划月份" align="center" prop="planMonth" />
       </el-table>
 
@@ -44,16 +44,16 @@
     <!-- 添加或修改审核通过月度产值计划对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="monthPlanAuditFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="设计产值" prop="designValue">
+        <el-form-item label="设计产值(元)" prop="designValue">
           <el-input v-model="form.designValue" placeholder="请输入设计产值" />
         </el-form-item>
-        <el-form-item label="采购产值" prop="purchaseValue">
+        <el-form-item label="采购产值(元)" prop="purchaseValue">
           <el-input v-model="form.purchaseValue" placeholder="请输入采购产值" />
         </el-form-item>
-        <el-form-item label="施工产值" prop="constructionValue">
+        <el-form-item label="施工产值(元)" prop="constructionValue">
           <el-input v-model="form.constructionValue" placeholder="请输入施工产值" />
         </el-form-item>
-        <el-form-item label="总产值" prop="totalValue">
+        <el-form-item label="总产值(元)" prop="totalValue">
           <el-input v-model="form.totalValue" placeholder="请输入总产值" />
         </el-form-item>
         <el-form-item label="计划月份" prop="planMonth">

src/views/tender/supplierInput/index.vue

@@ -277,7 +277,7 @@
             <el-form-item label="入库资料" prop="inputFile">
               <template #label> <span class="text-red">*</span> 入库资料 </template>
               <file-upload
-                v-model="form.inputFile"
+                v-model="form.fileId"
                 :fileType="['doc', 'docx', 'pdf']"
                 :autoUpload="false"
                 ref="fileUploadRef"
@@ -289,22 +289,7 @@
                 @handleChange="change"
                 showFileList
               >
-                <div>
+                <div><el-button type="primary">上传文件</el-button><br /></div>
-                  <el-button type="primary">上传文件</el-button><br />
-                  <transition-group
-                    class="upload-file-list el-upload-list el-upload-list--text"
-                    name="el-fade-in-linear"
-                    tag="ul"
-                    @click.stop
-                    v-if="fileUrl"
-                  >
-                    <li style="margin-top: 10px" class="el-upload-list__item ele-upload-list__item-content">
-                      <el-link :href="`${fileUrl}`" :underline="false" target="_blank">
-                        <el-button class="el-icon-document"> 查看文件 </el-button>
-                      </el-link>
-                    </li>
-                  </transition-group>
-                </div>
               </file-upload>
             </el-form-item>
           </el-col>