From 43c9cb03d33c7cfb3abe1110427494ebb6f8ca61 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Thu, 23 May 2024 20:48:09 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/summary/add.vue   | 16 ++++++++--------
 src/views/project-demand/summary/index.vue |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index c75fd9a..4f36ca3 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -46,12 +46,12 @@
             </el-config-provider>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="所属公司" prop="affiliatedCompanyId">
-            <el-tree-select v-model="formData.affiliatedCompanyId" :data="companyOption" style="width: 100%;"
-                            filterable clearable :check-strictly="true" multiple/>
-          </el-form-item>
-        </el-col>
+<!--        <el-form-item label="所属公司" prop="affiliatedCompanyId">-->
+<!--          <el-tree-select v-model="formData.affiliatedCompanyId" :data="companyOption" style="width: 100%;"-->
+<!--                          filterable clearable :check-strictly="true"/>-->
+<!--        </el-form-item>-->
+<!--        </el-col>  <el-col :span="12">-->
+
         <el-col :span="12">
           <el-form-item label="项目类型" prop="projectType">
             <el-select v-model="formData.projectType" placeholder="请选择项目类型" clearable filterable>
@@ -263,7 +263,7 @@ const rules = reactive({
   specialFund: [{required: true, message: '请选择专项资金', trigger: 'blur'}],
   startTime: [{required: true, message: '请选择开始时间', trigger: 'blur'}],
   rdSubject: [{required: true, message: '请输入研发主体', trigger: 'blur'}],
-  affiliatedCompanyId: [{required: true, message: '请输入所属公司', trigger: 'blur'}],
+  // affiliatedCompanyId: [{required: true, message: '请输入所属公司', trigger: 'blur'}],
   projectType: [{required: true, message: '请选择项目类型', trigger: 'blur'}],
   endTime: [{required: true, message: '请选择结束时间', trigger: 'blur'}],
   investmentType: [{required: true, message: '请选择出资类型', trigger: 'blur'}],
@@ -359,7 +359,7 @@ const handleSubmit = async (instance) => {
     "resultForm": "3",
     "projectImpact": "3",
     "rdSubject": "3",
-    "affiliatedCompanyId": formData.value.affiliatedCompanyId,
+    // "affiliatedCompanyId": formData.value.affiliatedCompanyId,
     "serviceDescription": "3",
     "contentDescription": "3",
     "specialFundAmount": "3",
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index 9d8dfac..04a6db5 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -123,7 +123,7 @@ const tableConfig = reactive({
       currentRender: ({row, index}) => {
         let btn = []
         let buttons = new Set(Array.from(row.buttons))
-        if (buttons.has("detail")) {
+        if (buttons.has("details")) {
           btn.push({label: '详情', prem: ['mosr:collect:info'], func: () => handleDetail(row), type: 'primary'})
         }
         if (buttons.has("edit")) {
@@ -132,7 +132,7 @@ const tableConfig = reactive({
         // if (buttons.has("delete")) {
         //   btn.push({label: '删除',prem: ['mosr:requirement:del'], func: () => handleEdit(row), type: 'primary'})
         // }
-        if (buttons.has("reported")) {
+        if (buttons.has("report")) {
           btn.push({label: '上报',prem: ['mosr:collect:reported'], func: () => handleAdd(row), type: 'primary'})
         }
         return (