前端修改

ys_vue/src/views/Home.vue

@@ -34,15 +34,19 @@
                   <span v-if="unreadCount[0] == 0">审批</span>
                   <span v-else>审批（{{unreadCount[0]}}）</span>
                 </span>
-                <div class="popover-item" v-if="unreadCount[0] == 0">暂无审批消息</div>
+                <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)"
-                    >{{item.projectName}}</span>
+                    >
+                      <span v-if="item.isRead == 1" class="isRead">{{item.projectName}}</span>
+                      <span v-else>{{item.projectName}}</span>
+                    </span>
                   </p>
-                  <p>{{item.content}}</p>
+                  <p v-if="item.isRead == 1" class="isRead">{{item.content}}</p>
+                  <p v-else>{{item.content}}</p>
                 </div>
               </el-tab-pane>
 
@@ -52,15 +56,19 @@
                   <span v-if="unreadCount[1] == 0">警告</span>
                   <span v-else>警告（{{unreadCount[1]}}）</span>
                 </span>
-                <div class="popover-item" v-if="unreadCount[1] == 0">暂无警告消息</div>
+                <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)"
-                    >{{item.projectName}}</span>
+                    >
+                      <span v-if="item.isRead == 1" class="isRead">{{item.projectName}}</span>
+                      <span v-else>{{item.projectName}}</span>
+                    </span>
                   </p>
-                  <p>{{item.content}}</p>
+                  <p v-if="item.isRead == 1" class="isRead">{{item.content}}</p>
+                  <p v-else>{{item.content}}</p>
                 </div>
               </el-tab-pane>
 
@@ -70,15 +78,19 @@
                   <span v-if="unreadCount[2] == 0">保养</span>
                   <span v-else>保养（{{unreadCount[2]}}）</span>
                 </span>
-                <div class="popover-item" v-if="unreadCount[2] == 0">暂无保养消息</div>
+                <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)"
-                    >{{item.projectName}}</span>
+                    >
+                      <span v-if="item.isRead == 1" class="isRead">{{item.projectName}}</span>
+                      <span v-else>{{item.projectName}}</span>
+                    </span>
                   </p>
-                  <p>{{item.content}}</p>
+                  <p v-if="item.isRead == 1" class="isRead">{{item.content}}</p>
+                  <p v-else>{{item.content}}</p>
                 </div>
               </el-tab-pane>
             </el-tabs>
@@ -291,7 +303,7 @@ export default {
         username: [{ required: true, message: "请输入姓名", trigger: "blur" }]
       },
       //消息数据
-      popoverData: [],
+      popoverData: ["", "", ""],
       unreadCount: [],
       activePage: 0
     };
@@ -699,4 +711,8 @@ export default {
   text-align: center;
   cursor: pointer;
 }
+
+.isRead {
+  color: #999 !important;
+}
 </style>

ys_vue/src/views/base/comp.vue

@@ -18,8 +18,12 @@
 		<!--列表-->
 		<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="companyName" label="资产方名称" width="250" sortable></el-table-column>
+			<el-table-column prop="companyName" label="资产方名称" width="250" sortable>
+            </el-table-column>
             <el-table-column prop="administrator" label="资产方管理员" width="150" sortable>
+                <template slot-scope="scope">
+                    <router-link to="/staff" tag="span" style="cursor: pointer; color: #409eff;">{{scope.row.administrator}}</router-link>
+                </template>
             </el-table-column>
             <el-table-column prop="relateCompanyList" label="关联生产方" width="400" sortable>
                 <template slot-scope="scope">

ys_vue/src/views/detection/detection.vue

@@ -46,14 +46,14 @@
       <el-table-column prop="ocCycle" label="每模平均周期" align="center" width="140" sortable></el-table-column>
       <el-table-column prop="hillNumber" label="电量" align="center" width="80" sortable></el-table-column>
       <el-table-column prop="state" label="当前状态" align="center" width="100" sortable></el-table-column>
-      <el-table-column label="云模盒报警N/A" align="center" width="160">低电量、温度过高</el-table-column>
+      <el-table-column label="云模盒报警" align="center" width="160">低电量、温度过高</el-table-column>
       <el-table-column label="模具保养" align="center" width="100">
         <template slot-scope="scope">
           <span v-if="scope.row.isMaintain == 1">需要</span>
           <span v-else>正常</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="85">
+      <el-table-column label="处理" align="center" width="85">
         <template slot-scope="scope">
           <el-button type="primary" @click="toMaintenance(scope.row.id)">详情</el-button>
         </template>

ys_vue/src/views/mold/moldDetail.vue

@@ -134,7 +134,7 @@
 
             <!-- 更新4 -->
             <el-button
-                v-show="activeTab == 4 && user.id == moldDetail.managerId && canInitiate"
+                v-show="activeTab == 4 && user.id == moldDetail.managerId && canInitiate && updateAble"
                 size="mini"
                 type="primary"
                 style="float: right;"
@@ -607,6 +607,8 @@
                 approve: 0,
 
                 canInitiate: true,
+                //根据状态判断能否更新
+                updateAble: true,
 
                 //6种文档
                 documents: {
@@ -824,6 +826,8 @@
                         }
                         //顺便再把下面操作记录读取一下
                         this.getOperationRecord(this.activeTab);
+                        //顺便再看看可不可以申请更新
+                        this.checkUpdateState();
                     } else {
                         this.$message({
                             message: res.msg,
@@ -839,6 +843,17 @@
                 });
             },
 
+            //查看有无审核中或者审核成功的更新申请
+            checkUpdateState(){
+                this.updateAble = true;
+                this.documents.update.forEach(item => {
+                    if(item.state != "-1" || item.state != "-2"){
+                        //有进行中的更新申请 现在不能再申请更新了
+                        this.updateAble = false;
+                    }
+                });
+            },
+
             //将list中对应的文件传入相应的document下
             setList(list, num) {
                 var array = [];

ys_vue/src/views/mold/moldDownload.vue

@@ -39,7 +39,11 @@
     >
       <el-table-column type="selection" width="40"></el-table-column>
       <el-table-column type="index" width="60"></el-table-column>
-      <el-table-column width="200" label="模具名称" prop="modelName"></el-table-column>
+      <el-table-column width="200" label="模具名称">
+        <template slot-scope="scope">
+            <router-link :to="'/moldList/' + scope.row.id" tag="span" style="color: #409eff;cursor: pointer;">{{scope.row.modelName}}</router-link>
+        </template>
+      </el-table-column>
       <el-table-column width="200" label="模具3D图档">
         <template slot-scope="scope">
           <span v-if="scope.row.mould3DFiles.length == 0">未上传</span>
@@ -172,7 +176,6 @@ export default {
               file.sparepart3DFilesState = sparepart3DFilesState;
               file.maintainFilesState = maintainFilesState;
             });
-            // console.log(this.documents);
           } else {
             this.$message({
               message: res.msg,

ys_vue/src/views/mold/moldList.vue

@@ -251,6 +251,27 @@
                     });
                 });
             },
+            //超级管理员获取项目列表
+            getMsg2(){
+                this.http.post( this.port.project.projects, {},
+                res => {
+                    if (res.code == "ok") {
+                        this.projects = res.data;
+                    } else {
+                        this.$message({
+                            message: res.msg,
+                            type: "error"
+                        });
+                    }
+                },
+                error => {
+                    this.listLoading = false;
+                    this.$message({
+                        message: error,
+                        type: "error"
+                    });
+                });
+            },
             //分页
             handleCurrentChange(val) {
                 this.page = val;
@@ -407,6 +428,8 @@
         mounted() {
             if(this.user.id != 1){
                 this.getMsg();
+            }else{
+                this.getMsg2();
             }
             this.getMoldList();
         }