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

ys_vue/src/http.js

@@ -74,7 +74,6 @@ export default {
         axios({
             method: 'get',
             url: handleUrl(url),
-            // timeout: TIME_OUT_MS,
             headers: {
                 'Content-Type': 'application/json; charset=UTF-8'
             }

ys_vue/src/port.js

@@ -1,29 +1,29 @@
 export default {
     manage: {
-        login: '/user/login', //登录
+        login: '/user/login', // 登录
     },
     //消息提示相关
     notice: {
-        list: '/vnoticeuser/list',  //消息列表
-        read: '/vnoticeuser/read'  //消息读取
+        list: '/vnoticeuser/list',  // 消息列表
+        read: '/vnoticeuser/read'  // 消息读取
     },
     pwd: {
-        resetPwd: '/user/updatePassword'
+        resetPwd: '/user/updatePassword' // 重置密码
     },
-    map: {
-        mapList: '/company/getCoutomCompanyAndMouldsByUser', //生产方公司和公司下所属的模具
-        newMap: '/mould/listMap'
+    map: { 
+        mapList: '/company/getCoutomCompanyAndMouldsByUser', // 生产方公司和公司下所属的模具
+        newMap: '/mould/listMap' // 获取地图
     },
     project: {
-        userList: '/user/list',  //用户列表
-        addUser: '/user/add',  //添加或修改用户
-        delUser: '/user/delete',  //删除用户
+        addUser: '/user/add',  // 添加或修改用户
+        userList: '/user/list',  // 用户列表
+        delUser: '/user/delete',  // 删除用户
 
-        projectList: '/project/list', //项目列表
-        addProject: '/project/add', //添加或修改项目
-        projectDetail: '/project/detail', //项目详情
-        projects: '/project/projectList', //筛选模具列表时作为筛选条件所加载的项目列表
-        projectByUser: '/project/getProjectListByUserAndCompany',//获取创建人员分配项目时根据当前人和公司获取项目列表
+        addProject: '/project/add', // 添加或修改项目
+        projectList: '/project/list', // 项目列表
+        projectDetail: '/project/detail', // 项目详情
+        projects: '/project/projectList', // 筛选模具列表时作为筛选条件所加载的项目列表
+        projectByUser: '/project/getProjectListByUserAndCompany',// 获取创建人员分配项目时根据当前人和公司获取项目列表
 
         uploadFile: '/projectfile/uploadFile', //项目文档的上传
         dowloadFile: '/projectfile/dowloadFile', //项目文档的下载
@@ -78,31 +78,34 @@ export default {
     },
     //基础管理
     base: {
-        addRole: '/role/add',  //新建或修改 （角色）
-        roleList: '/role/list', //列表
-        delRole: '/role/delete', //删除
-        roles: '/user/getRoleList', //获取角色列表
-
-        addCompany: '/company/add',  //（公司）
-        companyList: '/company/list',
-        delCompany: '/company/delete',
-        companys: '/company/getCompanyList', //创建账号时所获取的公司列表
-        comps: '/company/getCompanys', //创建模具获取的(资产方)公司列表
-        addCompanyListToProject: '/company/addCompanyListToProject', //项目分配生产方公司列表
-        relationList: '/company/relationList', //建立关联公司时的公司列表
-        ownerComps: '/company/ownerRelateCompany', //返回当前公司的关联公司列表
-        getCompanyByPro: '/company/getProduceCompany', //根据项目id获取项目的生产方公司
-        getInfo: '/company/getProduceCompanyByCurrentUser', //根据当前人登录人所能看到的公司进行 项目 模具 的筛选
-
-
-        addFactory: '/factory/add',  //（工厂）
-        factoryList: '/factory/list',
-        delFactory: '/factory/delete',
-
-        editMould: '/mouldequipment/addOrUpdate', //添加/修改模具设备
-        mouldeList: '/mouldequipment/getEquipmentList', //设备列表
-        enableMould: '/mouldequipment/use', //启用设备
-        moulds: '/mouldequipment/getMouldEquipmentList', //创建模具时获取资产方公司的设备列表
+        addCompany: '/company/add', // 添加资产方
+        companyList: '/company/list', // 资产方列表
+        delCompany: '/company/delete', // 删除资产方
+
+        getCompanyList: '/company/getCompanyList', // 管理员创建人员时显示公司
+        
+        getCompanys: '/company/getCompanys', // 云模盒所属公司
+
+        addCompanyListToProject: '/company/addCompanyListToProject', // 编辑项目时获取生产方公司
+
+        relationList: '/company/relationList', // 获取关联公司列表
+
+        //ownerComps: '/company/ownerRelateCompany', // 返回当前公司的关联公司列表
+
+        getProduceCompany: '/company/getProduceCompany', // 根据项目id获取生产方列表
+        
+        getInfo: '/company/getProduceCompanyByCurrentUser', // 根据当前人登录人所能看到的公司进行筛选
+
+        addFactory: '/factory/add',  // 添加生产方
+        factoryList: '/factory/list',   // 生产方列表
+        delFactory: '/factory/delete',  // 删除生产方
+
+        editMould: '/mouldequipment/addOrUpdate', // 添加 / 修改云模盒
+        mouldeList: '/mouldequipment/getEquipmentList', // 云模盒列表
+        enableMould: '/mouldequipment/use', // 启用云模盒
+
+        moulds: '/mouldequipment/getMouldEquipmentList', // 创建模具时获取资产方的云模盒列表
         importMouldEquipmentExcel: '/mouldequipment/importMouldEquipmentExcel', //批量导入云模盒
+        
     }
 }

ys_vue/src/routes.js

@@ -15,11 +15,9 @@ import staff from './views/project/staff.vue'
 import competence from './views/project/competence.vue'
 
 import moldList from './views/mold/moldList.vue'
-import moldFile from './views/mold/moldFile.vue'
 import moldDetail from './views/mold/moldDetail.vue'
 import moldDownload from './views/mold/moldDownload.vue'
 
-import role from './views/base/role.vue'
 import comp from './views/base/comp.vue'
 import factory from './views/base/factory.vue'
 import allocation from './views/base/allocation.vue'
@@ -77,7 +75,6 @@ let routes = [
         children: [
             { path: '/moldList', component: moldList, name: '模具列表' },
             { path: '/moldList/:id/:type', component: moldDetail, name: '模具详情', hidden: true },
-            // { path: '/moldFile', component: moldFile, name: '文档审批' },
             { path: '/moldDownload', component: moldDownload, name: '文档下载' }
         ]
     },
@@ -88,7 +85,6 @@ let routes = [
         name: '基础管理',
         iconCls: 'iconfont icon-setting-fill',
         children: [
-            // { path: '/role', component: role, name: '角色管理' },
             { path: '/comp', component: comp, name: '资产方管理' },
             { path: '/factory', component: factory, name: '生产方管理' },
             { path: '/allocation', component: allocation, name: '云模盒管理' }

ys_vue/src/views/base/allocation.vue

@@ -264,7 +264,7 @@
         methods: {
             getMsg() {
                 //获取公司下拉列表
-                this.http.post( this.port.base.comps, {},
+                this.http.post( this.port.base.getCompanys, {},
                 res => {
                     if (res.code == "ok") {
                         this.companies = res.data;

ys_vue/src/views/base/role.vue

@@ -1,411 +0,0 @@
-<template>
-	<section>
-		<!--工具条-->
-		<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
-			<el-form :inline="true" :model="filters">
-                <el-form-item>
-                    <el-input v-model="filters.keyName" placeholder="请输入角色名称进行搜索" clearable></el-input>
-                </el-form-item>
-				<el-form-item>
-					<el-button type="primary" @click.native="getRoles">查询</el-button>
-				</el-form-item>
-				<el-form-item style="float:right;">
-					<el-button type="primary" @click.native="handleAdd">新增</el-button>
-				</el-form-item>
-			</el-form>
-		</el-col>
-
-		<!--列表-->
-		<el-table :data="list" highlight-current-row :height="tableHeight" v-loading="listLoading" style="width: 100%;">
-            <el-table-column type="index" width="60"></el-table-column>
-			<el-table-column prop="roleName" label="角色名称" width="120" sortable></el-table-column>
-            <el-table-column prop="subordinate" label="角色类型" width="120" sortable></el-table-column>
-			<el-table-column label="权限">
-                <template slot-scope="scope">
-                    <el-col :span="2" v-if="scope.row.viewPower == 1">
-                        <el-tag size="medium">浏览</el-tag>
-                    </el-col>
-                    <el-col :span="2" v-if="scope.row.dowloadPower == 1">
-                        <el-tag size="medium">下载</el-tag>
-                    </el-col>
-                    <el-col :span="2" v-if="scope.row.uploadPower == 1">
-                        <el-tag size="medium">上传</el-tag>
-                    </el-col>
-                    <el-col :span="2" v-if="scope.row.approvalPower == 1">
-                        <el-tag size="medium">审批</el-tag>
-                    </el-col>
-                </template>
-            </el-table-column>
-			<el-table-column label="操作" width="150">
-				<template slot-scope="scope">
-					<el-button size="small" @click.native="handleEdit(scope.$index, scope.row)">编辑</el-button>
-					<el-button type="danger" size="small" @click.native.native="handleDel(scope.$index, scope.row)">删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
-
-		<!--工具条-->
-		<el-col :span="24" class="toolbar">
-            <el-pagination
-                @size-change="handleSizeChange"
-                @current-change="handleCurrentChange"
-                :page-sizes="[20 , 50 , 80 , 100]"
-                :page-size="20"
-                layout="total, sizes, prev, pager, next"
-                :total="total"
-                style="float:right;">
-            </el-pagination>
-		</el-col>
-
-        <!--新增界面-->
-		<el-dialog title="新增角色" v-if="addFormVisible" :visible.sync="addFormVisible" :close-on-click-modal="false" customClass='customWidth'>
-			<el-form :model="addForm" label-width="100px" :rules="formRules" ref="addForm">
-                <el-col :span="12">
-                    <el-form-item label="角色名称" prop="roleName">
-                        <el-input v-model="addForm.roleName" autocomplete="off" placeholder="请输入角色名称"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="角色类型" prop="subordinate">
-                        <el-select v-model="addForm.subordinate" clearable filterable placeholder="请选择角色类型" style="width:202px">
-                            <el-option v-for="item in team" :key="item.value" :label="item.label" :value="item.value">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                    <el-form-item label="权限配置">
-                            <el-col :span="6" v-for="(item,index) in roleList" :key="item.val" style="text-align:center;">
-                                <el-checkbox v-model="addForm[item.label]">{{item.name}}</el-checkbox>
-                            </el-col>
-                        <!-- <el-table :data="roleList" border :show-header="false" style="width: 100%">
-                            <el-table-column prop="name" label="名称" width="80"></el-table-column>
-                            <el-table-column prop="role" label="权限">
-                                <template slot-scope="scope">
-                                    <div v-for="(item,index) in scope.row.role"></div>
-                                </template>
-                            </el-table-column>
-                        </el-table> -->
-                    </el-form-item>
-                </el-col>
-			</el-form>
-			<div slot="footer" class="dialog-footer">
-				<el-button @click.native="addFormVisible = false">取消</el-button>
-				<el-button type="primary" @click.native="addSubmit" :loading="addLoading">提交</el-button>
-			</div>
-		</el-dialog>
-
-		<!--编辑界面-->
-		<el-dialog title="编辑人员" v-if="editFormVisible" :visible.sync="editFormVisible" :close-on-click-modal="false" customClass='customWidth'>
-			<el-form :model="editForm" label-width="100px" :rules="formRules" ref="editForm">
-                <el-col :span="12">
-                    <el-form-item label="角色名称" prop="roleName">
-                        <el-input v-model="editForm.roleName" autocomplete="off" placeholder="请输入角色名称"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="角色类型" prop="subordinate">
-                        <el-select v-model="editForm.subordinate" clearable filterable placeholder="请选择角色类型" style="width:202px">
-                            <el-option v-for="item in team" :key="item.value" :label="item.label" :value="item.value">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="权限配置">
-                        <el-row>
-                            <el-col :span="6" v-for="(item,index) in roleList" :key="item.val" style="text-align:center;">
-                                <el-checkbox v-model="editForm[item.label]" :checked="editForm[item.label]">{{item.name}}</el-checkbox>
-                            </el-col>
-                        </el-row>
-                        <!-- <el-table :data="roleList" border :show-header="false" style="width: 100%">
-                            <el-table-column prop="name" label="名称" width="80"></el-table-column>
-                            <el-table-column prop="role" label="权限">
-                                <template slot-scope="scope">
-                                    <div v-for="(item,index) in scope.row.role"></div>
-                                </template>
-                            </el-table-column>
-                        </el-table> -->
-                    </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="editSubmit" :loading="editLoading">提交</el-button>
-			</div>
-		</el-dialog>
-	</section>
-</template>
-
-<script>
-	import util from '../../common/js/util'
-
-	export default {
-		data() {
-			return {
-				filters: {
-                    keyName: ''
-                },
-                team: [{label:'供应商',value:'供应商'},{label:'客户',value:'客户'}],
-                // roleList: [{
-                //     name: '项目文档',
-                //     role: [{name:'上传',val:0},{name:'下载',val:1},{name:'浏览',val:2},{name:'审批',val:3}]
-                // },{
-                //     name: '模具文档',
-                //     role: 2
-                // },{
-                //     name: '零件文档',
-                //     role: 3
-                // },{
-                //     name: '模具保养',
-                //     role: 4
-                // },{
-                //     name: '模具更新',
-                //     role: 5
-                // },{
-                //     name: '模具报废',
-                //     role: 6
-                // }],
-                roleList: [
-                    {name:'上传',val:0,label:'uploadPower',uploadPower:false},
-                    {name:'下载',val:1,label:'dowloadPower',dowloadPower:false},
-                    {name:'浏览',val:2,label:'viewPower',viewPower:false},
-                    {name:'审批',val:3,label:'approvalPower',approvalPower:false}
-                ],
-				list: [],
-				total: 0,
-                page: 1,
-                size: 20,
-                listLoading: false,
-                tableHeight: 0,
-                
-                formRules: {
-					roleName: [
-						{ required: true, message: '请输入姓名', trigger: 'blur' }
-                    ],
-                    subordinate: [
-						{ required: true, message: '请选择角色类型', trigger: ['blur','change'] }
-					]
-                },
-
-                // 新增界面
-				addFormVisible: false,
-				addLoading: false,
-				addForm: {
-                    roleName: '',
-                    uploadPower: false,
-                    dowloadPower:false,
-                    viewPower:false,
-                    approvalPower:false,
-                    subordinate: '',
-                    flag: 0
-				},
-                
-                // 编辑界面
-				editFormVisible: false,
-				editLoading: false,
-				editForm: {
-					id: 0,
-					roleName: '',
-                    uploadPower: false,
-                    dowloadPower:false,
-                    viewPower:false,
-                    approvalPower:false,
-                    subordinate: '',
-                    flag: 1
-				}
-			}
-		},
-		methods: {
-            //  分页
-			handleCurrentChange(val) {
-				this.page = val;
-				this.getRoles();
-            },
-
-            handleSizeChange(val) {
-                this.size = val;
-				this.getRoles();
-            },
-
-			//获取用户列表
-			getRoles() {
-				this.listLoading = true;
-                this.http.post(this.port.base.roleList, {
-                    keyName: this.filters.keyName,
-                    pageNum: this.page,
-                    pageSize: this.size
-                }, res => {
-                    this.listLoading = false;
-                    if (res.code == "ok") {
-                        this.list = res.data.list;
-                        this.total = res.data.total;
-                    } else {
-                        this.$message({
-                            message: res.msg,
-                            type: 'error'
-                        });
-                    }
-                }, error => {
-                    this.listLoading = false;
-                    this.$message({
-                        message: error,
-                        type: 'error'
-                    });
-                })
-            },
-
-            //显示新增界面
-			handleAdd() {
-                this.addFormVisible = true;
-				this.addForm = {
-					roleName: '',
-					uploadPower: false,
-                    dowloadPower:false,
-                    viewPower:false,
-                    approvalPower:false,
-                    subordinate: ''
-				};
-            },
-            
-            //新增
-			addSubmit() {
-				this.$refs.addForm.validate((valid) => {
-					if (valid) {
-                        this.addLoading = true;
-                        this.http.post(this.port.base.addRole, {
-                            roleName: this.addForm.roleName,
-                            uploadPower: this.addForm.uploadPower?1:0,
-                            dowloadPower: this.addForm.dowloadPower?1:0,
-                            viewPower: this.addForm.viewPower?1:0,
-                            approvalPower: this.addForm.approvalPower?1:0,
-                            subordinate: this.addForm.subordinate,
-                            flag: 0
-                        }, res => {
-                            this.addLoading = false;
-                            this.addFormVisible = false;
-                            if (res.code == "ok") {
-                                this.$message({
-                                    message: '创建成功',
-                                    type: 'success'
-                                });
-                                this.getRoles();
-                            } else {
-                                this.$message({
-                                    message: res.msg,
-                                    type: 'error'
-                                });
-                            }
-                        }, error => {
-                            this.addLoading = false;
-                            this.addFormVisible = false;
-                            this.$message({
-                                message: error,
-                                type: 'error'
-                            });
-                        })
-					}
-				});
-            },
-            
-			//删除
-			handleDel(index, row) {
-				this.$confirm('确认删除该角色吗?', '提示', {
-					type: 'warning'
-				}).then(() => {
-                    this.http.post(this.port.base.delRole, {
-                        id: row.id
-                    }, res => {
-                        if (res.code == "ok") {
-                            this.$message({
-                                message: '删除成功',
-                                type: 'success'
-                            });
-                            this.getRoles();
-                        } else {
-                            this.$message({
-                                message: res.msg,
-                                type: 'error'
-                            });
-                        }
-                    }, error => {
-                        this.$message({
-                            message: error,
-                            type: 'error'
-                        });
-                    })
-				});
-            },
-            
-			//显示编辑界面
-			handleEdit(index, row) {
-                this.editFormVisible = true;
-                this.editForm = {
-                    id: row.id,
-					roleName: row.roleName,
-					uploadPower: row.uploadPower==0?false:true,
-                    dowloadPower: row.dowloadPower==0?false:true,
-                    viewPower: row.viewPower==0?false:true,
-                    approvalPower: row.approvalPower==0?false:true
-				};
-            },
-            
-			//编辑
-			editSubmit() {
-				this.$refs.editForm.validate((valid) => {
-					if (valid) {
-						this.editLoading = true;
-                        this.http.post(this.port.base.addRole, {
-                            id: this.editForm.id,
-                            roleName: this.editForm.roleName,
-                            uploadPower: this.editForm.uploadPower?1:0,
-                            dowloadPower: this.editForm.dowloadPower?1:0,
-                            viewPower: this.editForm.viewPower?1:0,
-                            approvalPower: this.editForm.approvalPower?1:0,
-                            flag: 1
-                        }, res => {
-                            this.editLoading = false;
-                            this.editFormVisible = false;
-                            if (res.code == "ok") {
-                                this.$message({
-                                    message: '修改成功',
-                                    type: 'success'
-                                });
-                                this.getRoles();
-                            } else {
-                                this.$message({
-                                    message: res.msg,
-                                    type: 'error'
-                                });
-                            }
-                        }, error => {
-                            this.editLoading = false;
-                            this.editFormVisible = false;
-                            this.$message({
-                                message: error,
-                                type: 'error'
-                            });
-                        })
-					}
-				});
-            }
-        },
-
-        created() {
-            let height = window.innerHeight;
-            this.tableHeight = height - 210;
-            const that = this;
-            window.onresize = function temp() {
-                that.tableHeight = window.innerHeight - 210;    
-            };
-        },
-
-		mounted() {
-			this.getRoles();
-        }
-	}
-</script>
-
-<style scoped>
-    
-</style>

ys_vue/src/views/mold/moldFile.vue

@@ -1,198 +0,0 @@
-<template>
-  <section>
-    <!--工具条-->
-    <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
-      <el-form :inline="true" :model="filters">
-        <el-col :span="2">
-          <el-form-item>
-            <el-select v-model="filters.value" clearable placeholder="全部状态">
-              <el-option label="待审批" value="0"></el-option>
-              <el-option label="未通过" value="1"></el-option>
-              <el-option label="已通过" value="2"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-form-item>
-          <el-input v-model="filters.name" placeholder="请输入名称进行搜索"></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary">查询</el-button>
-        </el-form-item>
-        <el-form-item style="float: right;">
-          <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-form-item>
-      </el-form>
-    </el-col>
-
-    <!--列表-->
-    <el-table
-      :data="moulds"
-      :height="tableHeight"
-      highlight-current-row
-      v-loading="listLoading"
-      style="width: 100%;"
-    >
-      <el-table-column type="index" width="60"></el-table-column>
-      <el-table-column prop="name" label="模具名称" width="200" sortable></el-table-column>
-      <el-table-column prop="type" label="文档类型" width="200" sortable></el-table-column>
-      <el-table-column prop="uploader" label="上传者" width="200" sortable></el-table-column>
-      <el-table-column prop="time" 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-if="scope.row.state == 1">未通过</span>
-          <span v-else>已通过</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="审批" width="200" sortable>
-        <template slot-scope="scope">
-          <template v-if="scope.row.state == 0">
-            <el-button size="small">通过</el-button>
-            <el-button size="small">未通过</el-button>
-          </template>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!--工具条-->
-    <el-col :span="24" class="toolbar">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :page-sizes="[20 , 50 , 80 , 100 , 200]"
-        :page-size="20"
-        layout="total, sizes, prev, pager, next"
-        :total="total"
-        style="float:right;"
-      ></el-pagination>
-    </el-col>
-  </section>
-</template>
-
-<script>
-import util from "../../common/js/util";
-export default {
-  data() {
-    return {
-      moulds: [
-        //临时数据
-        {
-          name: "墨盒类型1",
-          type: "模具3D图档",
-          uploader: "张有财",
-          time: "2019-07-25",
-          state: 0
-        },
-        {
-          name: "墨盒类型啦啦",
-          type: "模具2D图档",
-          uploader: "张啦啦",
-          time: "2019-05-27",
-          state: 1
-        }
-      ],
-      filters: {
-        name: "",
-        value: ""
-      },
-      listLoading: false,
-      total: 0,
-      tableHeight: 0
-    };
-  },
-  methods: {
-    //  分页
-    handleCurrentChange(val) {
-      this.page = val;
-      // this.getUsers();
-    },
-    handleSizeChange(val) {
-      this.size = val;
-      // this.getUsers();
-    },
-    selsChange: function(sels) {
-      this.sels = sels;
-    },
-    toMaintenance(id) {
-      this.$router.push("/detection/" + id);
-    },
-    //上传
-    uploadFile(params) {
-      // var fileObj = params.file;
-      // var form = new FormData();
-      // form.append("projectId", this.proDetail.id);
-      // form.append("file", fileObj);
-      // this.http.uploadFile(
-      //   this.port.mold.moldFileUpload,
-      //   form,
-      //   res => {
-      //     if (res.code == "ok") {
-      //       this.$message({
-      //         message: "上传成功",
-      //         type: "success"
-      //       });
-      //       this.getFileList();
-      //     } else {
-      //       this.$message({
-      //         message: res.msg,
-      //         type: "error"
-      //       });
-      //     }
-      //   },
-      //   error => {
-      //     this.$message({
-      //       message: error,
-      //       type: "error"
-      //     });
-      //   }
-      // );
-    },
-    //获取文档列表
-    getFileList() {
-      this.listLoading = true;
-      this.http.post(
-        this.port.project.fileList,
-        {
-          projectId: this.detailId
-        },
-        res => {
-          this.listLoading = false;
-          if (res.code == "ok") {
-            this.files = res.data;
-          } else {
-            this.$message({
-              message: res.msg,
-              type: "error"
-            });
-          }
-        },
-        error => {
-          this.listLoading = false;
-          this.$message({
-            message: error,
-            type: "error"
-          });
-        }
-      );
-    }
-  },
-  created() {
-    let height = window.innerHeight;
-    this.tableHeight = height - 210;
-  },
-  mounted() {}
-};
-</script>
-
-<style scoped>
-</style>

ys_vue/src/views/project/project.vue

@@ -64,13 +64,21 @@
                 </el-col>
                 <el-col :span="24">
                     <el-form-item label="项目模具" prop="mold">
-                        <el-select v-model="addForm.mold" clearable filterable multiple placeholder="请选择项目模具" value-key='id' style="width:510px">
+                        <el-select v-model="addForm.mold" @change="companyChange" clearable filterable multiple placeholder="请选择项目模具" value-key='id' style="width:510px">
                             <el-option v-for="item in molds" :key="item.id" :label="item.modelName" :value="item">
                                 <span style="float: left">{{ item.modelName }}</span>
                                 <span style="float: right; color: #8492a6; font-size: 6px;margin-right:17px;">{{ item.produceCompany }}</span>
                             </el-option>
                         </el-select>
                     </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                    <el-form-item label="项目经理" prop="managerId">
+                        <el-select v-model="addForm.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-form>
 			<div slot="footer" class="dialog-footer">
@@ -91,7 +99,6 @@
 					keyName: ''
                 },
                 user: JSON.parse(sessionStorage.getItem('user')),
-                company:[],
                 charger: [],
                 molds: [],
 
@@ -147,31 +154,6 @@
                     });
                 })
 
-                this.http.post(this.port.base.addCompanyListToProject, {
-                    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'
-                    });
-                })
-
                 //获取模具
                 this.getMoulds();
             },
@@ -257,8 +239,8 @@
             companyChange() {
                 var param = {} ,
                     str = this.user.companyId;
-                for(var i in this.addForm.molds){
-                    str += "," + this.addForm.molds[i].companyId;
+                for(var i in this.addForm.mold){
+                    str += "," + this.addForm.mold[i].produceCompanyId;
                 }
                 param.companyIds = str;
                 param.id = this.user.id

ys_vue/src/views/project/projectDetail.vue

@@ -149,7 +149,7 @@
                         <el-input v-model="editForm.projectName" autocomplete="off" placeholder="请输入项目名称" style="width:510px"></el-input>
                     </el-form-item>
                 </el-col>
-                <el-col :span="24">
+                <el-col :span="24" v-if="user.parentId == 1 && user.subordinateType == 0">
                     <el-form-item label="项目模具" prop="modelIds">
                         <el-select v-model="editForm.modelIds" @change="companyChange" clearable filterable multiple placeholder="请选择项目模具" value-key='id' style="width:510px">
                             <el-option v-for="item in molds" :key="item.id" :label="item.modelName" :value="item">
@@ -159,7 +159,7 @@
                         </el-select>
                     </el-form-item>
                 </el-col>
-                <el-col :span="24">
+                <el-col :span="24" v-if="user.parentId == 1 && user.subordinateType == 0">
                     <el-form-item label="项目经理" prop="managerId">
                         <el-select v-model="editForm.managerId" @change="changeStaff(0)" clearable filterable placeholder="请选择项目经理" value-key='id' style="width:510px">
                             <el-option v-for="item in charger" :key="item.id" :label="item.username" :value="item">
@@ -168,7 +168,8 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="资产方审批人" prop="ownerApproverId">
+                    <el-form-item label="资产方审批人">
+                        <!--  prop="ownerApproverId" -->
                         <el-select v-model="editForm.ownerApproverId" @change="changeStaff(0)" clearable filterable placeholder="请选择资产方审批人" value-key='id' style="width:190px">
                             <el-option v-for="item in assets" :key="item.id" :label="item.username" :value="item.id">
                             </el-option>
@@ -176,7 +177,8 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="生产方审批人" prop="customerApproverId">
+                    <el-form-item label="生产方审批人">
+                        <!--  prop="customerApproverId" -->
                         <el-select v-model="editForm.customerApproverId" @change="changeStaff(0)" clearable filterable placeholder="请选择生产方审批人" value-key='id' style="width:190px">
                             <el-option v-for="item in produce" :key="item.id" :label="item.username" :value="item.id">
                             </el-option>
@@ -490,8 +492,6 @@
 
                 // 获取模具
                 this.http.post(this.port.mold.chooseModelList, {
-                    // parentId: this.user.parentId,
-                    // id: this.user.id
                     projectId: this.detailId
                 }, res => {
                     if (res.code == "ok") {
@@ -509,7 +509,7 @@
                     });
                 })
 
-                this.http.post(this.port.base.getCompanyByPro, {
+                this.http.post(this.port.base.getProduceCompany, {
                     projectId: this.detailId
                 }, res => {
                     if (res.code == "ok") {

ys_vue/src/views/project/staff.vue

@@ -79,7 +79,7 @@
 				<el-form-item label="手机号" prop="account">
 					<el-input v-model="addForm.account" autocomplete="off" placeholder="请输入手机号（登录账号）"></el-input>
 				</el-form-item>
-                <el-form-item label="参与项目" prop="projectIds">
+                <el-form-item v-if="!(user.parentId == 1 && user.subordinateType == 0)" label="参与项目" prop="projectIds">
 					<el-select v-model="addForm.projectIds" @change="choseProject" clearable filterable placeholder="请选择参与项目" style="width:202px">
                         <el-option v-for="item in projects" :key="item.id" :label="item.projectName" :value="item.id">
                         </el-option>
@@ -224,25 +224,49 @@
 		methods: {
             //获取基础数据
             getMsg(){
-                this.http.post(this.port.project.projectByUser, {}, 
-                res => {
-                    if (res.code == "ok") {
-                        this.projects = res.data;
-                        //再获取一下公司列表
-                        this.getAllCompanies();
-                    } else {
+                if(this.user.parentId == 1 && this.user.subordinateType == 0) {
+                    this.company = [];
+                    this.allCompanies = [];
+                    this.http.post(this.port.base.getCompanyList, {
+                        id: this.user.id,
+                        parentId: this.user.parentId
+                    }, res => {
+                        if (res.code == "ok") {
+                            this.company = res.data;
+                            this.allCompanies = res.data;
+                        } else {
+                            this.$message({
+                                message: res.msg,
+                                type: 'error'
+                            });
+                        }
+                    }, error => {
                         this.$message({
-                            message: res.msg,
+                            message: error,
+                            type: 'error'
+                        });
+                    })
+                } else if(this.user.parentId > 1 && this.user.isManager == 1) {
+                    this.http.post(this.port.project.projectByUser, {}, 
+                    res => {
+                        if (res.code == "ok") {
+                            this.projects = res.data;
+                            //再获取一下公司列表
+                            this.getAllCompanies();
+                        } else {
+                            this.$message({
+                                message: res.msg,
+                                type: 'error'
+                            });
+                        }
+                    }, error => {
+                        this.$message({
+                            message: error,
                             type: 'error'
                         });
-                    }
-                }, error => {
-                    this.$message({
-                        message: error,
-                        type: 'error'
                     });
-                });
-            },
+                }
+            },  
 
             //新版获取所有公司
             getAllCompanies(){
@@ -264,29 +288,6 @@
                 });
             },
 
-            //旧版获取所有公司
-            // getAllCompanies2(){
-            //     this.allCompanies = [];
-            //     this.http.post(this.port.base.companys, {
-            //         id: this.user.id,
-            //         parentId: this.user.parentId
-            //     }, res => {
-            //         if (res.code == "ok") {
-            //             this.allCompanies = res.data;
-            //         } else {
-            //             this.$message({
-            //                 message: res.msg,
-            //                 type: 'error'
-            //             });
-            //         }
-            //     }, error => {
-            //         this.$message({
-            //             message: error,
-            //             type: 'error'
-            //         });
-            //     })
-            // },
-
             //分页
 			handleCurrentChange(val) {
 				this.page = val;
@@ -461,7 +462,7 @@
                     this.company = [];
                     this.addForm.companyId = null;
                 }else{
-                    this.http.post(this.port.base.getCompanyByPro, {
+                    this.http.post(this.port.base.getProduceCompany, {
                         projectId: this.addForm.projectIds
                     }, res => {
                         if (res.code == "ok") {