Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	ys_vue/index.html

cloud-model/src/main/java/com/hssx/cloudmodel/controller/ProjectController.java

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
+
 import javax.servlet.http.HttpServletRequest;
 
 
@@ -22,7 +23,7 @@ import javax.servlet.http.HttpServletRequest;
  */
 @Controller
 @RequestMapping("/project")
-public class ProjectController{
+public class ProjectController {
     @Autowired
     private ProjectService projectService;
     @Autowired
@@ -42,15 +43,15 @@ public class ProjectController{
     @ApiOperation("添加/修改项目")
     @RequestMapping("/add")
     @ResponseBody
-    public HttpRespMsg addAndUpdateProject(Project project, HttpServletRequest request, Integer flag,String customerCompanyIds,
-                                           @RequestParam(required = false)Integer customerApproverId,String customerCompanyNames,
-                                           @RequestParam(required = false)Integer ownerApproverId,String modelIds,
-                                            String token,@RequestParam(required = false) String userIds) {
+    public HttpRespMsg addAndUpdateProject(Project project, HttpServletRequest request, Integer flag, String customerCompanyIds,
+                                           @RequestParam(required = false) Integer customerApproverId, String customerCompanyNames,
+                                           @RequestParam(required = false) Integer ownerApproverId, String modelIds,
+                                           String token, @RequestParam(required = false) String userIds) {
         HttpRespMsg msg = new HttpRespMsg();
         QueryWrapper<User> qw = new QueryWrapper<>();
-        qw.eq("head_imgurl",token);
+        qw.eq("head_imgurl", token);
         User user = userService.getOne(qw);
-        msg = projectService.addAndUpdateProject(project, flag, user,userIds,customerCompanyIds,customerCompanyNames,modelIds,ownerApproverId,customerApproverId);
+        msg = projectService.addAndUpdateProject(project, flag, user, userIds, customerCompanyIds, customerCompanyNames, modelIds, ownerApproverId, customerApproverId);
         return msg;
     }
 
@@ -65,32 +66,35 @@ public class ProjectController{
     @ResponseBody
     public HttpRespMsg list(@RequestParam(required = false) String keyName, PageUtil page, String token) {
         User currentUser = userService.getOne(new QueryWrapper<User>().eq("head_imgurl", token));
-        HttpRespMsg msg = projectService.getList(keyName,page,currentUser);
+        HttpRespMsg msg = projectService.getList(keyName, page, currentUser);
         return msg;
     }
 
     /**
      * 项目详情
      * 参数: id 项目id
+     *
      * @return
      */
     @ApiOperation("项目详情")
     @RequestMapping("/detail")
     @ResponseBody
     public HttpRespMsg getUserByCompanyIdOrSubordinateType(Project project) {
-        HttpRespMsg msg = projectService.getProjectDetail(project);
+        HttpRespMsg msg = new HttpRespMsg();
+        msg = projectService.getProjectDetail(project);
         return msg;
     }
 
     /**
      * 筛选模具列表时作为筛选条件所加载的项目列表
      * 参数: token 用户身份凭证
+     *
      * @return
      */
     @ApiOperation("筛选模具项目列表")
     @RequestMapping("/projectList")
     @ResponseBody
-    public HttpRespMsg getProjectList(String token){
+    public HttpRespMsg getProjectList(String token) {
         HttpRespMsg msg = new HttpRespMsg();
         msg = projectService.getListByUser(token);
         return msg;

ys_vue/src/main.js

@@ -1,4 +1,3 @@
-import babelpolyfill from 'babel-polyfill'
 import Vue from 'vue'
 import App from './App'
 
@@ -32,15 +31,12 @@ Vue.use(ElementUI)
 Vue.use(VueRouter)
 Vue.use(Vuex)
 
-//NProgress.configure({ showSpinner: false });
-
 const router = new VueRouter({
     routes
 })
 
 
 router.beforeEach((to, from, next) => {
-    //NProgress.start();
     if (to.path == '/login') {
         sessionStorage.removeItem('user');
     }
@@ -56,14 +52,14 @@ router.beforeEach((to, from, next) => {
                 } else if(routes[i].name == "基础管理"){
                     routes[i].hidden = false
                 }
-
+                
                 if(routes[i].name == "项目管理" && user.parentId > 1){
                     var children = routes[i].children;
                     for(var j in children){
-                        if(children[j].name == "人员管理"){
+                        if(children[j].name == "人员管理" && user.isManager == 1){
                             children[j].hidden = true
                         }
-                        if(children[j].name == "权限管理"){
+                        if(children[j].name == "权限管理" && user.isManager == 1){
                             children[j].hidden = true
                         }
                     }

ys_vue/src/routes.js

@@ -62,7 +62,7 @@ let routes = [
         iconCls: 'iconfont icon-ic_dashboard',
         children: [
             { path: '/project', component: project, name: '项目列表' },
-            { path: '/project/:id', component: projectDetail, name: '项目详情', hidden: true },
+            { path: '/projectDetail', component: projectDetail, name: '项目详情', hidden: true },
             { path: '/staff', component: staff, name: '人员管理' },
             { path: '/competence', component: competence, name: '权限管理' }
         ]
@@ -75,7 +75,7 @@ let routes = [
         iconCls: 'iconfont icon-moxing',
         children: [
             { path: '/moldList', component: moldList, name: '模具列表' },
-            { path: '/moldList/:id', component: moldDetail, name: '模具详情', hidden: true },
+            { path: '/moldDetail', component: moldDetail, name: '模具详情', hidden: true },
             { path: '/moldFile', component: moldFile, name: '文档审批' },
             { path: '/moldDownload', component: moldDownload, name: '文档下载' }
         ]

ys_vue/src/views/mold/moldDetail.vue

@@ -9,7 +9,7 @@
                 <el-form-item class="divLine">
                 </el-form-item>
                 <el-form-item>
-                    <span class="projectTitle">测试用模具001</span>
+                    <span class="projectTitle">{{moldDetail.modelName}}</span>
                 </el-form-item>
                 <el-form-item class="state">
                       当前状态：
@@ -24,49 +24,49 @@
             </el-col>
             <el-col :span="24" class="main">
                 <el-col :span="6" class="detail">
-                    云模盒编号：
-                    <span class="info">{{mould.typeNumber}}</span>
+                    模具名称：
+                    <span class="info">{{moldDetail.modelName}}</span>
                 </el-col>
                 <el-col :span="6" class="detail">
                     模具编号：
-                    <span class="info">{{mould.typeNumber}}</span>
-                  </el-col>
-                  <el-col :span="12" class="detail">
-                    模具名称：
-                    <span class="info">{{mould.name}}</span>
-                  </el-col>
-                  <el-col :span="6" class="detail">
+                    <span class="info">{{moldDetail.modelNo}}</span>
+                </el-col>
+                <el-col :span="6" class="detail">
+                    云模盒编号：
+                    <span class="info">{{moldDetail.equipmentNo}}</span>
+                </el-col>
+                <el-col :span="6" class="detail">
                     设备电量：
-                    <span class="info">{{mould.lifetime}}</span>
-                  </el-col>
-                  <el-col :span="6" class="detail">
+                    <span class="info">{{moldDetail.hillNumber}}</span>
+                </el-col>
+                <el-col :span="6" class="detail">
                     倒计时：
-                    <span class="info">{{mould.lifetime}}</span>
-                  </el-col>
-                  <el-col :span="6" class="detail">
+                    <span class="info">{{moldDetail.lifetime}}</span>
+                </el-col>
+                <el-col :span="6" class="detail">
                     初始模次：
-                    <span class="info">{{mould.initial}}</span>
-                  </el-col>
-                  <el-col :span="6" class="detail">
+                    <span class="info">{{moldDetail.initialModulus}}</span>
+                </el-col>
+                <el-col :span="6" class="detail">
                     对应RFID码：
-                    <span class="info">{{mould.RFIDcode}}</span>
-                  </el-col>
-                  <el-col :span="6" class="detail">
+                    <span class="info">{{moldDetail.rfid}}</span>
+                </el-col>
+                <el-col :span="6" class="detail">
                     穴数：
-                    <span class="info">{{mould.mouldNumber}}</span>
-                  </el-col>
-                  <el-col :span="6" class="detail">
+                    <span class="info">{{moldDetail.mouldNumber}}</span>
+                </el-col>
+                <el-col :span="6" class="detail">
                     模次寿命：
-                    <span class="info">{{mould.project}}</span>
-                  </el-col>
-                  <el-col :span="12" class="detail">
+                    <span class="info">{{moldDetail.settingLife}}</span>
+                </el-col>
+                <el-col :span="12" class="detail">
                     所属项目：
-                    <span class="info">{{mould.manufacturer}}</span>
-                  </el-col>
-                  <el-col :span="12" class="detail">
-                    制造方工厂：
-                    <span class="info">{{mould.manufacturer}}</span>
-                  </el-col>
+                    <span class="info">{{moldDetail.manufacturer}}</span>
+                </el-col>
+                <el-col :span="12" class="detail">
+                    生产方：
+                    <span class="info">{{moldDetail.companyName}}</span>
+                </el-col>
             </el-col>
 
             <el-col :span="24" class="title">文档资料
@@ -128,22 +128,9 @@
     export default {
         data() {
             return {
+                detailId: this.$route.query.id,
                 //临时数据
-                mould: {
-                    typeNumber: "MUJU002",
-                    name: "墨模具测试",
-                    project: "墨盒项目",
-                    client: "南京海市蜃楼有限公司",
-                    manufacturer: "南京江宁制造局",
-                    mouldNumber: "MOHE0023",
-                    lifetime: "1年",
-                    initial: "36",
-                    RFIDcode: "RFID1234",
-                    blueprint: true,
-                    BOMtable: true,
-                    partList: false,
-                    standard: false
-                },
+                moldDetail: {},
                 documents: [
                     {
                     name: "墨盒产品验证文档.word",
@@ -173,21 +160,48 @@
         },
         methods: {
             backToList() {
-                this.$router.push("/moldList");
+                //this.$router.push("/moldList");
+                this.$router.go(-1);
             },
             toDetection(){
-              this.$router.push("/detection");
+                this.$router.push("/detection");
             },
             handleClick(tab, event) {
-                console.log(tab, event);
-            }
+            },
+            // 模具详情
+            getDetail() {
+                this.listLoading = true;
+                this.http.post(this.port.mold.moldDetail, {
+                    id: this.detailId
+                }, res => {
+                    if (res.code == "ok") {
+                        this.moldDetail = res.data;
+                    } else {
+                        this.$message({
+                            message: res.msg,
+                            type: 'error'
+                        });
+                    }
+                }, error => {
+                    this.$message({
+                        message: error,
+                        type: 'error'
+                    });
+                })
+            },
+            // 文件上传
+            uploadFile() {}
         },
         created() {
             let height = window.innerHeight;
             this.allDetail.height = height - 170 + "px";
+            const that = this;
+            window.onresize = function temp() {
+                that.allDetail.height = window.innerHeight - 210;    
+            };
         },
         mounted() {
-            var mouldId = this.$route.params.id; //传到当前页面的模具编号
+            this.getDetail();
         }
     };
 </script>

ys_vue/src/views/mold/moldList.vue

@@ -34,10 +34,14 @@
     <!--列表-->
     <el-table :data="molds" :height="tableHeight" highlight-current-row v-loading="listLoading" style="width: 100%;">
         <el-table-column type="index" width="40"></el-table-column>
+        <el-table-column prop="modelName" label="模具名称" width="180" sortable>
+            <template slot-scope="scope">
+                <el-link :underline="false" type="primary" @click="toDetail(scope.row)">{{scope.row.modelName}}</el-link>
+            </template>
+        </el-table-column>
+        <el-table-column prop="modelNo" label="模具编号" width="150" sortable></el-table-column>
         <el-table-column prop="equipmentNo" label="云模盒编号" width="150" sortable></el-table-column>
         <el-table-column prop="hillNumber" label="电量" align="center" width="100" sortable></el-table-column>
-        <el-table-column prop="modelNo" label="模具编号" width="150" sortable></el-table-column>
-        <el-table-column prop="modelName" label="模具名称" width="150" sortable></el-table-column>
         <el-table-column prop="projectName" label="所属项目" width="180" sortable></el-table-column>
         <el-table-column label="所属资产方" width="200" sortable></el-table-column>
         <el-table-column label="所属生产方" width="200" sortable></el-table-column>
@@ -69,10 +73,10 @@
                 <span v-else style="color:#CD2626;">禁止</span>
             </template>
         </el-table-column>
-        <el-table-column label="操作" width="150" align="center" fixed="right" sortable>
+        <el-table-column label="操作" width="150" align="center" fixed="right" sortable v-if="user.parentId == 1">
             <template slot-scope="scope">
-                <el-button size="small" type="primary" @click="toDetail(scope.row.typeNumber)">详情</el-button>
-                <el-button size="small" type="danger" v-if="user.parentId == 1">删除</el-button>
+                <!-- <el-button size="small" type="primary" @click="toDetail(scope.row)">详情</el-button> -->
+                <el-button size="small" type="danger">删除</el-button>
             </template>
         </el-table-column>
     </el-table>
@@ -230,8 +234,13 @@
                 })
             },
             //详情
-            toDetail(id) {
-                this.$router.push("/moldList/" + id);
+            toDetail(row) {
+                this.$router.push({
+                    path: '/moldDetail',
+                    query: {
+                        id: row.id
+                    }
+                });
             },
 
             //添加界面

ys_vue/src/views/project/project.vue

@@ -20,22 +20,25 @@
 			<el-table-column type="index" width="60">
 			</el-table-column>
 			<el-table-column prop="projectName" label="项目名称" width="200" sortable>
+                <template slot-scope="scope">
+                    <el-link :underline="false" type="primary" @click="toDetail(scope.row)">{{scope.row.projectName}}</el-link>
+				</template>
 			</el-table-column>
-            <el-table-column prop="ownerCompanyName" label="生产方" min-width="200" sortable>
+            <el-table-column prop="ownerCompanyName" label="生产方" width="250" sortable>
 			</el-table-column>
-            <el-table-column prop="charger" label="生产方负责人" sortable>
+            <el-table-column prop="charger" label="生产方负责人" width="200" align="center" sortable>
 			</el-table-column>
-			<el-table-column prop="creator" label="项目创建人" sortable>
+			<el-table-column prop="creator" label="项目创建人" width="180" align="center"  sortable>
 			</el-table-column>
-			<el-table-column prop="indate" label="创建时间" width="180" sortable>
+			<el-table-column prop="indate" label="创建时间" width="200" align="center" sortable>
 			</el-table-column>
-			<el-table-column label="操作" width="250">
+			<!-- <el-table-column label="操作" width="250" align="center">
 				<template slot-scope="scope">
                     <el-button size="small" type="primary" @click="toDetail(scope.row.id)">详情</el-button>
 					<el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
 					<el-button type="danger" size="small" @click="handleDel(scope.$index, scope.row)">删除</el-button>
 				</template>
-			</el-table-column>
+			</el-table-column> -->
 		</el-table>
 
 		<!--工具条-->
@@ -235,8 +238,13 @@
             },
 
             //详情
-            toDetail(id) {
-                this.$router.push("/project/" + id);
+            toDetail(row) {
+                this.$router.push({
+                    path: '/projectDetail',
+                    query: {
+                        id: row.id
+                    }
+                });
             },
 
             //选择公司切换人员
@@ -281,21 +289,6 @@
 			addSubmit() {
 				this.$refs.addForm.validate((valid) => {
 					if (valid) {
-                        // console.log(this.addForm)
-                        // var userIds = "";
-                        // if(this.addForm.userA.length != 0){
-                        //     for(var i in this.addForm.userA){
-                        //         userIds += this.addForm.userA[i] + ","
-                        //     }
-                        // }
-                        
-                        // if(this.addForm.userB.length != 0){
-                        //     for(var i in this.addForm.userB){
-                        //         userIds += this.addForm.userB[i] + ","
-                        //     }
-                        // }
-                        
-                        // userIds = userIds.substring(0,userIds.length-1)
                         var cId = "",
                             cName = "";
                         for(var i in this.addForm.customerCompany){
@@ -310,9 +303,8 @@
                             projectName: this.addForm.projectName,
                             customerCompanyIds: cId,
                             customerCompanyNames: cName,
-                            managerName: this.addForm.managerId.username,
+                            manager: this.addForm.managerId.username,
                             managerId: this.addForm.managerId.id,
-                            // userIds: userIds,
                             flag: 0
                         } , res => {
                             this.addLoading = false;
@@ -340,30 +332,14 @@
 					}
 				});
 			},
-
-			//删除
-			// handleDel: function (index, row) {
-			// 	this.$confirm('确认删除该记录吗?', '提示', {
-			// 		type: 'warning'
-			// 	}).then(() => {
-			// 		this.listLoading = true;
-			// 		let para = { id: row.id };
-			// 		removeUser(para).then((res) => {
-			// 			this.listLoading = false;
-			// 			this.$message({
-			// 				message: '删除成功',
-			// 				type: 'success'
-			// 			});
-			// 			this.getProject();
-			// 		});
-			// 	}).catch(() => {
-
-			// 	});
-            // }
         },
         created() {
             let height = window.innerHeight;
             this.tableHeight = height - 210;
+            const that = this;
+            window.onresize = function temp() {
+                that.tableHeight = window.innerHeight - 210;    
+            };
         },
 		mounted() {
             this.getMsg();

ys_vue/src/views/project/projectDetail.vue

@@ -9,69 +9,147 @@
                 <el-form-item class="divLine">
                 </el-form-item>
                 <el-form-item>
-                    <span class="projectTitle">测试用项目001</span>
+                    <span class="projectTitle">{{proDetail.projectName}}</span>
                 </el-form-item>
             </el-form>
         </el-col>
         <el-col :span="24" :style="allDetail">
-            <el-col :span="24" class="title">项目基本信息</el-col>
-                <el-col :span="24" class="main">
-                    <el-col :span="6" class="detail">
-                        项目名称：
-                        <span class="info">{{mould.typeNumber}}</span>
-                    </el-col>
-                    <el-col :span="6" class="detail">
-                        项目经理：
-                        <span class="info">{{mould.name}}</span>
-                    </el-col>
-                    <el-col :span="6" class="detail">
-                        生产方公司：
-                        <span class="info">{{mould.lifetime}}</span>
-                    </el-col>
-                    <el-col :span="6" class="detail">
-                        生产方负责人：
-                        <span class="info">{{mould.initial}}</span>
-                    </el-col>
-                    <el-col :span="24" class="detail">
-                        项目模具：
-                        <span class="info">{{mould.RFIDcode}}</span>
-                    </el-col>
-                    <el-col :span="24" class="detail">
-                        资产方人员：
-                        <span class="info">{{mould.mouldNumber}}</span>
-                    </el-col>
-                    <el-col :span="24" class="detail">
-                        生产方人员：
-                        <span class="info">{{mould.project}}</span>
-                    </el-col>
-                </el-col>
-
-                <el-col :span="24" class="title">项目文档
-                    <el-upload class="upload-demo" action="customize" :http-request="uploadFile" :show-file-list="false" multiple :limit="5" style="float:right;">
-                        <el-button size="small" type="primary">点击上传</el-button>
-                    </el-upload>
+            <el-col :span="24" class="title">项目基本信息
+                <i class="el-icon-edit editDetail" v-if="user.parentId == 1 || user.isManager == 1" @click="edit"></i>
+            </el-col>
+            <el-col :span="24" class="main">
+                <el-col :span="6" class="detail">
+                    项目编号：
+                    <span class="info">{{proDetail.projectNo}}</span>
                 </el-col>
-                <el-col :span="24">
-                    <el-table :data="documents" highlight-current-row v-loading="listLoading" style="width: 100%;height:800px;">
-                        <el-table-column type="index" width="40"></el-table-column>
-                        <el-table-column prop="name" label="名称" sortable></el-table-column>
-                        <el-table-column prop="size" label="大小" width="200" sortable></el-table-column>
-                        <el-table-column prop="uploader" label="上传者" width="200" sortable></el-table-column>
-                        <el-table-column prop="uploadTime" label="上传时间" width="200" sortable></el-table-column>
-                        <el-table-column label="状态" width="200" sortable>
-                        <template slot-scope="scope">
-                            <span v-if="scope.row.state == 0">需要</span>
-                            <span v-else>不需要</span>
-                        </template>
-                        </el-table-column>
-                        <el-table-column label="操作" width="220" sortable>
-                        <el-button size="small">浏览</el-button>
-                        <el-button size="small">下载</el-button>
-                        <el-button size="small" type="danger">删除</el-button>
-                        </el-table-column>
-                    </el-table>
+                <el-col :span="6" class="detail">
+                    项目经理：
+                    <span class="info">{{proDetail.name}}</span>
+                </el-col>
+                <el-col :span="6" class="detail">
+                    资产方审批人：
+                    <span class="info">{{proDetail.initial}}</span>
+                </el-col>
+                <el-col :span="6" class="detail">
+                    生产方审批人：
+                    <span class="info">{{proDetail.initial}}</span>
+                </el-col>
+                <el-col :span="6" class="detail">
+                    生产方公司：
+                    <span class="info">{{proDetail.lifetime}}</span>
+                </el-col>
+                <el-col :span="24" class="detail">
+                    项目模具：
+                    <span class="info">{{proDetail.RFIDcode}}</span>
                 </el-col>
+                <el-col :span="24" class="detail">
+                    资产方人员：
+                    <span class="info">{{proDetail.mouldNumber}}</span>
+                </el-col>
+                <el-col :span="24" class="detail">
+                    生产方人员：
+                    <span class="info">{{proDetail.project}}</span>
+                </el-col>
+            </el-col>
+
+            <el-col :span="24" class="title">项目文档
+                <el-upload class="upload-demo" action="customize" :http-request="uploadFile" :show-file-list="false" multiple :limit="5" style="float:right;">
+                    <el-button size="small" type="primary">点击上传</el-button>
+                </el-upload>
+            </el-col>
+            <el-col :span="24">
+                <el-table :data="documents" highlight-current-row v-loading="listLoading" style="width: 100%;height:800px;">
+                    <el-table-column type="index" width="40"></el-table-column>
+                    <el-table-column prop="name" label="名称" sortable></el-table-column>
+                    <el-table-column prop="size" label="大小" width="200" sortable></el-table-column>
+                    <el-table-column prop="uploader" label="上传者" width="200" sortable></el-table-column>
+                    <el-table-column prop="uploadTime" label="上传时间" width="200" sortable></el-table-column>
+                    <el-table-column label="状态" width="200" sortable>
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.state == 0">需要</span>
+                        <span v-else>不需要</span>
+                    </template>
+                    </el-table-column>
+                    <el-table-column label="操作" width="220" sortable>
+                    <el-button size="small">浏览</el-button>
+                    <el-button size="small">下载</el-button>
+                    <el-button size="small" type="danger">删除</el-button>
+                    </el-table-column>
+                </el-table>
+            </el-col>
         </el-col>
+
+        <!--编辑界面-->
+		<el-dialog title="编辑项目" v-if="editFormVisible" :visible.sync="editFormVisible" :close-on-click-modal="false" customClass='customWidth'>
+			<el-form :model="editForm" label-width="120px" :rules="formRules" ref="editForm">
+                <el-col :span="24">
+                    <el-form-item label="项目名称" prop="projectName">
+                        <el-input v-model="editForm.projectName" autocomplete="off" placeholder="请输入项目名称" style="width:510px"></el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                    <el-form-item label="生产方公司" prop="customerCompany">
+                        <el-select v-model="editForm.customerCompany" clearable filterable multiple placeholder="请选择生产方公司" @change="companyChange" value-key='id' style="width:510px">
+                            <!-- @change="companyChange(0)"  -->
+                            <el-option v-for="item in company" :key="item.id" :label="item.companyName" :value="item">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                    <el-form-item label="项目经理" prop="managerId">
+                        <el-select v-model="editForm.managerId" clearable filterable placeholder="请选择项目经理" value-key='id' style="width:510px">
+                            <el-option v-for="item in charger" :key="item.id" :label="item.username" :value="item">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                    <el-form-item label="资产方审批人" prop="ownerApproverId">
+                        <el-select v-model="editForm.ownerApproverId" clearable filterable placeholder="请选择资产方审批人" value-key='id' style="width:190px">
+                            <el-option v-for="item in charger" :key="item.id" :label="item.username" :value="item">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                    <el-form-item label="生产方审批人" prop="customerApproverId">
+                        <el-select v-model="editForm.customerApproverId" clearable filterable placeholder="请选择生产方审批人" value-key='id' style="width:190px">
+                            <el-option v-for="item in charger" :key="item.id" :label="item.username" :value="item">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                    <el-form-item label="项目模具">
+                        <el-select v-model="editForm.userA" clearable filterable multiple placeholder="请选择项目模具" style="width:510px">
+                            <el-option v-for="item in userA" :key="item.id" :label="item.username" :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                    <el-form-item label="资产方参与人">
+                        <el-select v-model="editForm.userA" clearable filterable multiple placeholder="请选择资产方参与人" style="width:510px">
+                            <el-option v-for="item in userA" :key="item.id" :label="item.username" :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                    <el-form-item label="生产方参与人">
+                        <el-select v-model="editForm.userB" clearable filterable multiple placeholder="请选择生产方参与人" style="width:510px">
+                            <el-option v-for="item in userB" :key="item.id" :label="item.username" :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button @click.native="editFormVisible = false">取消</el-button>
+				<el-button type="primary" @click.native="addSubmit" :loading="addLoading">提交</el-button>
+			</div>
+		</el-dialog>
     </section>
 </template>
 
@@ -80,22 +158,10 @@
     export default {
         data() {
             return {
+                detailId: this.$route.query.id,
+                user: JSON.parse(sessionStorage.getItem('user')),
                 //临时数据
-                mould: {
-                    typeNumber: "MUJU002",
-                    name: "墨模具测试",
-                    project: "墨盒项目",
-                    client: "南京海市蜃楼有限公司",
-                    manufacturer: "南京江宁制造局",
-                    mouldNumber: "MOHE0023",
-                    lifetime: "1年",
-                    initial: "36",
-                    RFIDcode: "RFID1234",
-                    blueprint: true,
-                    BOMtable: true,
-                    partList: false,
-                    standard: false
-                },
+                proDetail: {},
                 documents: [
                     {
                     name: "墨盒产品验证文档.word",
@@ -120,7 +186,31 @@
                     height: 0
                 },
                 listLoading: false,
-                activePage: 0
+                activePage: 0,
+
+                company:[],
+                owner: [],
+                charger: [],
+                formRules: {
+					projectName: [
+						{ required: true, message: '请输入项目名称', trigger: 'blur' }
+                    ],
+                    customerCompany: [
+                        { required: true, message: '请选择客户公司', trigger: 'blur' }
+                    ],
+                    managerId: [
+                        { required: true, message: '请选择项目经理', trigger: ['blur','change'] }
+                    ]
+                },
+                
+                editFormVisible: false,//新增界面是否显示
+				addLoading: false,
+				//新增界面数据
+				editForm: {
+					projectName: '',
+                    customerCompany: [],
+                    managerId: ''
+				}
             };
         },
         methods: {
@@ -131,7 +221,89 @@
             handleClick(tab, event) {
                 console.log(tab, event);
             },
+            //获取详情
+            getDetail() {
+                this.listLoading = true;
+                this.http.post(this.port.project.projectDetail, {
+                    id: this.detailId
+                }, res => {
+                    if (res.code == "ok") {
+                        this.proDetail = res.data;
+                    } else {
+                        this.$message({
+                            message: res.msg,
+                            type: 'error'
+                        });
+                    }
+                }, error => {
+                    this.$message({
+                        message: error,
+                        type: 'error'
+                    });
+                })
+            },
+            //获取信息
+            getMsg() {
+                this.http.post(this.port.project.getUserById, {
+                    companyIds: this.user.companyId,
+                    id: this.user.id
+                } , res => {
+                    if (res.code == "ok") {
+                        var list = res.data , array = [] , owner = [];
+                        for(var i in list) {
+                            if(list[i].companyId == this.user.companyId){
+                                owner.push(list[i])
+                            } else {
+                                array.push(list[i])
+                            }
+                        }
+                        this.charger = res.data;
+                        this.owner = owner;
+                    } else {
+                        this.$message({
+                            message: res.msg,
+                            type: 'error'
+                        });
+                    }
+                }, error => {
+                    this.$message({
+                        message: error,
+                        type: 'error'
+                    });
+                })
 
+                this.http.post(this.port.base.companys, {
+                    parentId: this.user.parentId,
+                    id: this.user.id
+                }, res => {
+                    if (res.code == "ok") {
+                        var list = res.data , array = [];
+                        for(var i in list){
+                            if(list[i].id != this.user.companyId){
+                                array.push(list[i])
+                            }
+                        }
+                        this.company = array;
+                    } else {
+                        this.$message({
+                            message: res.msg,
+                            type: 'error'
+                        });
+                    }
+                }, error => {
+                    this.$message({
+                        message: error,
+                        type: 'error'
+                    });
+                })
+            },
+            edit() {
+                this.editFormVisible = true;
+                this.editForm = {
+                    id: this.proDetail.id,
+                    projectName: this.proDetail.projectName
+                }
+            },
             //上传
             uploadFile(params) {
                 console.log(params)
@@ -140,9 +312,13 @@
         created() {
             let height = window.innerHeight;
             this.allDetail.height = height - 170 + "px";
+            const that = this;
+            window.onresize = function temp() {
+                that.allDetail.height = window.innerHeight - 210;    
+            };
         },
         mounted() {
-            var mouldId = this.$route.params.id; //传到当前页面的模具编号
+            this.getDetail();
         }
     };
 </script>
@@ -188,6 +364,12 @@
         top: -5px;
     }
 
+    .editDetail {
+        margin-left: 10px;
+        color:#20a0ff;
+        cursor: pointer;
+    }
+
     .info {
         color: grey;
     }