Merge branch 'master' of http://47.92.161.104:10080/shuzhan/jp-employment-portal

src/views/job/resumeDeliver-detail.vue

@@ -66,7 +66,8 @@ export default {
         companyPhone:"",
         chatDate:"",
         chatTime:"",
-        chatType:""
+        chatType:"",
+        resumeDeliverId:"",
       },
       ruleValidate: {
         realName: [{ required: true, message: "联系人不能为空", trigger: "blur" }],

src/views/job/resumeDeliver-list.vue

@@ -78,9 +78,9 @@
                         <el-link @click="handleWorkExp(row)" target="_blank" type="primary">查看</el-link>
                     </template>
                 </el-table-column>
-                <el-table-column prop="sortNo" label="简历附件" width="80">
+                <el-table-column prop="resumeUrls" label="简历附件" width="80">
                     <template slot-scope="{ row }">
-                        <el-link @click="handleDownload(row)" target="_blank" type="primary">下载</el-link>
+                        <el-link v-if="row.resumeUrls" :href="row.resumeUrls" target="_blank" type="primary">下载</el-link>
                     </template>
                 </el-table-column>
                 <el-table-column prop="jobStatusN" label="工作状态" width="80"></el-table-column>
@@ -130,9 +130,9 @@
                         <el-link @click="handleWorkExp(row)" target="_blank" type="primary">查看</el-link>
                     </template>
                 </el-table-column>
-                <el-table-column prop="sortNo" label="简历附件" width="80">
+                <el-table-column prop="resumeUrls" label="简历附件" width="80">
                     <template slot-scope="{ row }">
-                        <el-link @click="handleDownload(row)" target="_blank" type="primary">下载</el-link>
+                        <el-link v-if="row.resumeUrls" :href="row.resumeUrls" target="_blank" type="primary">下载</el-link>
                     </template>
                 </el-table-column>
                 <el-table-column prop="jobStatusN" label="工作状态" width="80"></el-table-column>
@@ -182,9 +182,9 @@
                         <el-link @click="handleWorkExp(row)" target="_blank" type="primary">查看</el-link>
                     </template>
                 </el-table-column>
-                <el-table-column prop="sortNo" label="简历附件" width="80">
+                <el-table-column prop="resumeUrls" label="简历附件" width="80">
                     <template slot-scope="{ row }">
-                        <el-link @click="handleDownload(row)" target="_blank" type="primary">下载</el-link>
+                        <el-link v-if="row.resumeUrls" :href="row.resumeUrls" target="_blank" type="primary">下载</el-link>
                     </template>
                 </el-table-column>
                 <el-table-column prop="jobStatusN" label="工作状态" width="80"></el-table-column>
@@ -234,9 +234,9 @@
                         <el-link @click="handleWorkExp(row)" target="_blank" type="primary">查看</el-link>
                     </template>
                 </el-table-column>
-                <el-table-column prop="sortNo" label="简历附件" width="80">
+                <el-table-column prop="resumeUrls" label="简历附件" width="80">
                     <template slot-scope="{ row }">
-                        <el-link @click="handleDownload(row)" target="_blank" type="primary">下载</el-link>
+                        <el-link v-if="row.resumeUrls" :href="row.resumeUrls" target="_blank" type="primary">下载</el-link>
                     </template>
                 </el-table-column>
                 <el-table-column prop="jobStatusN" label="工作状态" width="80"></el-table-column>
@@ -287,9 +287,9 @@
                         <el-link @click="handleWorkExp(row)" target="_blank" type="primary">查看</el-link>
                     </template>
                 </el-table-column>
-                <el-table-column prop="sortNo" label="简历附件" width="80">
+                <el-table-column prop="resumeUrls" label="简历附件" width="80">
                     <template slot-scope="{ row }">
-                        <el-link @click="handleDownload(row)" target="_blank" type="primary">下载</el-link>
+                        <el-link v-if="row.resumeUrls" :href="row.resumeUrls" target="_blank" type="primary">下载</el-link>
                     </template>
                 </el-table-column>
                 <el-table-column prop="jobStatusN" label="工作状态" width="80"></el-table-column>
@@ -339,9 +339,9 @@
                         <el-link @click="handleWorkExp(row)" target="_blank" type="primary">查看</el-link>
                     </template>
                 </el-table-column>
-                <el-table-column prop="sortNo" label="简历附件" width="80">
+                <el-table-column prop="resumeUrls" label="简历附件" width="80">
                     <template slot-scope="{ row }">
-                        <el-link @click="handleDownload(row)" target="_blank" type="primary">下载</el-link>
+                        <el-link v-if="row.resumeUrls" :href="row.resumeUrls" target="_blank" type="primary">下载</el-link>
                     </template>
                 </el-table-column>
                 <el-table-column prop="jobStatusN" label="工作状态" width="80"></el-table-column>
@@ -391,9 +391,9 @@
                         <el-link @click="handleWorkExp(row)" target="_blank" type="primary">查看</el-link>
                     </template>
                 </el-table-column>
-                <el-table-column prop="sortNo" label="简历附件" width="80">
+                <el-table-column prop="resumeUrls" label="简历附件" width="80">
                     <template slot-scope="{ row }">
-                        <el-link @click="handleDownload(row)" target="_blank" type="primary">下载</el-link>
+                        <el-link v-if="row.resumeUrls" :href="row.resumeUrls" target="_blank" type="primary">下载</el-link>
                     </template>
                 </el-table-column>
                 <el-table-column prop="jobStatusN" label="工作状态" width="80"></el-table-column>
@@ -1004,7 +1004,7 @@ export default {
 
       var formData = new FormData();
 
-      formData.append("id", row.id);
+      formData.append("id", row.jobUserId);
 
       jobUserApi
         .exportXls(formData)