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

ys_vue/src/port.js

@@ -85,6 +85,7 @@ export default {
         relationList: '/company/relationList', //建立关联公司时的公司列表
         ownerComps: '/company/ownerRelateCompany', //返回当前公司的关联公司列表
         getCompanyByPro: '/company/getProduceCompany', //根据项目id获取项目的生产方公司
+        getInfo: '/company/getProduceCompanyByCurrentUser', //根据当前人登录人所能看到的公司进行 项目 模具 的筛选
 
 
         addFactory: '/factory/add',  //（工厂）

ys_vue/src/views/Home.vue

@@ -36,17 +36,17 @@
                 </span>
                 <div class="popover-item" v-if="popoverData[0].length == 0">暂无审批消息</div>
                 <div class="popover-item" v-for="item in popoverData[0]">
-                  <p class="popover-title">
-                    <span
-                      style="cursor: pointer;"
-                      @click="locationHerf(item.id, item.refId, item.noticeType)"
-                    >
+                  <div
+                    style="cursor: pointer;"
+                    @click="locationHerf(item.id, item.refId, item.noticeType)"
+                  >
+                    <p class="popover-title">
                       <span v-if="item.isRead == 1" class="isRead">{{item.projectName}}</span>
                       <span v-else>{{item.projectName}}</span>
-                    </span>
-                  </p>
-                  <p v-if="item.isRead == 1" class="isRead">{{item.content}}</p>
-                  <p v-else>{{item.content}}</p>
+                    </p>
+                    <p v-if="item.isRead == 1" class="isRead">{{item.content}}</p>
+                    <p v-else>{{item.content}}</p>
+                  </div>
                 </div>
               </el-tab-pane>
 
@@ -58,17 +58,17 @@
                 </span>
                 <div class="popover-item" v-if="popoverData[1].length == 0">暂无警告消息</div>
                 <div class="popover-item" v-for="item in popoverData[1]">
-                  <p class="popover-title">
-                    <span
-                      style="cursor: pointer;"
-                      @click="locationHerf(item.id, item.refId, item.noticeType)"
-                    >
+                  <div
+                    style="cursor: pointer;"
+                    @click="locationHerf(item.id, item.refId, item.noticeType)"
+                  >
+                    <p class="popover-title">
                       <span v-if="item.isRead == 1" class="isRead">{{item.projectName}}</span>
                       <span v-else>{{item.projectName}}</span>
-                    </span>
-                  </p>
-                  <p v-if="item.isRead == 1" class="isRead">{{item.content}}</p>
-                  <p v-else>{{item.content}}</p>
+                    </p>
+                    <p v-if="item.isRead == 1" class="isRead">{{item.content}}</p>
+                    <p v-else>{{item.content}}</p>
+                  </div>
                 </div>
               </el-tab-pane>
 
@@ -80,17 +80,17 @@
                 </span>
                 <div class="popover-item" v-if="popoverData[2].length == 0">暂无保养消息</div>
                 <div class="popover-item" v-for="item in popoverData[2]">
-                  <p class="popover-title">
-                    <span
-                      style="cursor: pointer;"
-                      @click="locationHerf(item.id, item.refId, item.noticeType)"
-                    >
+                  <div
+                    style="cursor: pointer;"
+                    @click="locationHerf(item.id, item.refId, item.noticeType)"
+                  >
+                    <p class="popover-title">
                       <span v-if="item.isRead == 1" class="isRead">{{item.projectName}}</span>
                       <span v-else>{{item.projectName}}</span>
-                    </span>
-                  </p>
-                  <p v-if="item.isRead == 1" class="isRead">{{item.content}}</p>
-                  <p v-else>{{item.content}}</p>
+                    </p>
+                    <p v-if="item.isRead == 1" class="isRead">{{item.content}}</p>
+                    <p v-else>{{item.content}}</p>
+                  </div>
                 </div>
               </el-tab-pane>
             </el-tabs>

ys_vue/src/views/mold/moldDetail.vue

@@ -414,7 +414,7 @@
                 <el-table-column prop="mouldId" label="模具编号" sortable></el-table-column>
                 <el-table-column prop="applicantName" label="申请人" align="center" width="200" sortable></el-table-column>
                 <el-table-column prop="operatorName" label="审批人" align="center" width="200" sortable></el-table-column>
-                <el-table-column prop="isPass" label="状态" width="200" align="center" sortable>
+                <el-table-column label="状态" width="200" align="center" sortable>
                     <template slot-scope="scope">
                         <span v-if="scope.row.isPass == 1">已通过</span>
                         <span v-else>未通过</span>

ys_vue/src/views/mold/moldList.vue

@@ -190,6 +190,7 @@
         },
         methods: {
             getMsg() {
+                //获取模具
                 this.http.post( this.port.base.moulds, {
                     belongCompanyId: this.user.companyId
                 },
@@ -210,49 +211,44 @@
                         type: "error"
                     });
                 });
-
-                this.http.post( this.port.base.ownerComps, {
-                    id: this.user.companyId
-                },
-                res => {
+                //获取公司
+                // this.http.post( this.port.base.ownerComps, {
+                //     id: this.user.companyId
+                // },
+                // res => {
+                //     if (res.code == "ok") {
+                //         this.companys = res.data;
+                //     } else {
+                //         this.$message({
+                //             message: res.msg,
+                //             type: "error"
+                //         });
+                //     }
+                // },
+                // error => {
+                //     this.listLoading = false;
+                //     this.$message({
+                //         message: error,
+                //         type: "error"
+                //     });
+                // });
+                //新版获取公司
+                this.http.post(this.port.base.getInfo, {}, res => {
                     if (res.code == "ok") {
                         this.companys = res.data;
-                    } else {
-                        this.$message({
-                        message: res.msg,
-                        type: "error"
-                        });
-                    }
-                },
-                error => {
-                    this.listLoading = false;
-                    this.$message({
-                        message: error,
-                        type: "error"
-                    });
-                });
-
-                this.http.post( this.port.project.projects, {},
-                res => {
-                    if (res.code == "ok") {
-                        this.projects = res.data;
                     } else {
                         this.$message({
                             message: res.msg,
-                            type: "error"
+                            type: 'error'
                         });
                     }
-                },
-                error => {
-                    this.listLoading = false;
+                }, error => {
                     this.$message({
                         message: error,
-                        type: "error"
+                        type: 'error'
                     });
                 });
-            },
-            //超级管理员获取项目列表
-            getMsg2(){
+                //获取项目
                 this.http.post( this.port.project.projects, {},
                 res => {
                     if (res.code == "ok") {
@@ -415,7 +411,7 @@
                         });
                     }
                 });
-            }
+            },
         },
         created() {
             let height = window.innerHeight;
@@ -426,11 +422,7 @@
             };
         },
         mounted() {
-            if(this.user.id != 1){
-                this.getMsg();
-            }else{
-                this.getMsg2();
-            }
+            this.getMsg();
             this.getMoldList();
         }
     };

ys_vue/src/views/project/staff.vue

@@ -244,13 +244,10 @@
                 });
             },
 
-            //获取所有公司
+            //新版获取所有公司
             getAllCompanies(){
                 this.allCompanies = [];
-                this.http.post(this.port.base.companys, {
-                    id: this.user.id,
-                    parentId: this.user.parentId
-                }, res => {
+                this.http.post(this.port.base.getInfo, {}, res => {
                     if (res.code == "ok") {
                         this.allCompanies = res.data;
                     } else {
@@ -264,9 +261,32 @@
                         message: error,
                         type: 'error'
                     });
-                })
+                });
             },
 
+            //旧版获取所有公司
+            // 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;