sunyadv 5 gadi atpakaļ
vecāks
revīzija
bbf3daa9ba

+ 12 - 8
ys_vue/src/views/mold/moldDetail.vue

@@ -371,19 +371,23 @@
                     <el-table :data="documents.abandon" highlight-current-row v-loading="listLoading" style="width: 100%;">
                         <el-table-column type="index" width="40"></el-table-column>
                         <el-table-column prop="fileName" label="申请单名称" sortable>
-                            <template slot-scope="scope" v-if="scope.row.fileUrl != null">
-                                <a v-if="download == 1 && scope.row.state == 3" :href="scope.row.fileUrl" :download="scope.row.fileName" @click="dowloadfile(scope.row.id)">
-                                    {{scope.row.fileName}}
-                                </a>
+                            <template slot-scope="scope">
+                                <div v-if="scope.row.fileUrl != null">
+                                    <a style="color:#20a0ff" v-if="download == 1 && scope.row.state == 3" :href="scope.row.fileUrl" :download="scope.row.fileName" @click="dowloadfile(scope.row.id)">
+                                        {{scope.row.fileName}}
+                                    </a>
+                                </div>
                                 <span v-else>{{scope.row.fileName}}</span>
                             </template>
                         </el-table-column>
                         <el-table-column prop="fileSize" label="申请单大小" width="130" sortable></el-table-column>
                         <el-table-column prop="fileName2" label="报废单名称" sortable>
-                            <template slot-scope="scope" v-if="scope.row.fileUrl != null">
-                                <a v-if="download == 1 && scope.row.state == 3" :href="scope.row.fileUrl2" :download="scope.row.fileName2" @click="dowloadfile(scope.row.id)">
-                                    {{scope.row.fileName2}}
-                                </a>
+                            <template slot-scope="scope">
+                                <div v-if="scope.row.fileUrl != null">
+                                    <a style="color:#20a0ff" v-if="download == 1 && scope.row.state == 3" :href="scope.row.fileUrl2" :download="scope.row.fileName2" @click="dowloadfile(scope.row.id)">
+                                        {{scope.row.fileName2}}
+                                    </a>
+                                </div>
                                 <span v-else>{{scope.row.fileName2}}</span>
                             </template>
                         </el-table-column>

+ 1 - 1
ys_vue/src/views/project/project.vue

@@ -302,7 +302,7 @@
                         for(var i in this.addForm.mold){
                             if(cId.indexOf(this.addForm.mold[i].produceCompanyId) == -1){
                                 cId += this.addForm.mold[i].produceCompanyId + ",";
-                                cName += this.addForm.mold[i].produceCompany + ",";
+                                cName += this.addForm.mold[i].produceCompanyName + ",";
                             }
                             mId += this.addForm.mold[i].id + ","
                         }