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

ys_vue/src/views/mold/moldDetail.vue

@@ -402,19 +402,23 @@
                 {{activeTab == 4?"更新":"操作"}}记录
                 <el-button v-if="(user.subordinateType == 0 || user.subordinateType == 1 || user.id == moldDetail.managerId) && activeTab != 4" size="mini" type="primary" style="float: right;" @click="centerDialog5Visible = true">导出</el-button>
             </el-col>
-            <el-table v-if="activeTab != 4" :data="operations" highlight-current-row v-loading="listLoading" style="width: 100%;">
+            <el-table v-show="activeTab != 4" :data="operations" highlight-current-row v-loading="listLoading" style="width: 100%;">
                 <el-table-column type="index" width="40"></el-table-column>
                 <el-table-column prop="content" label="操作" width="120" sortable></el-table-column>
                 <el-table-column v-if="activeTab!= 4" prop="fileName" label="操作文档名称" sortable></el-table-column>
                 <el-table-column prop="operatorName" label="操作人" align="center" width="120" sortable></el-table-column>
                 <el-table-column prop="indate" label="操作时间" width="200" align="center" sortable></el-table-column>
             </el-table>
-            <el-table v-else :data="operations" highlight-current-row v-loading="listLoading" style="width: 100%;">
+            <el-table v-show="activeTab == 4" :data="operations" highlight-current-row v-loading="listLoading" style="width: 100%;">
                 <el-table-column type="index" width="40"></el-table-column>
-                <el-table-column prop="mouldId" label="模具编号" sortable></el-table-column>
+                <el-table-column label="模具编号" sortable>
+                    <template slot-scope="scope">
+                        <router-link :to="'/moldList/' + scope.row.mouldId" tag="span" style="cursor: pointer;color: #409eff;">{{scope.row.mouldNo}}</router-link>
+                    </template>
+                </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 label="状态" width="200" align="center" sortable>
+                <el-table-column label="状态" align="center" sortable>
                     <template slot-scope="scope">
                         <span v-if="scope.row.isPass == 1">已通过</span>
                         <span v-else>未通过</span>

ys_vue/src/views/project/projectDetail.vue

@@ -104,9 +104,11 @@
                                 <el-table-column prop="indate" label="上传时间" width="200" align="center" sortable></el-table-column>
                                 <el-table-column label="操作" width="220" align="center" sortable>
                                     <template slot-scope="scope" v-if="download == 1">
-                                        <el-button size="small" @click="dowloadFile(scope.row.id)">
-                                            <a :href="scope.row.url" :download="scope.row.fileName">下载</a>
-                                        </el-button>
+                                        <a :href="scope.row.url" :download="scope.row.fileName">
+                                            <el-button size="small" @click="dowloadFile(scope.row)">
+                                                下载
+                                            </el-button>
+                                        </a>
                                         <el-button size="small" type="danger" @click="fileDel(scope.row.id)" v-if="scope.row.uploaderId == user.id">删除</el-button>
                                     </template>
                                     <template slot-scope="scope" v-else>
@@ -908,9 +910,9 @@
             },
 
             //下载
-            dowloadFile(id) {
+            dowloadFile(row) {
                 this.http.post(this.port.project.dowloadFile, {
-                    id: id
+                    id: row.id
                 }, res => {
                     this.getOperList();
                 }, error => {