Skip to content

F
founder_vue
Commit d15eccaa by liuyaxin
Options

警犬页面修改

parent 96b74937
Showing with 151 additions and 89 deletions
src/utils/tableHeaderParams.js
...@@ -349,16 +349,12 @@ export const getGzqfxglAllColumns = () => { ...@@ -349,16 +349,12 @@ export const getGzqfxglAllColumns = () => {
label: "评定单位", label: "评定单位",
prop: "checkUnit", prop: "checkUnit",
}, },
// {
// label: "评定结果",
// prop: "trainResult",
// },
{ {
label: "主考人", label: "主考人",
prop: "checkStaff", prop: "checkStaff",
}, },
{ {
label: "评定科目", label: "申请评定专业方向",
prop: "trainSubjectStr", prop: "trainSubjectStr",
}, },
{ {
...@@ -374,7 +370,7 @@ export const getGzqfxglAllColumns = () => { ...@@ -374,7 +370,7 @@ export const getGzqfxglAllColumns = () => {
prop: "pdtraininglevelidStr", prop: "pdtraininglevelidStr",
}, },
{ {
label: "申请评定日期", label: "申请考试日期",
prop: "checkDateStr", prop: "checkDateStr",
}, },
{ {
...@@ -411,16 +407,12 @@ export const getGzqfxglAllColumnsSh = () => { ...@@ -411,16 +407,12 @@ export const getGzqfxglAllColumnsSh = () => {
label: "评定单位", label: "评定单位",
prop: "checkUnit", prop: "checkUnit",
}, },
// {
// label: "评定结果",
// prop: "trainResult",
// },
{ {
label: "主考人", label: "主考人",
prop: "checkStaff", prop: "checkStaff",
}, },
{ {
label: "评定科目", label: "申请评定专业方向",
prop: "trainSubjectStr", prop: "trainSubjectStr",
}, },
{ {
...@@ -436,7 +428,7 @@ export const getGzqfxglAllColumnsSh = () => { ...@@ -436,7 +428,7 @@ export const getGzqfxglAllColumnsSh = () => {
prop: "pdtraininglevelidStr", prop: "pdtraininglevelidStr",
}, },
{ {
label: "申请评定日期", label: "申请考试日期",
prop: "checkDateStr", prop: "checkDateStr",
}, },
{ {
...@@ -475,7 +467,7 @@ export const getGzqfxglDefaultColumns = () => { ...@@ -475,7 +467,7 @@ export const getGzqfxglDefaultColumns = () => {
prop: "pdtraininglevelidStr", prop: "pdtraininglevelidStr",
}, },
{ {
label: "申请评定日期", label: "申请考试日期",
prop: "checkDateStr", prop: "checkDateStr",
}, },
{ {
...@@ -486,10 +478,7 @@ export const getGzqfxglDefaultColumns = () => { ...@@ -486,10 +478,7 @@ export const getGzqfxglDefaultColumns = () => {
label: "工作犬评定日期", label: "工作犬评定日期",
prop: "workdogpdrqStr", prop: "workdogpdrqStr",
}, },
// {
// label: "评定结果",
// prop: "trainResult",
// },
{ {
label: "审核状态", label: "审核状态",
prop: "spFlowStr", prop: "spFlowStr",
...@@ -519,7 +508,7 @@ export const getGzqfxglDefaultColumnsSh = () => { ...@@ -519,7 +508,7 @@ export const getGzqfxglDefaultColumnsSh = () => {
prop: "pdtraininglevelidStr", prop: "pdtraininglevelidStr",
}, },
{ {
label: "申请评定日期", label: "申请考试日期",
prop: "checkDateStr", prop: "checkDateStr",
}, },
{ {
......
src/views/jobDogManage/components/jobDogManageEdit2.vue
...@@ -373,7 +373,7 @@ ...@@ -373,7 +373,7 @@
class="elItemClassOne elDateClass sxjqClass" class="elItemClassOne elDateClass sxjqClass"
> >
<template slot="label"> <template slot="label">
<span class="labelNameClass">评定日期</span> <span class="labelNameClass">考试日期</span>
<span class="yuandianClass"></span> <span class="yuandianClass"></span>
<span class="numClass">{{ index + 1 }}</span> <span class="numClass">{{ index + 1 }}</span>
</template> </template>
...@@ -414,13 +414,13 @@ ...@@ -414,13 +414,13 @@
:prop="'propKaoHe' + index" :prop="'propKaoHe' + index"
> >
<template slot="label"> <template slot="label">
<span class="labelNameClass">评定科目</span> <span class="labelNameClass">专业方向</span>
<span class="yuandianClass"></span> <span class="yuandianClass"></span>
<span class="numClass">{{ index + 1 }}</span> <span class="numClass">{{ index + 1 }}</span>
</template> </template>
<el-select <el-select
clearable clearable
placeholder="评定科目" placeholder="申请评定专业方向"
class="itemSxjqClass" class="itemSxjqClass"
v-model="item.zhuanye" v-model="item.zhuanye"
> >
...@@ -1083,7 +1083,15 @@ export default { ...@@ -1083,7 +1083,15 @@ export default {
if (datas.refreshmentKssj && datas.refreshmentJssj) { if (datas.refreshmentKssj && datas.refreshmentJssj) {
datas.dateArr = [datas.refreshmentKssj, datas.refreshmentJssj]; datas.dateArr = [datas.refreshmentKssj, datas.refreshmentJssj];
} }
if (datas.tbStDogFile2) {
let arr = datas.tbStDogFile2.map((e) => {
e.name = e.filename;
e.url = e.zpnr;
return e;
});
this.$set(this.detailInfo, "file2", arr);
this.fileList2 = arr;
}
// 处理专业方向和分数 // 处理专业方向和分数
// let workArr = []; // let workArr = [];
// let scoreArr = []; // let scoreArr = [];
...@@ -1094,18 +1102,6 @@ export default { ...@@ -1094,18 +1102,6 @@ export default {
// if (datas.trainSubjectGrade) { // if (datas.trainSubjectGrade) {
// scoreArr = datas.trainSubjectGrade.split("#") || []; // scoreArr = datas.trainSubjectGrade.split("#") || [];
// } // }
// if (datas.tbStDogFile2) {
// // fileUrlDetail({xxzjbh: '82454b67bb984470afcdb5bd547280e0'}).then(res => {
// // console.log(222,res)
// // })
// let arr = datas.tbStDogFile2.map((e) => {
// e.name = e.filename;
// e.url = e.zpnr;
// return e;
// });
// this.$set(this.detailInfo, "file2", arr);
// this.fileList2 = arr;
// }
// if (datas.tbStDogFile1) { // if (datas.tbStDogFile1) {
// let arr = datas.tbStDogFile1.map((e) => { // let arr = datas.tbStDogFile1.map((e) => {
// e.name = e.filename; // e.name = e.filename;
...@@ -1230,7 +1226,7 @@ export default { ...@@ -1230,7 +1226,7 @@ export default {
} }
datas.tbStDogEvaluations.forEach((workItem, workIndex) => { datas.tbStDogEvaluations.forEach((workItem, workIndex) => {
this.WorkingLists[workIndex].zhuanye = this.WorkingLists[workIndex].zhuanye =
workItem.workingDogClassificationId; workItem.workingDogClassificationIdStr;
this.WorkingLists[workIndex].fenshu = workItem.score; this.WorkingLists[workIndex].fenshu = workItem.score;
this.WorkingLists[workIndex].trainingLevelId = this.WorkingLists[workIndex].trainingLevelId =
workItem.trainingLevelId; workItem.trainingLevelId;
......
src/views/jobDogManage/components/jobDogManageEdit3.vue
...@@ -386,7 +386,7 @@ ...@@ -386,7 +386,7 @@
class="elItemClassOne elDateClass sxjqClass" class="elItemClassOne elDateClass sxjqClass"
> >
<template slot="label"> <template slot="label">
<span class="labelNameClass">评定日期</span> <span class="labelNameClass">考试日期</span>
<span class="yuandianClass"></span> <span class="yuandianClass"></span>
<span class="numClass">{{ index + 1 }}</span> <span class="numClass">{{ index + 1 }}</span>
</template> </template>
...@@ -427,13 +427,13 @@ ...@@ -427,13 +427,13 @@
:prop="'propKaoHe' + index" :prop="'propKaoHe' + index"
> >
<template slot="label"> <template slot="label">
<span class="labelNameClass">评定科目</span> <span class="labelNameClass">专业方向</span>
<span class="yuandianClass"></span> <span class="yuandianClass"></span>
<span class="numClass">{{ index + 1 }}</span> <span class="numClass">{{ index + 1 }}</span>
</template> </template>
<el-select <el-select
clearable clearable
placeholder="评定科目" placeholder="申请评定专业方向"
class="itemSxjqClass" class="itemSxjqClass"
v-model="item.zhuanye" v-model="item.zhuanye"
> >
...@@ -765,8 +765,8 @@ export default { ...@@ -765,8 +765,8 @@ export default {
orderXxzjbh: this.detailInfo.orderXxzjbh, orderXxzjbh: this.detailInfo.orderXxzjbh,
fxDogXxzjbh: this.$route.query.xxzjbh || dogxxzjbh, fxDogXxzjbh: this.$route.query.xxzjbh || dogxxzjbh,
glxxzjbhSource: "01", glxxzjbhSource: "01",
spType: "01", // spType: "01",
// spType: spType, spType: spType,
}).then((res) => { }).then((res) => {
if (res.success) { if (res.success) {
self.$alert("提请审核通过", "提示", { self.$alert("提请审核通过", "提示", {
...@@ -969,9 +969,11 @@ export default { ...@@ -969,9 +969,11 @@ export default {
fileList: [], fileList: [],
}); });
} }
debugger;
datas.tbStDogEvaluations.forEach((workItem, workIndex) => { datas.tbStDogEvaluations.forEach((workItem, workIndex) => {
this.WorkingLists[workIndex].zhuanye = this.WorkingLists[workIndex].zhuanye =
workItem.workingDogClassificationId; workItem.workingDogClassificationIdStr;
debugger;
this.WorkingLists[workIndex].fenshu = workItem.score; this.WorkingLists[workIndex].fenshu = workItem.score;
this.WorkingLists[workIndex].trainingLevelId = this.WorkingLists[workIndex].trainingLevelId =
workItem.trainingLevelId; workItem.trainingLevelId;
......
src/views/jobDogManage/components/jobDogManageXq.vue
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="trainSubjectForName" prop="trainSubjectForName"
label="评定科目" label="申请评定专业方向"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<p> <p>
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="checkDate" prop="checkDate"
label="申请评定日期" label="申请考试日期"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
align="center" align="center"
...@@ -230,11 +230,6 @@ ...@@ -230,11 +230,6 @@
prop="workdogpdrq" prop="workdogpdrq"
label="工作犬评定日期" label="工作犬评定日期"
></el-table-column> ></el-table-column>
<el-table-column
align="center"
prop="trainResult"
label="评定结果"
></el-table-column>
</el-table> </el-table>
<span class="zd-value" v-else v-html="detailObj[item.id]"></span> <span class="zd-value" v-else v-html="detailObj[item.id]"></span>
</div> </div>
...@@ -701,12 +696,12 @@ export default { ...@@ -701,12 +696,12 @@ export default {
ids: "tbStDogEvaluationsCheck", ids: "tbStDogEvaluationsCheck",
moduleName: "警犬训练考核", moduleName: "警犬训练考核",
data: [ data: [
{ title: "考核单位", col: "3", id: "checkUnitStr" }, { title: "评定单位", col: "3", id: "checkUnitStr" },
{ title: "主考人", col: "3", id: "checkStaff" }, { title: "主考人", col: "3", id: "checkStaff" },
{ title: "考核日期", col: "3", id: "pdrqStr" }, { title: "考试日期", col: "3", id: "pdrqStr" },
{ title: "评定等级", col: "3", id: "trainingLevelIdStr" }, { title: "评定等级", col: "3", id: "trainingLevelIdStr" },
{ {
title: "考核科目及成绩", title: "专业方向及成绩",
col: "5", col: "5",
id: "workingDogClassificationIdStr#score", id: "workingDogClassificationIdStr#score",
}, },
...@@ -1432,16 +1427,19 @@ export default { ...@@ -1432,16 +1427,19 @@ export default {
if (res.success) { if (res.success) {
this.detailObj = res.data.data; this.detailObj = res.data.data;
this.getBlgcLists(this.detailObj.orderXxzjbh, loading); this.getBlgcLists(this.detailObj.orderXxzjbh, loading);
this.detailObj.tbStDogFile1.forEach((e) => { // this.detailObj.tbStDogFile1.forEach((e) => {
e.name = e.filename; // e.name = e.filename;
if (e.zpnr) { // if (e.zpnr) {
e.url = e.zpnr; // e.url = e.zpnr;
e.url2 = e.zpnr; // e.url2 = e.zpnr;
} else { // } else {
e.url2 = require("@/assets/img/excel.png"); // e.url2 = require("@/assets/img/excel.png");
} // }
}); // });
//
debugger;
this.detailObj.tbStDogFile2.forEach((e) => { this.detailObj.tbStDogFile2.forEach((e) => {
debugger
e.name = e.filename; e.name = e.filename;
e.url = e.zpnr; e.url = e.zpnr;
e.url2 = e.zpnr; e.url2 = e.zpnr;
......
src/views/jobDogManage/index.vue
...@@ -29,12 +29,12 @@ ...@@ -29,12 +29,12 @@
:currentItem="unitInfo" :currentItem="unitInfo"
/> />
</el-form-item> </el-form-item>
<el-form-item label="申请评定日期" class="elItemClass elDateClass"> <el-form-item label="申请考试日期" class="elItemClass elDateClass">
<el-date-picker <el-date-picker
v-model="formData.pxrq" v-model="formData.pxrq"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="请选择申请评定日期" placeholder="请选择申请考试日期"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
......
src/views/jobDogRefreshment/components/jobDogManageSp.vue
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="trainSubjectForName" prop="trainSubjectForName"
label="评定科目" label="申请评定专业方向"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<p> <p>
...@@ -212,8 +212,8 @@ ...@@ -212,8 +212,8 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="checkDate" prop="checkDateStr"
label="申请评定日期" label="申请考试日期"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
align="center" align="center"
...@@ -227,14 +227,9 @@ ...@@ -227,14 +227,9 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="workdogpdrq" prop="workdogpdrqStr"
label="工作犬评定日期" label="工作犬评定日期"
></el-table-column> ></el-table-column>
<el-table-column
align="center"
prop="trainResult"
label="评定结果"
></el-table-column>
</el-table> </el-table>
<span class="zd-value" v-else v-html="detailObj[item.id]"></span> <span class="zd-value" v-else v-html="detailObj[item.id]"></span>
</div> </div>
...@@ -771,12 +766,12 @@ export default { ...@@ -771,12 +766,12 @@ export default {
moduleName: "警犬训练考核", moduleName: "警犬训练考核",
ids: "tbStDogEvaluationsCheck", ids: "tbStDogEvaluationsCheck",
data: [ data: [
{ title: "考核单位", col: "3", id: "checkUnitStr" }, { title: "评定单位", col: "3", id: "checkUnitStr" },
{ title: "主考人", col: "3", id: "checkStaff" }, { title: "主考人", col: "3", id: "checkStaff" },
{ title: "考核日期", col: "3", id: "pdrqStr" }, { title: "考试日期", col: "3", id: "pdrqStr" },
{ title: "评定等级", col: "3", id: "trainingLevelIdStr" }, { title: "评定等级", col: "3", id: "trainingLevelIdStr" },
{ {
title: "考核科目及成绩", title: "专业方向及成绩",
col: "5", col: "5",
id: "workingDogClassificationIdStr#score", id: "workingDogClassificationIdStr#score",
}, },
......
src/views/tyshManage/components/jobDogManagetySp.vue
...@@ -40,7 +40,85 @@ ...@@ -40,7 +40,85 @@
}} }}
</div> </div>
<div class="line" v-show="isSp"> <div class="line" v-show="isSp">
<div class="list-item"> <div v-if="item2.id == 'djxx' || item2.id == 'xlkh'">
<div
class="list-item"
v-show="detailObj[item2.ids].length > 0"
v-for="(items, indexs) in detailObj[item2.ids]"
:key="indexs"
>
<div
v-for="(item, index) in item2.data"
:key="index"
:class="'list line' + item.col"
>
<span
class="zd-name"
v-if="item.title"
v-html="item.title + '：'"
></span>
<span
class="zd-value"
v-if="
item.id == 'workingDogClassificationIdStr#score' ||
item.id == 'trainSubjectStr#trainSubjectGrade'
"
v-html="strReplace(item.id, items)"
></span>
<div
v-else-if="
item.id == 'tbStDogFile1' || item.id == 'tbStDogFile2'
"
>
<el-upload
disabled
action="#"
list-type="picture-card"
multiple
:file-list="items[item.id]"
:auto-upload="false"
>
<i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{ file }">
<div class="photoList">
<p :title="file.name">{{ file.name }}</p>
<img
width="146px"
height="146px"
:src="file.url2"
alt=""
/>
<span class="el-upload-list__item-actions">
<span
v-if="
file.name.indexOf('png') >= 0 ||
file.name.indexOf('jpg') >= 0 ||
file.name.indexOf('jpeg') >= 0 ||
file.name.indexOf('pdf') >= 0
"
class="el-upload-list__item-preview"
@click="handlePictureCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<span
v-if="!disabled"
class="el-upload-list__item-delete"
@click="handleDownload(file)"
>
<i class="el-icon-download"></i>
</span>
</span>
</div>
</div>
</el-upload>
</div>
<span class="zd-value" v-else v-html="items[item.id]"></span>
</div>
</div>
</div>
<div v-else class="list-item">
<div <div
v-for="(item, index) in item2.data" v-for="(item, index) in item2.data"
:key="index" :key="index"
...@@ -115,7 +193,7 @@ ...@@ -115,7 +193,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="trainSubjectForName" prop="trainSubjectForName"
label="评定科目" label="申请评定专业方向"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<p> <p>
...@@ -137,7 +215,7 @@ ...@@ -137,7 +215,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="checkDate" prop="checkDate"
label="申请评定日期" label="申请考试日期"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
align="center" align="center"
...@@ -154,11 +232,6 @@ ...@@ -154,11 +232,6 @@
prop="workdogpdrq" prop="workdogpdrq"
label="工作犬评定日期" label="工作犬评定日期"
></el-table-column> ></el-table-column>
<el-table-column
align="center"
prop="trainResult"
label="评定结果"
></el-table-column>
</el-table> </el-table>
<span class="zd-value" v-else v-html="detailObj[item.id]"></span> <span class="zd-value" v-else v-html="detailObj[item.id]"></span>
</div> </div>
...@@ -658,6 +731,7 @@ export default { ...@@ -658,6 +731,7 @@ export default {
{ {
id: "djxx", id: "djxx",
moduleName: "工作犬等级信息", moduleName: "工作犬等级信息",
ids: "tbStDogEvaluations",
data: [ data: [
{ title: "工作犬等级", col: "3", id: "trainingLevelIdStr" }, { title: "工作犬等级", col: "3", id: "trainingLevelIdStr" },
{ title: "评定日期", col: "3", id: "pdrq" }, { title: "评定日期", col: "3", id: "pdrq" },
...@@ -1436,6 +1510,19 @@ export default { ...@@ -1436,6 +1510,19 @@ export default {
e.url = e.zpnr; e.url = e.zpnr;
e.url2 = e.zpnr; e.url2 = e.zpnr;
}); });
if (this.detailObj.tbStDogEvaluations.length > 0) {
this.detailObj.tbStDogEvaluations.forEach((item) => {
item.tbStDogFile1.forEach((e) => {
e.name = e.filename;
if (e.zpnr) {
e.url = e.zpnr;
e.url2 = e.zpnr;
} else {
e.url2 = require("@/assets/img/excel.png");
}
});
});
}
} else { } else {
loading.close(); loading.close();
} }
......
src/views/tyshManage/components/jobDogManagetyXq.vue
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="trainSubjectForName" prop="trainSubjectForName"
label="评定科目" label="申请评定专业方向"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<p> <p>
...@@ -215,7 +215,7 @@ ...@@ -215,7 +215,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="checkDate" prop="checkDate"
label="申请评定日期" label="申请考试日期"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
align="center" align="center"
...@@ -232,11 +232,6 @@ ...@@ -232,11 +232,6 @@
prop="workdogpdrq" prop="workdogpdrq"
label="工作犬评定日期" label="工作犬评定日期"
></el-table-column> ></el-table-column>
<el-table-column
align="center"
prop="trainResult"
label="评定结果"
></el-table-column>
</el-table> </el-table>
<span class="zd-value" v-else v-html="detailObj[item.id]"></span> <span class="zd-value" v-else v-html="detailObj[item.id]"></span>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment