项目立项申请获取数据

src/views/projectApply/projectApplication.vue

@@ -119,10 +119,10 @@
           min-width="10%">
           <template #default="scope">
             <div>
-              <!-- <span v-show="scope.row.typeid==options.sort[0].typeid">学生</span> -->
-              <!-- <span v-show="scope.row.typeid==options.sort[1].typeid">特色</span> -->
-              <!-- <span v-show="scope.row.typeid==options.sort[1].typeid">{{ scope.row.sort==0?'已建设':'待建设' }}</span> -->
-              <!-- <span v-show="scope.row.typeid==options.sort[0].typeid">{{ scope.row.sort==0?'创意组':'初创组' }}</span> -->
+              <!-- 特色创意空间建设 -->
+              <span v-if="scope.row.typeid=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'">{{ scope.row.sort==0?'已建设':'待建设' }}</span>
+              <!-- 学生创客项目 -->
+              <span v-if="scope.row.typeid=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'">{{ scope.row.sort==0?'创意组':'初创组' }}</span>
             </div>
           </template>
         </el-table-column>
@@ -145,7 +145,7 @@
           min-width="10%">
           <template #default="scope">
             <div>
-              {{ scope.row.phone!=null?scope.row.phone:"-" }}
+              {{ scope.row.phone!=null||scope.row.phone==''?scope.row.phone:"-" }}
             </div>
           </template>
         </el-table-column>
@@ -267,30 +267,30 @@
         
           <div class="diaTit">
               <div class="addDialogLogo">LOGO</div>
-              <div class="spans">项目名称</div>
-              <div class="spanCon">:{{ auditDialog.projectName }}</div>
-              <div class="spans" style="margin-left: 30px;">项目负责人</div>
-              <div class="spanCon">:{{ auditDialog.person }}</div>
+              <div class="spans">项目名称：</div>
+              <div class="spanCon">{{ auditDialog.projectName }}</div>
+              <div class="spans">项目负责人：</div>
+              <div class="spanCon">{{ auditDialog.person }}</div>
           </div>
 
             <div class="diaTit1">
               <div class="spans1">所在部门</div>
               <div>
-                <el-input v-model="auditDialog.department" placeholder="信通学院"></el-input>
+                <el-input disabled v-model="auditDialog.department" placeholder="所在部门"></el-input>
               </div>
             </div>
 
             <div class="diaTit1">
               <div class="spans1">预算总经费</div>
               <div>
-                <el-input v-model="auditDialog.fund" placeholder="6000"></el-input>
+                <el-input disabled v-model="auditDialog.fund" placeholder="预算总经费"></el-input>
               </div>
             </div>
 
             <div class="diaTit1">
               <div class="spans1">联系电话</div>
               <div>
-                <el-input v-model="auditDialog.tel" placeholder="13854449525"></el-input>
+                <el-input disabled v-model="auditDialog.tel" placeholder="联系电话"></el-input>
               </div>
             </div>
             <div slot="footer" class="dialog-footer">
@@ -403,8 +403,8 @@ import downloadFile from '@/components/tool/downloadFile.js';
             this.auditDialog.projectName=val.title;
             this.auditDialog.person=val.pro_leader;
             this.auditDialog.department=val.name;
-            this.auditDialog.fund=val.money;
-            this.auditDialog.tel=val.phone;
+            this.auditDialog.fund=val.fund;
+            this.auditDialog.tel=val.phone || '-';
           }
             
             
@@ -496,14 +496,11 @@ import downloadFile from '@/components/tool/downloadFile.js';
           this.ajax    
             .get(this.$store.state.api+'/SelectAllProject',param)
               .then(res=>{
-                console.log(res);
-                // this.loading = false;
                 let data=res.data;
                 if (data[0].length==0 && data[5][0]['total'] != 0) {
                   this.table.currentPage=1
                   return this.getData()
                 }
-                console.log(data);
                 let a=this.options;
                 this.tableData=data[0];
                 a.projectFilter=data[1];
@@ -701,9 +698,9 @@ import downloadFile from '@/components/tool/downloadFile.js';
             width: 100%;
             display: flex;
             .spans{
-              width: 84px;
+              width: auto;
               font-size: 16px;
-              margin-right: 10px;
+              // margin-right: 10px;
               display: inline-block;
               text-align: justify;
               color: #000;