flx:修复bug
This commit is contained in:
parent
4ba73c5f74
commit
bb75a476be
@ -123,6 +123,7 @@ import {
|
|||||||
getProjectGroupById,
|
getProjectGroupById,
|
||||||
setProjectGroupEdit,
|
setProjectGroupEdit,
|
||||||
setProjectGroupDelete,
|
setProjectGroupDelete,
|
||||||
|
setProjectGroupSaveObj,
|
||||||
} from '@/assets/js/api/project'
|
} from '@/assets/js/api/project'
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
@ -305,7 +306,7 @@ export default {
|
|||||||
); //添加成功!
|
); //添加成功!
|
||||||
});
|
});
|
||||||
} else if (this.isAdd == 2) {
|
} else if (this.isAdd == 2) {
|
||||||
setProjectGroupEdit({
|
setProjectGroupSaveObj({
|
||||||
...this.cardForm,
|
...this.cardForm,
|
||||||
projectGroupUnitList: result,
|
projectGroupUnitList: result,
|
||||||
}).then((res) => {
|
}).then((res) => {
|
||||||
|
|||||||
@ -207,7 +207,7 @@
|
|||||||
</detail>
|
</detail>
|
||||||
</div>
|
</div>
|
||||||
<!-- 添加卡片弹框 -->
|
<!-- 添加卡片弹框 -->
|
||||||
<el-dialog :destroy-on-close="true" :modal-append-to-body="false" title="" :visible.sync="cardDialog2"
|
<el-dialog :destroy-on-close="true" :modal-append-to-body="false" title="下载人员申请表" :visible.sync="cardDialog2"
|
||||||
width="900px">
|
width="900px">
|
||||||
<div class="dialog_content">
|
<div class="dialog_content">
|
||||||
<div class="percentage_title">
|
<div class="percentage_title">
|
||||||
|
|||||||
@ -3,10 +3,10 @@
|
|||||||
<div style="height: 100%">
|
<div style="height: 100%">
|
||||||
<div class="search-box" style="margin-top: 20px">
|
<div class="search-box" style="margin-top: 20px">
|
||||||
<el-form :inline="true" :model="formInline" class="demo-form-inline" size="small">
|
<el-form :inline="true" :model="formInline" class="demo-form-inline" size="small">
|
||||||
<el-form-item label="所属单位">
|
<!-- <el-form-item label="所属单位">
|
||||||
<el-input placeholder="请输入" v-model="formInline.enterpriseName" clearable style="width: 200px">
|
<el-input placeholder="请输入" v-model="formInline.enterpriseName" clearable style="width: 200px">
|
||||||
</el-input>
|
</el-input>
|
||||||
</el-form-item>
|
</el-form-item> -->
|
||||||
<el-form-item label="姓名">
|
<el-form-item label="姓名">
|
||||||
<el-input placeholder="请输入" v-model="formInline.workerName" clearable style="width: 200px">
|
<el-input placeholder="请输入" v-model="formInline.workerName" clearable style="width: 200px">
|
||||||
</el-input>
|
</el-input>
|
||||||
@ -236,7 +236,7 @@
|
|||||||
<div>
|
<div>
|
||||||
劳动合同:
|
劳动合同:
|
||||||
<div>
|
<div>
|
||||||
<div class="download" @click="downloadFn(item)" v-for="item in cardForm.laborContract" :key="item.id">
|
<div class="download" @click="previewFn(item)" v-for="item in cardForm.laborContract" :key="item.id">
|
||||||
{{ item.name }}
|
{{ item.name }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -244,7 +244,7 @@
|
|||||||
<div>
|
<div>
|
||||||
保险:
|
保险:
|
||||||
<div>
|
<div>
|
||||||
<div class="download" @click="downloadFn(item)" v-for="item in cardForm.insurance" :key="item.id">
|
<div class="download" @click="previewFn(item)" v-for="item in cardForm.insurance" :key="item.id">
|
||||||
{{ item.name }}
|
{{ item.name }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -252,7 +252,7 @@
|
|||||||
<div>
|
<div>
|
||||||
体检报告:
|
体检报告:
|
||||||
<div>
|
<div>
|
||||||
<div class="download" @click="downloadFn(item)" v-for="item in cardForm.examinationImage" :key="item.id">
|
<div class="download" @click="previewFn(item)" v-for="item in cardForm.examinationImage" :key="item.id">
|
||||||
{{ item.name }}
|
{{ item.name }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -282,13 +282,13 @@
|
|||||||
<el-table-column align="center" label="截止日期" prop="effectTime" show-overflow-tooltip></el-table-column>
|
<el-table-column align="center" label="截止日期" prop="effectTime" show-overflow-tooltip></el-table-column>
|
||||||
<el-table-column align="center" label="人员资质" prop="deviceName" show-overflow-tooltip>
|
<el-table-column align="center" label="人员资质" prop="deviceName" show-overflow-tooltip>
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<div class="download" @click="downloadFn(item)" v-for="item in scope.row.photoUrl"
|
<div class="download" @click="previewFn(item)" v-for="item in scope.row.photoUrl"
|
||||||
:key="item.uid">{{ item.name }}</div>
|
:key="item.uid">{{ item.name }}</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column align="center" label="人员资质验证" prop="deviceName" show-overflow-tooltip>
|
<el-table-column align="center" label="人员资质验证" prop="deviceName" show-overflow-tooltip>
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<div class="download" @click="downloadFn(item)" v-for="item in scope.row.qualificationVerification"
|
<div class="download" @click="previewFn(item)" v-for="item in scope.row.qualificationVerification"
|
||||||
:key="item.uid">{{ item.name }}</div>
|
:key="item.uid">{{ item.name }}</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
@ -310,6 +310,7 @@ import {
|
|||||||
getWorkerAdmissionCertificateDetailListApi,
|
getWorkerAdmissionCertificateDetailListApi,
|
||||||
} from "@/assets/js/api/laborPerson";
|
} from "@/assets/js/api/laborPerson";
|
||||||
import { isJSON } from "@/util/nowDate/index";
|
import { isJSON } from "@/util/nowDate/index";
|
||||||
|
import { encode } from 'js-base64'
|
||||||
import moment from "moment";
|
import moment from "moment";
|
||||||
export default {
|
export default {
|
||||||
props: ["workDetail"],
|
props: ["workDetail"],
|
||||||
@ -456,6 +457,13 @@ export default {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
previewFn(row){
|
||||||
|
let src = row.url.includes('http://') ? row.url : this.fileUrl + row.url;
|
||||||
|
this.previewUrl = `http://jxjzw.zhgdyun.com:8012/onlinePreview?url=${encodeURIComponent(encode(src))}`;
|
||||||
|
// console.log(this.previewUrl);
|
||||||
|
window.open(this.previewUrl, "_blank");
|
||||||
|
// this.cardDialog = true;
|
||||||
|
},
|
||||||
downloadFn(row) {
|
downloadFn(row) {
|
||||||
// "http://42.180.188.17:11211/image/669b96b66b90a34a1aa4ec9c.jpg"
|
// "http://42.180.188.17:11211/image/669b96b66b90a34a1aa4ec9c.jpg"
|
||||||
const url = row.url.includes('http://') ? row.url : this.fileUrl + row.url;
|
const url = row.url.includes('http://') ? row.url : this.fileUrl + row.url;
|
||||||
|
|||||||
@ -1047,7 +1047,8 @@ export default {
|
|||||||
const result = res.result.records instanceof Array ? res.result.records : [];
|
const result = res.result.records instanceof Array ? res.result.records : [];
|
||||||
this.unitInfo.dataList = this.unitInfo.dataList.concat(result);
|
this.unitInfo.dataList = this.unitInfo.dataList.concat(result);
|
||||||
console.log(this.unitInfo.dataList);
|
console.log(this.unitInfo.dataList);
|
||||||
if(this.unitInfo.pageNo == 1){
|
const find = this.unitInfo.dataList.find(item => item.certificateIssuingUnitName == "全部");
|
||||||
|
if(this.unitInfo.pageNo == 1 && !find){
|
||||||
this.unitInfo.dataList.unshift({
|
this.unitInfo.dataList.unshift({
|
||||||
id: "",
|
id: "",
|
||||||
certificateIssuingUnitName: "全部",
|
certificateIssuingUnitName: "全部",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user