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

ys_vue/src/main.js

@@ -48,8 +48,13 @@ router.beforeEach((to, from, next) => {
                 if(routes[i].name == "项目管理" && user.parentId > 1){
                     var children = routes[i].children;
                     for(var j in children){
-                        if(children[j].name == "人员管理" && user.isManager == 0){
-                            children[j].hidden = true
+
+                        if(children[j].name == "人员管理"){
+                            if(user.isManager == 0){
+                                children[j].hidden = true
+                            } else {
+                                children[j].hidden = false
+                            }
                         }
 
                         if(children[j].name == "权限管理"){

ys_vue/src/views/mold/moldDetail.vue

@@ -153,15 +153,15 @@
                             <span v-if="scope.row.state == -2">生产方审核不通过</span>
                             <span v-else-if="scope.row.state == -1">资产方审核不通过</span>
                             <span v-else-if="scope.row.state == 0">待双方审核</span>
-                            <span v-else-if="scope.row.state == 1">待资产方审核</span>
-                            <span v-else-if="scope.row.state == 2">待生产方审核</span>
+                            <span v-else-if="scope.row.state == 1">待生产方审核</span>
+                            <span v-else-if="scope.row.state == 2">待资产方审核</span>
                             <span v-else-if="scope.row.state == 3">审核通过</span>
                             </template>
                         </el-table-column>
                         <el-table-column label="操作" width="200" align="center" sortable>
                             <template slot-scope="scope">
                                 <el-button size="small"
-                                    v-if="approve == 1 && (scope.row.state == 0 || (scope.row.state == 1 && user.subordinateType == 0) || (scope.row.state == 2 && user.subordinateType == 1))" 
+                                    v-if="approve == 1 && (scope.row.state == 0 || (scope.row.state == 1 && user.subordinateType == 1) || (scope.row.state == 2 && user.subordinateType == 0))" 
                                     @click="checkOpen(scope.row.id, scope.row.fileName)">审批</el-button>
                                 <a :href="scope.row.fileUrl" :download="scope.row.fileName" v-if="download == 1 && scope.row.state == 3">
                                     <el-button size="small" @click="dowloadfile(scope.row.id)">下载</el-button>
@@ -196,15 +196,15 @@
                             <span v-if="scope.row.state == -2">生产方审核不通过</span>
                             <span v-else-if="scope.row.state == -1">资产方审核不通过</span>
                             <span v-else-if="scope.row.state == 0">待双方审核</span>
-                            <span v-else-if="scope.row.state == 1">待资产方审核</span>
-                            <span v-else-if="scope.row.state == 2">待生产方审核</span>
+                            <span v-else-if="scope.row.state == 1">待生产方审核</span>
+                            <span v-else-if="scope.row.state == 2">待资产方审核</span>
                             <span v-else-if="scope.row.state == 3">审核通过</span>
                             </template>
                         </el-table-column>
                         <el-table-column label="操作" width="200" sortable>
                             <template slot-scope="scope">
                                 <el-button size="small" 
-                                    v-if="approve == 1 && (scope.row.state == 0 || (scope.row.state == 1 && user.subordinateType == 0) || (scope.row.state == 2 && user.subordinateType == 1))" 
+                                    v-if="approve == 1 && (scope.row.state == 0 || (scope.row.state == 1 && user.subordinateType == 1) || (scope.row.state == 2 && user.subordinateType == 0))" 
                                     @click="checkOpen(scope.row.id, scope.row.fileName)">审批</el-button>
                                 <a :href="scope.row.fileUrl" :download="scope.row.fileName" v-if="download == 1 && scope.row.state == 3">
                                     <el-button size="small" @click="dowloadfile(scope.row.id)">下载</el-button>
@@ -235,15 +235,15 @@
                             <span v-if="scope.row.state == -2">生产方审核不通过</span>
                             <span v-else-if="scope.row.state == -1">资产方审核不通过</span>
                             <span v-else-if="scope.row.state == 0">待双方审核</span>
-                            <span v-else-if="scope.row.state == 1">待资产方审核</span>
-                            <span v-else-if="scope.row.state == 2">待生产方审核</span>
+                            <span v-else-if="scope.row.state == 1">待生产方审核</span>
+                            <span v-else-if="scope.row.state == 2">待资产方审核</span>
                             <span v-else-if="scope.row.state == 3">审核通过</span>
                             </template>
                         </el-table-column>
                         <el-table-column label="操作" width="200" sortable>
                             <template slot-scope="scope">
                                 <el-button size="small" 
-                                    v-if="approve == 1 && (scope.row.state == 0 || (scope.row.state == 1 && user.subordinateType == 0) || (scope.row.state == 2 && user.subordinateType == 1))" 
+                                    v-if="approve == 1 && (scope.row.state == 0 || (scope.row.state == 1 && user.subordinateType == 1) || (scope.row.state == 2 && user.subordinateType == 0))" 
                                     @click="checkOpen(scope.row.id, scope.row.fileName)">审批</el-button>
                                 <a :href="scope.row.fileUrl" :download="scope.row.fileName" v-if="download == 1 && scope.row.state == 3">
                                     <el-button size="small" @click="dowloadfile(scope.row.id)">下载</el-button>
@@ -274,15 +274,15 @@
                             <span v-if="scope.row.state == -2">生产方审核不通过</span>
                             <span v-else-if="scope.row.state == -1">资产方审核不通过</span>
                             <span v-else-if="scope.row.state == 0">待双方审核</span>
-                            <span v-else-if="scope.row.state == 1">待资产方审核</span>
-                            <span v-else-if="scope.row.state == 2">待生产方审核</span>
+                            <span v-else-if="scope.row.state == 1">待生产方审核</span>
+                            <span v-else-if="scope.row.state == 2">待资产方审核</span>
                             <span v-else-if="scope.row.state == 3">审核通过</span>
                             </template>
                         </el-table-column>
                         <el-table-column label="操作" width="200" sortable>
                             <template slot-scope="scope">
                                 <el-button size="small" 
-                                    v-if="approve == 1 && (scope.row.state == 0 || (scope.row.state == 1 && user.subordinateType == 0) || (scope.row.state == 2 && user.subordinateType == 1))" 
+                                    v-if="approve == 1 && (scope.row.state == 0 || (scope.row.state == 1 && user.subordinateType == 1) || (scope.row.state == 2 && user.subordinateType == 0))" 
                                     @click="checkOpen(scope.row.id, scope.row.fileName)">审批</el-button>
                                 <a :href="scope.row.fileUrl" :download="scope.row.fileName" v-if="download == 1 && scope.row.state == 3">
                                     <el-button size="small" @click="dowloadfile(scope.row.id)">下载</el-button>
@@ -308,15 +308,15 @@
                             <span v-if="scope.row.state == -2">生产方审核不通过</span>
                             <span v-else-if="scope.row.state == -1">资产方审核不通过</span>
                             <span v-else-if="scope.row.state == 0">待双方审核</span>
-                            <span v-else-if="scope.row.state == 1">待资产方审核</span>
-                            <span v-else-if="scope.row.state == 2">待生产方审核</span>
+                            <span v-else-if="scope.row.state == 1">待生产方审核</span>
+                            <span v-else-if="scope.row.state == 2">待资产方审核</span>
                             <span v-else-if="scope.row.state == 3">审核通过</span>
                             </template>
                         </el-table-column>
                         <el-table-column label="操作" width="200" sortable>
                             <template slot-scope="scope">
                                 <el-button size="small" 
-                                    v-if="approve == 1 && (scope.row.state == 0 || (scope.row.state == 1 && user.subordinateType == 0) || (scope.row.state == 2 && user.subordinateType == 1))" 
+                                    v-if="approve == 1 && (scope.row.state == 0 || (scope.row.state == 1 && user.subordinateType == 1) || (scope.row.state == 2 && user.subordinateType == 0))" 
                                     @click="checkOpen(scope.row.id, scope.row.fileName)">审批</el-button>
                                 <a :href="scope.row.fileUrl" :download="scope.row.fileName" v-if="download == 1 && scope.row.state == 3">
                                     <el-button size="small" @click="dowloadfile(scope.row.id)">下载</el-button>
@@ -342,15 +342,15 @@
                                 <span v-if="scope.row.state == -2">生产方审核不通过</span>
                                 <span v-else-if="scope.row.state == -1">资产方审核不通过</span>
                                 <span v-else-if="scope.row.state == 0">待双方审核</span>
-                                <span v-else-if="scope.row.state == 1">待资产方审核</span>
-                                <span v-else-if="scope.row.state == 2">待生产方审核</span>
+                                <span v-else-if="scope.row.state == 1">待生产方审核</span>
+                                <span v-else-if="scope.row.state == 2">待资产方审核</span>
                                 <span v-else-if="scope.row.state == 3">审核通过</span>
                             </template>
                         </el-table-column>
                         <el-table-column label="操作" width="200" sortable>
                             <template slot-scope="scope">
                                 <el-button size="small" 
-                                    v-if="approve == 1 && (scope.row.state == 0 || (scope.row.state == 1 && user.subordinateType == 0) || (scope.row.state == 2 && user.subordinateType == 1))" 
+                                    v-if="approve == 1 && (scope.row.state == 0 || (scope.row.state == 1 && user.subordinateType == 1) || (scope.row.state == 2 && user.subordinateType == 0))" 
                                     @click="checkOpen(scope.row.id, scope.row.fileName)">审批</el-button>
                                 <a :href="scope.row.fileUrl" :download="scope.row.fileName" v-if="download == 1 && scope.row.state == 3">
                                     <el-button size="small" @click="dowloadfile(scope.row.id)">下载</el-button>

ys_vue/src/views/project/competence.vue

@@ -15,7 +15,7 @@
 					<el-input v-model="filters.keyName" placeholder="请输入姓名进行搜索"></el-input>
 				</el-form-item>
 				<el-form-item>
-					<el-button type="primary" @click="getUsers">查询</el-button>
+					<el-button type="primary" @click="getPowerList">查询</el-button>
 				</el-form-item>
 			</el-form>
 		</el-col>
@@ -284,6 +284,12 @@
 
 </script>
 
-<style scoped>
+<style>
+    .el-table__row .el-checkbox__inner:hover {
+        border-color: #DCDFE6;
+    }
 
+    .el-table__row .el-checkbox , .el-table__row .el-checkbox__input {
+        cursor: inherit;
+    }
 </style>

ys_vue/src/views/project/project.vue

@@ -24,12 +24,12 @@
                     <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="资产方公司" sortable>
+			</el-table-column>
             <el-table-column prop="customCompaniesStr" label="生产方公司" width="500">
 			</el-table-column>
             <el-table-column prop="manager" label="项目经理" width="100" align="center" sortable>
 			</el-table-column>
-			<!-- <el-table-column prop="creator" label="项目创建人" align="center"  sortable>
-			</el-table-column> -->
 			<el-table-column prop="indate" label="创建时间" width="250" align="center" sortable>
 			</el-table-column>
 			<!-- <el-table-column label="操作" width="250" align="center">

ys_vue/src/views/project/staff.vue

@@ -38,6 +38,14 @@
 			<el-table-column prop="account" label="用户名" width="150" sortable></el-table-column>
 			<el-table-column prop="mobile" label="联系方式" width="150" sortable></el-table-column>
 			<el-table-column prop="teamName" label="类型" width="150" sortable></el-table-column>
+            <el-table-column prop="projects" label="参与项目" sortable>
+                <template slot-scope="scope">
+                    <span class="info" v-for="(item, index) in scope.row.projects">
+                        {{item.projectName}}
+                        <span v-if="index != scope.row.projects.length-1">、</span>
+                    </span>
+                </template>
+			</el-table-column>
 			<el-table-column prop="companyName" label="公司" sortable></el-table-column>
             <el-table-column prop="roleName" label="角色" sortable></el-table-column>
 			<el-table-column label="操作" width="150">
@@ -85,7 +93,7 @@
                         </el-option>
                     </el-select>
 				</el-form-item>
-                <el-form-item label="角色" prop="roleName">
+                <el-form-item label="角色">
                     <el-input v-model="addForm.roleName" autocomplete="off" placeholder="请输入角色名称"></el-input>
 				</el-form-item>
 			</el-form>
@@ -120,7 +128,7 @@
                         </el-option>
                     </el-select>
 				</el-form-item>
-                <el-form-item label="角色" prop="roleName">
+                <el-form-item label="角色">
                     <el-input v-model="editForm.roleName" autocomplete="off" placeholder="请输入角色名称"></el-input>
 				</el-form-item>
 			</el-form>
@@ -185,9 +193,9 @@
                     companyId: [
 						{ required: true, message: '请选择所属公司', trigger: ["blur",'change'] }
 					],
-                    roleName: [
-						{ required: true, message: '请输入角色名称', trigger: ["blur",'change'] }
-					]
+                    // roleName: [
+					// 	{ required: true, message: '请输入角色名称', trigger: ["blur",'change'] }
+					// ]
                 },
 
                 //新增界面是否显示
@@ -292,7 +300,7 @@
                     account: '',
                     mobile: '',
                     // teamName: '',
-					companyId: '',
+					companyId: this.company[0].id,
                     roleName: '',
                     flag: 0
 				};