Ver Fonte

项目管理 基本内容 详情页面

yuanyiming há 2 anos atrás
pai
commit
4939fb7836

+ 1 - 2
src/views/home.vue

@@ -100,10 +100,9 @@
               }
             }
             .main {
-              // height: 100%;
               background-color: #fff;
               color: #333;
-              text-align: center;
+              // text-align: center;
               margin-left: 20px;
               border-radius: 5px;
             }

+ 1 - 4
src/views/projectApply/projectApplication2.vue

@@ -93,7 +93,7 @@ import { VueEditor } from "vue2-editor";
           backBtn(){
             this.$router.push('/projectApplicationApply2')
           },
-          audit(){   //立即审核按钮
+          audit(){   //立即修改按钮
             this.submitHint=true
           },
           submitAll(){
@@ -123,11 +123,8 @@ import { VueEditor } from "vue2-editor";
               this.ajax
                     .get(this.$store.state.api+'/GetProjectDetailMessage',param)
                     .then(res=>{
-                      // console.log(res)
                       let GetData=JSON.parse(res.data[0][0].chapters)
-                      // console.log(GetData)
                       this.data=GetData
-                      // console.log(this.data);
                     },err=>{
                       console.log(err);
                     })

+ 6 - 7
src/views/projectApply/projectApplicationApply.vue

@@ -308,14 +308,14 @@
       },
       
       methods:{
-        getFile(val) {
-            console.log( val);
+        getFile(val) {       //上传封面
+            // console.log( val);
             let data=[{
               name:val.fileName,
               url:val.url
             }]
             this.data.fileList=data
-            console.log(this.data.fileList);
+            // console.log(this.data.fileList);
         },
         // submitUpload() {
         //   this.$refs.upload.submit();
@@ -338,7 +338,7 @@
                 return  this.data.telVerify=false;
             }
             if (value == this.data.Member.phone || value == this.data.Member2.phone) {
-              console.log(222);
+              // console.log(222);
               return  this.data.telVerify2=false;
             }
           }else{
@@ -346,7 +346,7 @@
                  this.data.telVerify=true;
             }
             if (value == this.data.Member.phone || value == this.data.Member2.phone) {
-              console.log(111);
+              // console.log(111);
               return  this.data.telVerify2=true;
             }
           }
@@ -377,8 +377,7 @@
         commit(){   //确定添加成员  
               if (this.data.Member.name =="" ||this.data.Member.name==undefined) return this.$message.error('请输入姓名')
               if (this.data.Member.class=="" ||this.data.Member.class==undefined) return this.$message.error('请输入班级')
-              // if (!this.data.telVerify2) return this.$message.error('请输入正确联系号码格式')
-              if (!this.data.telVerify2) return this.$message.error('4156465')
+              if (!this.data.telVerify2) return this.$message.error('请输入正确联系电话格式')
 
               this.addPerson();
               this.init()

+ 8 - 4
src/views/projectApply/projectApplicationApplyMain.vue

@@ -89,7 +89,9 @@
                     phone:'',
                     score:'0'
                 },
-                tableData:[],  //成员列表
+                tableData:[ //成员列表
+                  
+                ], 
                 fileList:[]   //封面
             },
             projectApplicationApply2:{  //项目内容页面
@@ -157,10 +159,11 @@
             },
             addPerson(){  //立项基础信息页面添加人员
               let a=this.projectApplicationApply1
+              a.tableData.push(a.Member);
               // a.addMemberDialog=false;
               a.Member.id=uuid.v1()
-              a.tableData.push(a.Member);
               this.$message.success('添加成功')
+              console.log(a.Member);
               a.Member={}
             },
 
@@ -172,6 +175,7 @@
                     if(e.id==a.Member2.id) {
                       Object.assign(e,a.Member2)
                       this.$message.success('修改成功')
+                      console.log(e);
                       a.amendMemberDialog=false;
                     }
                })
@@ -241,7 +245,7 @@
               p.dialog={};
             },
             submitBtn(){   //预算经费页面提交按钮
-                console.log("提交啦");
+                // console.log("提交啦");
                 this.submitHint = true;
             },
             submitAll(){
@@ -297,7 +301,7 @@
                 this.ajax
                       .post(this.$store.state.api+'/CreateProject',param)
                       .then(res=>{
-                        console.log(res)
+                        // console.log(res)
                         if(res.data==1){
                           this.$message.success("创建成功")
                           this.$router.push('projectApplication')

+ 4 - 5
src/views/projectApply/projectApplicationDetails.vue

@@ -285,16 +285,15 @@
           addMemberDialog:false,
           submitHint:false,
           select:{    //数据详情框数据
-            project:'疯狂星期四',   
-            person:'袁一鸣',
+            project:'',   
+            person:'',
             departmentData:"",  //部门框值
             sort:'',     //分类值
-            tel:'17739460368',
+            tel:'',
             Date:'',
-            Fund:'200000',
+            Fund:'',
             sortOptions: [], //分类下拉框
             department:[],
-          
           },
           textarea:'周四福利大放送',   //项目简介
 

+ 8 - 4
src/views/projectManage/ProjectManagement.vue

@@ -104,11 +104,13 @@
               <div>项目编号{{ index }}</div>
             </div>
         </div>
-        <div class="classBlockBtn">
-              <el-button type="primary" class="bt1" size="mini" @click="scheduleDetail">进度详情</el-button>
+
+            <div class="classBlockBtn">
+              <el-button type="primary" class="bt1" size="mini" @click="scheduleDetail(item.courseId)">进度详情</el-button>
               <el-button type="primary" class="bt1" size="mini" @click="fundStatus">资金情况</el-button>
               <el-button type="primary" class="bt1" size="mini" @click="finish">结项</el-button>
-        </div>
+            </div>
+       
       </div>
     </div>
 <!-- 循环展示框列表结束 -->
@@ -172,7 +174,9 @@
         }
       },
       methods:{
-        scheduleDetail(){      //进度详情
+        scheduleDetail(val){      //进度详情
+          console.log(val);
+          localStorage.setItem('pid',JSON.stringify(val))
           this.$router.push('/ProjectManagement1')
         },
         fundStatus(){     //资金情况

+ 87 - 34
src/views/projectManage/ProjectManagement1.vue

@@ -23,29 +23,29 @@
      <div class="select">
               <div class="selectTop">
                 <div class="label">项目名称</div>
-                <el-input v-model="input" placeholder="请输入内容"></el-input>
+                <el-input v-model="select.project" disabled placeholder="请输入内容"></el-input>
               </div>
               <div class="selectMid">
                 <div class="selectLeft">
                
                     <div class="inpBlock">
                         <div class="label">负责人</div>
-                        <el-input v-model="input" placeholder="请输入内容"></el-input>
+                        <el-input v-model="select.person" disabled placeholder="请输入内容"></el-input>
                     </div>
                     <div class="inpBlock">
                         <div class="label">所在部门</div>
-                        <el-select v-model="input" style="width: 100%;" placeholder="请选择">
+                        <el-select v-model="select.departmentData" disabled style="width: 100%;" placeholder="请选择">
                           <el-option
-                            v-for="item in options"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
+                            v-for="item in select.department"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id">
                           </el-option>
                         </el-select>
                     </div>
                     <div class="inpBlock">
                         <div class="label">联系电话</div>
-                        <el-input v-model="input" placeholder="请输入内容"></el-input>
+                        <el-input v-model="select.tel" disabled placeholder="请输入内容"></el-input>
                     </div>
                 </div>
 
@@ -53,21 +53,22 @@
                   <div class="inpBlock">
                         <div class="label">项目开始时间</div>
                         <el-date-picker
-                          v-model="value"
-                          type="date"
+                          v-model="select.Date"
+                          type="datetime"
+                          disabled
                           style="width: 100%;"
                           placeholder="选择日期">
                         </el-date-picker>
                     </div>
                     <div class="inpBlock">
                         <div class="label">预算总经费</div>
-                        <el-input v-model="input" placeholder="请输入内容"></el-input>
+                        <el-input v-model="select.Fund" disabled placeholder="请输入内容"></el-input>
                     </div>
                     <div class="inpBlock">
                         <div class="label">选择分类</div>
-                        <el-select v-model="input" style="width: 100%;" placeholder="请选择">
+                        <el-select v-model="select.sort" disabled style="width: 100%;" placeholder="请选择">
                           <el-option
-                            v-for="item in options"
+                            v-for="item in select.sortOptions"
                             :key="item.id"
                             :label="item.name"
                             :value="item.id">
@@ -94,7 +95,7 @@
         >
        
         <el-table-column
-          prop="Name"
+          prop="name"
           label="姓名"
           align="center"
           >
@@ -107,7 +108,7 @@
         </el-table-column>
 
         <el-table-column
-          prop="tel"
+          prop="phone"
           label="电话"
           align="center"
           >
@@ -120,19 +121,17 @@
           >
         </el-table-column>
         
-        <el-table-column
+        <!-- <el-table-column
           prop="operation"
           align="center"
           label="操作"
           >
-          <!-- <template #default="scope"> -->
+          <template #default="scope">
               <div class="operations">
-                  <!-- <el-button type="primary" > -->
                       <el-button type="primary" class="bt1" size="mini" style="background: #477edd">查看详情</el-button>
-                  <!-- </el-button> -->
               </div>
-          <!-- </template> -->
-        </el-table-column>
+          </template>
+        </el-table-column> -->
       </el-table>
     <!-- 项目成员区域结束 -->
 
@@ -144,7 +143,7 @@
     <div class="pmProgressTextArea">
       <el-input
         type="textarea"
-        :rows="5"
+        :rows="6"
         class="textArea"
         resize="none"
         placeholder="请输入内容"
@@ -162,21 +161,73 @@
           options: [{
             value: '选项1',
             label: '中德学院'
-          }],
+        }],
+          select:{    //数据详情框数据
+            project:'',   
+            person:'',
+            departmentData:"",  //部门框值
+            sort:'',     //分类值
+            tel:'',
+            Date:'',
+            Fund:'',
+            sortOptions: [], //分类下拉框
+            department:[],
+          },
           value: '中德学院',
           input:'',
-          textarea:'',
-          tableData:[{
-            Name:'徐晓慧',
-            class:'22电子通信G5',
-            tel:'13751177411',
-            score:'-',
-          }
-          ],
+          textarea:'',     //项目简介
+          tableData:[],   //项目成员列表
         }
       },
       methods:{
-        content(){
+        getData(){   //初始化完成获取基本数据进行填充
+          let param={
+            uid:this.$store.state.userInfo.userid,
+            pid:JSON.parse(localStorage.getItem('pid'))
+          }
+            this.ajax
+                  .get(this.$store.state.api+'/GetProjectBase',param)
+                  .then(res=>{
+                    console.log(res);
+                    let data=res.data[0][0]
+                    this.select.project=data.title;
+                    this.select.Fund=data.money;
+                    this.select.person=data.pro_leader;
+                    this.select.Date=data.begintime;
+                    this.textarea=data.brief;
+                    this.tableData=JSON.parse(data.course_student) 
+                    this.select.tel=data.phone;
+                    this.select.departmentData = data['classid']
+                    this.select.sort = data['typeid']
+                  },err=>{
+                    console.log(err);
+                  })
+        },
+        getProjectDepartmentData(){  //获取项目立项申请基础信息页面所在部门数据
+              let param={
+                uid:this.$store.state.userInfo.userid
+              }
+                this.ajax
+                      .get(this.$store.state.api+'/SelectAllDepartment',param)
+                      .then(res=>{
+                        this.select.department=res.data[0]
+                      },err=>{
+                        console.log(err);
+                      })
+            },
+        getProjectTypeData(){  //获取项目立项申请基础信息页面分类数据
+          let param={
+            uid:this.$store.state.userInfo.userid
+          }
+            this.ajax
+                  .get(this.$store.state.api+'/SelectAllType',param)
+                  .then(res=>{
+                    this.select.sortOptions=res.data[0]
+                  },err=>{
+                    console.log(err);
+                  })
+        },
+          content(){
             this.$router.push('/ProjectManagement1')
           },
           remark(){
@@ -200,8 +251,10 @@
         },
        
       },
-      created(){
-        // this.value=(this.options[0].value)
+      mounted(){
+        this.getData();
+        this.getProjectDepartmentData();
+        this.getProjectTypeData();
       }
     }
 </script>

+ 47 - 79
src/views/projectManage/ProjectManagement2.vue

@@ -21,14 +21,8 @@
      
       <div class="PA2textArea">
         <div class="PA2textAreaTit">项目创新点</div>
-        <el-input
-        type="textarea"
-        :rows="6"
-        resize="none"
-        class="textArea"
-        placeholder="请输入内容"
-        v-model="textarea">
-        </el-input>
+        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][0]"></vue-editor>
+       
       </div>
       <div class="PA2mid">
         预期取得成果
@@ -36,98 +30,69 @@
       
       <div class="PA2textArea">
         <div class="PA2textAreaTit PA2textAreaTit2">一、项目预期成果、数量及形式</div>
-        <el-input
-        type="textarea"
-        :rows="6"
-        class="textArea"
-        resize="none"
-        placeholder="请输入内容"
-        v-model="textarea">
-        </el-input>
+        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][1]"></vue-editor>
+        
       </div>
       <div class="PA2textArea">
         <div class="PA2textAreaTit PA2textAreaTit2">二、创客人才培养预期成果、数量</div>
-        <el-input
-        type="textarea"
-        :rows="6"
-        class="textArea"
-        resize="none"
-        placeholder="请输入内容"
-        v-model="textarea">
-        </el-input>
+        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][2]"></vue-editor>
+       
       </div>
       <div class="PA2textArea">
         <div class="PA2textAreaTit PA2textAreaTit2">三、项目预期孵化、转化创业项目情况</div>
-        <el-input
-        type="textarea"
-        :rows="6"
-        class="textArea"
-        resize="none"
-        placeholder="请输入内容"
-        v-model="textarea">
-        </el-input>
+        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][3]"></vue-editor>
+       
       </div>
       <div class="PA2textArea">
         <div class="PA2textAreaTit">项目实施计划</div>
-        <el-input
-        type="textarea"
-        :rows="6"
-        class="textArea"
-        resize="none"
-        placeholder="请输入内容"
-        v-model="textarea">
-        </el-input>
+        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][4]"></vue-editor>
+       
       </div>
-      <div class="baseBtn">
+      <!-- <div class="baseBtn">
         <div class="blockWidth">
           <el-button type="primary" class="backBtn" @click="backBtn2">返回</el-button>
         </div>
-      </div>
+      </div> -->
   
     </div>
   </template>
   
   <script>
+import { VueEditor } from "vue2-editor";
+
       export default {
+        components:{
+          VueEditor
+        },
         data() {
           return {
-            textarea:'',
-            options: [{
-              value: '选项1',
-              label: '中德学院'
-            }],
-            value: '中德学院',
-           input:'3D智能演奏工具',
-            tableData:[{
-              Name:'徐晓慧',
-              class:'22电子通信G5',
-              tel:'13751177411',
-              score:'-',
-            },
-            {
-              Name:'林凡文',
-              class:'22电子通信G5',
-              tel:'13751177411',
-              score:'-',
-            },
-            {
-              Name:'林凡文',
-              class:'22电子通信G5',
-              tel:'13751177411',
-              score:'-',
-            },
+            data:[["","","","",""],[]],
+            submitHint:false,
+            customToolbar: [
+              ["bold", "italic", "underline"], [{ list: "ordered" }, { list: "bullet" }],
+              [{ align: "" }, { align: "center" }, { align: "right"}, { align: "justify"}],
+              [{header:[false,1,2,3,4]}]
             ],
-            pavalues:{
-              value:'',
-              value1:'',
-              value2:'',
-              value3:'',
-              value4:'',
-  
-            }
           }
         },
         methods:{
+          getData(){   //初始化完成获取基本数据进行填充
+            let param={
+              uid:this.$store.state.userInfo.userid,
+              pid:JSON.parse(localStorage.getItem('pid'))
+            }
+              this.ajax
+                    .get(this.$store.state.api+'/GetProjectDetailMessage',param)
+                    .then(res=>{
+                      // console.log(res)
+                      let GetData=JSON.parse(res.data[0][0].chapters)
+                      // console.log(GetData)
+                      this.data=GetData
+                      // console.log(this.data);
+                    },err=>{
+                      console.log(err);
+                    })
+          },
           content(){
             this.$router.push('/ProjectManagement1')
           },
@@ -146,9 +111,9 @@
           edit(){
   
           },
-          backBtn2(){
-            this.$router.push('/ProjectManagement1')
-          },
+          // backBtn2(){
+          //   this.$router.push('/ProjectManagement1')
+          // },
           handleSelectionChange(val) {
             this.multipleSelection = val;
           },
@@ -157,7 +122,7 @@
           },
         },
         created(){
-          this.value=(this.options[0].value)
+          this.getData();
         }
       }
   </script>
@@ -190,5 +155,8 @@
         margin-bottom: 10px;
         color: #2387ff;
     }
+    .homePage .homeBody .main[data-v-7eb2bc79]{
+      text-align: left !important;
+    }
   }
   </style>

+ 1 - 17
src/views/projectManage/ProjectManagement3.vue

@@ -98,23 +98,7 @@
       export default {
         data() {
           return {
-            tableData:[{
-            projectName:'创业孵化基地企业情况信息表',
-            section:'信通',
-            date:'2022年11月12日',
-            fund:'50k',
-            relationProject:'人工智能',
-            person:'姬发',
-            },
-            {
-              projectName:'围棋培训',
-              section:'信通',
-              date:'2022年11月12日',
-              fund:'50k',
-              relationProject:'围棋',
-              person:'柯洁',
-            }
-            ],
+            tableData:[],    //项目列表数据
           }
         },
         methods:{