Skip to content

F
founder_vue
Commit 5b01288b by liyuhang19990520
Options

222

parent bd0d14cc
Showing with 409 additions and 78 deletions
dist.zip
No preview for this file type
src/api/menuDataApi/importApi.js
......@@ -12,3 +12,7 @@ export const importTeUnitApi = params =>
// 警用工作犬（批量导入）
export const importPoDogJobApi = params =>
postform(`${baseUrl}/work/excelsave`, params)
// 警用种犬（批量导入）
export const importZqDogJobApi = params =>
postform(`${baseUrl}/stud/excelsave`, params)
src/api/menuDataApi/jobDogManageApi.js
......@@ -16,6 +16,9 @@ export const retiredDogSpQuery = params =>
// 警犬复训（导出url）
export const exportJobDogUrl = `${baseUrl}/refreshment/export`
// 警犬审核（导出url）
export const exportSp = `${baseUrl}/refreshment/exportSp`
export const dogDelete = params =>
postJson(`${baseUrl}/retired/dogDelete`, params)
......
src/router/modules/index.js
......@@ -189,6 +189,28 @@ export default [
},
// 工作犬复训管理（编辑页）
{
path: 'jobDogManagetySp',
name: 'jobDogManagetySp',
component: () => import('@/views/tyshManage/components/jobDogManagetySp.vue'),
meta: {
title: '工作犬退役审核',
// 编辑新增页面此字段务必设置为true
isEditPage: true
}
},
// 工作犬复训管理（详情）
{
path: 'jobDogManagetyXq',
name: 'jobDogManagetyXq',
component: () => import('@/views/tyshManage/components/jobDogManagetyXq.vue'),
meta: {
title: '退役犬详情',
// 编辑新增页面此字段务必设置为true
isEditPage: true
}
},
// 工作犬复训管理（编辑页）
{
path: 'jobDogManageEdit',
name: 'jobDogManageEdit',
component: () => import('@/views/jobDogManage/components/jobDogManageEdit2.vue'),
......@@ -209,6 +231,17 @@ export default [
isEditPage: true
}
},
// 工作犬复训管理（新增页）
{
path: 'jobDogManagexq',
name: 'jobDogManagexq',
component: () => import('@/views/jobDogManage/components/jobDogManageXq.vue'),
meta: {
title: '工作犬复训管理-详情',
// 编辑新增页面此字段务必设置为true
isEditPage: true
}
},
// 工作犬复训管理（批量新增页）
{
path: 'jobDogManageBatchAdd',
......
src/utils/tableHeaderParams.js
......@@ -11,15 +11,15 @@ export const getJsryglAllColumns = () => {
},
{
label: "性别",
prop: "gender",
prop: "genderStr",
},
{
label: "出生日期",
prop: "birthDate",
prop: "birthDateStr",
},
{
label: "是否警犬技术相关专业",
prop: "isjwzyForName",
prop: "isjwzyStr",
},
{
label: "毕业院校",
......@@ -27,11 +27,11 @@ export const getJsryglAllColumns = () => {
},
{
label: "归属单位",
prop: "gsdwGajgjgdm",
prop: "gsdwGajgmc",
},
{
label: "归属序列",
prop: "jwjsxl",
prop: "jwjsxlStr",
},
{
label: "所带警犬",
......@@ -43,7 +43,7 @@ export const getJsryglAllColumns = () => {
},
{
label: "人员分类",
prop: "ryfl",
prop: "ryflStr",
},
{
label: "带犬年限",
......@@ -63,19 +63,19 @@ export const getJsryglDefaultColumns = () => {
},
{
label: "性别",
prop: "gender",
prop: "genderStr",
},
{
label: "出生日期",
prop: "birthDate",
prop: "birthDateStr",
},
{
label: "是否警犬技术相关专业",
prop: "isjwzyForName",
prop: "isjwzyStr",
},
{
label: "归属单位",
prop: "gsdwGajgjgdm",
prop: "gsdwGajgmc",
},
{
label: "从事警犬技术工作时间",
......@@ -173,23 +173,23 @@ export const getJygzqglAllColumns = () => {
},
{
label: "性别",
prop: "genderForName",
prop: "genderStr",
},
{
label: "出生日期",
prop: "birthDate",
prop: "birthDateStr",
},
{
label: "归属警种",
prop: "policeCategoryForName",
prop: "policeCategoryStr",
},
{
label: "工作犬等级",
prop: "trainingLevelIdForName",
prop: "trainingLevelIdStr",
},
{
label: "品种",
prop: "speciesIdForName",
prop: "speciesIdStr",
},
{
label: "DNA编号",
......@@ -197,15 +197,19 @@ export const getJygzqglAllColumns = () => {
},
{
label: "专业方向",
prop: "wordForName",
prop: "workingDogClassificationIdStr",
},
{
label: "来源",
prop: "dogSource",
prop: "dogSourceStr",
},
{
label: "评定日期",
prop: "pdrq",
prop: "pdrqStr",
},
{
label: "归属单位",
prop: "trainingUnitName",
},
]
return arr
......@@ -224,15 +228,15 @@ export const getJygzqglDefaultColumns = () => {
},
{
label: "出生日期",
prop: "birthDate",
prop: "birthDateStr",
},
{
label: "工作犬等级",
prop: "trainingLevelIdForName",
prop: "trainingLevelIdStr",
},
{
label: "专业方向",
prop: "wordForName",
prop: "workingDogClassificationIdStr",
},
]
return arr
......@@ -284,7 +288,7 @@ export const gettyqlAllColumns = () => {
]
return arr
}
// 工作犬复训管理（全部列）
// 工作犬评定管理（全部列）
export const getGzqfxglAllColumns = () => {
let arr = [
{
......@@ -313,7 +317,7 @@ export const getGzqfxglAllColumns = () => {
},
{
label: "评定科目",
prop: "trainSubjectForName",
prop: "trainSubjectStr",
},
{
label: "审核状态",
......@@ -329,7 +333,7 @@ export const getGzqfxglAllColumns = () => {
},
{
label: "申请评定日期",
prop: "checkDate",
prop: "checkDateStr",
},
{
label: "工作犬等级",
......@@ -337,14 +341,13 @@ export const getGzqfxglAllColumns = () => {
},
{
label: "工作犬评定日期",
prop: "workdogpdrq",
prop: "workdogpdrqStr",
},
]
return arr
}
// 工作犬复训管理（默认列）
export const getGzqfxglDefaultColumns = () => {
// 工作犬审核管理（全部列）
export const getGzqfxglAllColumnsSh = () => {
let arr = [
{
label: "警犬名称",
......@@ -358,6 +361,119 @@ export const getGzqfxglDefaultColumns = () => {
label: "归属单位",
prop: "trainingUnit",
},
{
label: "评定单位",
prop: "checkUnit",
},
{
label: "评定结果",
prop: "trainResult",
},
{
label: "主考人",
prop: "checkStaff",
},
{
label: "评定科目",
prop: "trainSubjectStr",
},
{
label: "审核状态",
prop: "spFlowStr",
},
{
label: "评定方式",
prop: "xxlyms",
},
{
label: "申请评定等级",
prop: "pdtraininglevelidStr",
},
{
label: "申请评定日期",
prop: "checkDateStr",
},
{
label: "提请审批人",
prop: "sqrxm",
},
{
label: "提请单位",
prop: "sqrUnitName",
},
{
label: "工作犬等级",
prop: "workdogtraininglevelid",
},
{
label: "工作犬评定日期",
prop: "workdogpdrqStr",
},
]
return arr
}
// 工作犬评定管理（默认列）
export const getGzqfxglDefaultColumns = () => {
let arr = [
{
label: "警犬名称",
prop: "name",
},
{
label: "申请评定等级",
prop: "pdtraininglevelidStr",
},
{
label: "申请评定日期",
prop: "checkDateStr",
},
{
label: "工作犬等级",
prop: "workdogtraininglevelid",
},
{
label: "工作犬评定日期",
prop: "workdogpdrqStr",
},
{
label: "评定结果",
prop: "trainResult",
},
{
label: "审核状态",
prop: "spFlowStr",
},
]
return arr
}
// 工作犬审核管理（默认列）
export const getGzqfxglDefaultColumnsSh = () => {
let arr = [
{
label: "警犬名称",
prop: "name",
},
{
label: "申请评定等级",
prop: "pdtraininglevelidStr",
},
{
label: "申请评定日期",
prop: "checkDateStr",
},
{
label: "提请审批人",
prop: "sqrxm",
},
{
label: "提请单位",
prop: "sqrUnitName",
},
{
label: "审核状态",
prop: "spFlowStr",
},
]
return arr
}
......@@ -366,6 +482,10 @@ export const getGzqfxglDefaultColumns = () => {
export const getJyzqAllColumns = () => {
let arr = [
{
label: "归属警种",
prop: "policeCategoryStr",
},
{
label: "芯片号",
prop: "chipCode",
},
......@@ -375,7 +495,7 @@ export const getJyzqAllColumns = () => {
},
{
label: "出生日期",
prop: "birthDate",
prop: "birthDateStr",
},
{
label: "带犬人员",
......@@ -391,19 +511,19 @@ export const getJyzqAllColumns = () => {
},
{
label: "性别",
prop: "gender",
prop: "genderStr",
},
{
label: "品种",
prop: "speciesId",
prop: "speciesIdStr",
},
{
label: "来源",
prop: "dogSource",
prop: "dogSourceStr",
},
{
label: "归属单位",
prop: "trainingUnit",
prop: "trainingUnitName",
},
]
return arr
......@@ -517,3 +637,113 @@ export const getTyqglDefaultColumns = () => {
]
return arr
}
// 退役犬管理（全部列）
export const getTyshqglAllColumns = () => {
let arr = [
{
label: "芯片号",
prop: "chipCode",
},
{
label: "警犬名称",
prop: "name",
},
{
label: "出生日期",
prop: "birthDate",
},
{
label: "服役年限",
prop: "fyqx",
},
{
label: "退役单位",
prop: "trainingUnitName",
},
{
label: "退役日期",
prop: "retiredDate",
},
{
label: "原技术人员",
prop: "artisanName",
},
{
label: "接收单位",
prop: "acceptUnitName",
},
{
label: "接收技术人员",
prop: "acceptArtisan",
},
{
label: "接收人员身份证号码",
prop: "acceptArtisanCard",
},
{
label: "接收日期",
prop: "acceptDate",
},
{
label: "审核单位",
prop: "auditUnitName",
},
{
label: "审核人员",
prop: "auditStaff",
},
{
label: "审核人员身份证号码",
prop: "auditStaffCard",
},
{
label: "审核日期",
prop: "auditDate",
},
{
label: "提请审批人",
prop: "sqrxm",
},
{
label: "提请单位",
prop: "sqrUnitName",
},
]
return arr
}
// 退役犬管理（默认列）
export const getTyshqglDefaultColumns = () => {
let arr = [
{
label: "芯片号",
prop: "chipCode",
},
{
label: "警犬名称",
prop: "name",
},
{
label: "出生日期",
prop: "birthDate",
},
{
label: "退役日期",
prop: "retiredDate",
},
{
label: "退役单位",
prop: "trainingUnitName",
},
{
label: "提请审批人",
prop: "sqrxm",
},
{
label: "提请单位",
prop: "sqrUnitName",
},
]
return arr
}
\ No newline at end of file
src/views/artisanManage/index.vue
......@@ -282,7 +282,7 @@ export default {
showImportBox: false,
importInfo: {
fileCName: "技术人员导入模版.xlsx",
fileCName: "带犬人员批量导入模板.xlsx",
fileLocalUrl: "files/jsrydrmb.xlsx",
apiName: "importArtisanApi",
},
......
src/views/jobDogManage/components/jobDogManageEdit3.vue
<template>
<div class="detailContentClass" v-loading="loading">
<div
class="detailContentClass"
v-loading="loading"
element-loading-text="拼命加载中.."
>
<div class="contents">
<el-form :model="detailInfo" ref="detailInfoRef" :rules="rules">
<div class="titles" style="width: 90px">工作犬基础信息</div>
......@@ -448,9 +452,7 @@
size="small"
class="btnStylePub"
@click="saveData(true)"
v-if="
userInfoJson.grade != 'B'
"
v-if="userInfoJson.grade != 'B'"
>提请审批</el-button
>
<el-button
......@@ -787,8 +789,10 @@ export default {
let params = {
chipCode: this.detailInfo.chipCode,
};
this.loading = true;
awaitPdWorkExtract(params)
.then((res) => {
this.loading = false;
if (
res.code === 200 &&
res.success &&
......
src/views/jobDogManage/index.vue
......@@ -15,11 +15,11 @@
placeholder="请输入芯片号"
></el-input>
</el-form-item>
<el-form-item label="警犬名称" class="elItemClass">
<el-form-item label="犬名" class="elItemClass">
<el-input
v-model="formData.name"
:clearable="true"
placeholder="请输入警犬名称"
placeholder="请输入犬名"
></el-input>
</el-form-item>
<el-form-item label="归属单位" class="elItemClass">
......@@ -29,12 +29,12 @@
:currentItem="unitInfo"
/>
</el-form-item>
<el-form-item label="考核日期" class="elItemClass elDateClass">
<el-form-item label="申请评定日期" class="elItemClass elDateClass">
<el-date-picker
v-model="formData.pxrq"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择考核日期"
placeholder="请选择申请评定日期"
>
</el-date-picker>
</el-form-item>
......@@ -101,7 +101,8 @@
plain
class="btnStylePub btnStyle1"
@click="addData"
>新增</el-button>
>新增</el-button
>
<!-- <el-button
size="small"
icon="el-icon-plus"
......@@ -151,6 +152,13 @@
v-if="scope.row.spstatus != '01' && scope.row.spstatus != '02'"
>删除
</el-button>
<el-button
type="text"
size="small"
@click="xqData(scope.row)"
v-if="scope.row.spstatus == '02'"
>详情
</el-button>
</div>
</template>
</el-table-column>
......@@ -189,9 +197,11 @@
<span v-else-if="item.prop === 'checkStaff'">{{
scope.row.checkStaff
}}</span>
<span v-else-if="item.prop === 'trainSubjectForName'">{{
scope.row.trainSubjectForName
}}</span>
<span v-else-if="item.prop === 'trainSubjectForName'"
>{{ scope.row.trainSubjectForName }}({{
scope.row.trainSubjectGrade
}})</span
>
<span v-else-if="item.prop === 'remark'">{{
scope.row.remark
}}</span>
......@@ -307,6 +317,14 @@ export default {
this.getLists(this.currentPage);
},
methods: {
xqData(row) {
this.$router.push({
name: "jobDogManagexq",
query: {
xxzjbh: row.xxzjbh,
},
});
},
setAlign(val) {
let rightArr = ["trainCountForName"];
if (rightArr.includes(val)) {
......
src/views/jobDogRefreshment/index.vue
......@@ -10,11 +10,11 @@
placeholder="请输入芯片号"
></el-input>
</el-form-item>
<el-form-item label="警犬名称" class="elItemClass">
<el-form-item label="犬名" class="elItemClass">
<el-input
v-model="formData.name"
:clearable="true"
placeholder="请输入警犬名称"
placeholder="请输入犬名"
></el-input>
</el-form-item>
<el-form-item label="归属单位" class="elItemClass">
......@@ -163,9 +163,11 @@
<span v-else-if="item.prop === 'checkStaff'">{{
scope.row.checkStaff
}}</span>
<span v-else-if="item.prop === 'trainSubjectForName'">{{
scope.row.trainSubjectForName
}}</span>
<span v-else-if="item.prop === 'trainSubjectForName'"
>{{ scope.row.trainSubjectForName }}({{
scope.row.trainSubjectGrade
}})</span
>
<span v-else-if="item.prop === 'remark'">{{
scope.row.remark
}}</span>
......@@ -201,14 +203,14 @@
<script>
import {
dogSpQuery,
exportJobDogUrl,
exportSp,
deleteJobDog,
} from "@/api/menuDataApi/jobDogManageApi.js";
import { getJsonDataApi } from "@/utils/getJsonData.js";
import { getCodeName, handleDownFile, getColumns } from "@/utils/mk.js";
import {
getGzqfxglAllColumns,
getGzqfxglDefaultColumns,
getGzqfxglAllColumnsSh,
getGzqfxglDefaultColumnsSh,
} from "@/utils/tableHeaderParams.js";
import LazySelectTreeDialog from "@c/lazy_treeCode_components.vue";
......@@ -257,8 +259,8 @@ export default {
showHeaderSettingBox: false,
headerSettInfo: {
menuId: "gzqfxManagesp",
allColumns: getGzqfxglAllColumns(),
defaultColumns: getGzqfxglDefaultColumns(),
allColumns: getGzqfxglAllColumnsSh(),
defaultColumns: getGzqfxglDefaultColumnsSh(),
},
colPropArr: [],
};
......@@ -426,7 +428,7 @@ export default {
};
axios
.post(exportJobDogUrl, JSON.stringify(params), {
.post(exportSp, JSON.stringify(params), {
headers: { "Content-Type": "application/json" },
responseType: "blob",
})
......
src/views/poDogInfoManage/index.vue
......@@ -92,6 +92,13 @@
>
<el-button
size="small"
icon="el-icon-download"
class="btnStylePub btnStyle2"
@click="importData"
>批量导入</el-button
>
<el-button
size="small"
icon="el-icon-upload2"
style="margin-right: 0 !important"
type="primary"
......@@ -162,6 +169,14 @@
</el-pagination>
</div>
</div>
<!-- 批量导入 -->
<importFilePublic
v-if="showImportBox"
:importInfo="importInfo"
@close="showImportBox = false"
@refreshLists="getLists(1)"
>
</importFilePublic>
<!-- 表头配置 -->
<headerSettings
v-if="showHeaderSettingBox"
......@@ -180,6 +195,7 @@ import {
} from "@/api/menuDataApi/poDogInfoManageApi.js";
import { getJsonDataApi } from "@/utils/getJsonData.js";
import { getCodeName, handleDownFile, getColumns } from "@/utils/mk.js";
import importFilePublic from "@c/importFilePublic.vue";
import {
getJyzqAllColumns,
getJyzqDefaultColumns,
......@@ -192,10 +208,12 @@ export default {
name: "jobDogManage",
components: {
LazySelectTreeDialog,
importFilePublic,
headerSettings,
},
data() {
return {
showImportBox: false,
formData: {
chipCode: "",
dna: "",
......@@ -223,7 +241,11 @@ export default {
codeTree: "CODE_QGUNIT",
codeOptions: [],
},
importInfo: {
fileCName: "种犬批量导入模板.xlsx",
fileLocalUrl: "files/zygzqdrmb.xlsx",
apiName: "importZqDogJobApi",
},
gzqdjOptions: [],
trainCountOption: [],
zyfxOptions: [],
......@@ -255,6 +277,9 @@ export default {
this.getLists(1);
},
methods: {
importData() {
this.showImportBox = true;
},
setAlign(val) {
let rightArr = ["trainCountForName"];
if (rightArr.includes(val)) {
......
src/views/poDogJobManage/index.vue
......@@ -336,7 +336,7 @@ export default {
showImportBox: false,
importInfo: {
fileCName: "警用工作犬导入模版.xlsx",
fileCName: "工作犬批量导入模板.xlsx",
fileLocalUrl: "files/jygzqdrmb.xlsx",
apiName: "importPoDogJobApi",
},
......
src/views/poDogRetireManage/index.vue
......@@ -142,6 +142,13 @@
v-if="scope.row.spstatus != '01' && scope.row.spstatus != '02'"
>删除
</el-button>
<el-button
type="text"
size="small"
@click="xqData(scope.row)"
v-if="scope.row.spstatus == '02'"
>详情
</el-button>
</div>
</template>
</el-table-column>
......@@ -298,6 +305,14 @@ export default {
this.getLists(this.currentPage);
},
methods: {
xqData(row) {
this.$router.push({
name: "jobDogManagetyXq",
query: {
xxzjbh: row.xxzjbh,
},
});
},
setAlign(val) {
let rightArr = ["trainCountForName"];
if (rightArr.includes(val)) {
......
src/views/tyshManage/index.vue
......@@ -127,20 +127,8 @@
<el-table-column align="left" label="操作" width="100">
<template slot-scope="scope">
<div>
<el-button
type="text"
size="small"
@click="editData(scope.row)"
v-if="scope.row.spstatus != '01' && scope.row.spstatus != '02'"
>
修改
</el-button>
<el-button
type="text"
size="small"
@click="deleteData(scope.row)"
v-if="scope.row.spstatus != '01' && scope.row.spstatus != '02'"
>删除
<el-button type="text" size="small" @click="spData(scope.row)">
审批
</el-button>
</div>
</template>
......@@ -224,8 +212,8 @@ import {
import { getJsonDataApi } from "@/utils/getJsonData.js";
import { getCodeName, handleDownFile, getColumns } from "@/utils/mk.js";
import {
gettyqlAllColumns,
getGzqfxglDefaultColumns,
getTyshqglAllColumns,
getTyshqglDefaultColumns,
} from "@/utils/tableHeaderParams.js";
import LazySelectTreeDialog from "@c/lazy_treeCode_components.vue";
......@@ -274,9 +262,9 @@ export default {
showHeaderSettingBox: false,
headerSettInfo: {
menuId: "poDogRetireManage",
allColumns: gettyqlAllColumns(),
defaultColumns: getGzqfxglDefaultColumns(),
menuId: "tyDogRetireManage",
allColumns: getTyshqglAllColumns(),
defaultColumns: getTyshqglDefaultColumns(),
},
colPropArr: [],
};
......@@ -298,6 +286,14 @@ export default {
this.getLists(this.currentPage);
},
methods: {
spData(row){
this.$router.push({
name: "jobDogManagetySp",
query: {
xxzjbh: row.xxzjbh,
},
});
},
setAlign(val) {
let rightArr = ["trainCountForName"];
if (rightArr.includes(val)) {
......
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