Skip to content

F
founder_vue
Commit e8ee20c1 by liyuhang19990520
Options

22

parent 46f368e1
Showing with 196 additions and 78 deletions
dist.zip
No preview for this file type
public/JsonData/CODE_ORDER_FLOW.json 0 → 100644
{
"code":200,
"data":{
"rows":[
{
"ids":"80836",
"label":"等待提请审批",
"codeType":"CODE_ORDER_FLOW",
"text":"等待提请审批",
"pId":null,
"id":"00",
"isParent":false,
"children":[]
},
{
"ids":"80837",
"label":"待市审核",
"codeType":"CODE_ORDER_FLOW",
"text":"待市审核",
"pId":null,
"id":"01",
"isParent":false,
"children":[]
},
{
"ids":"80838",
"label":"待省审核",
"codeType":"CODE_ORDER_FLOW",
"text":"待省审核",
"pId":null,
"id":"02",
"isParent":false,
"children":[]
},
{
"ids":"80839",
"label":"待部审核",
"codeType":"CODE_ORDER_FLOW",
"text":"待部审核",
"pId":null,
"id":"03",
"isParent":false,
"children":[]
},
{
"ids":"80840",
"label":"部审核通过",
"codeType":"CODE_ORDER_FLOW",
"text":"部审核通过",
"pId":null,
"id":"04",
"isParent":false,
"children":[]
},
{
"ids":"80841",
"label":"市审核不通过",
"codeType":"CODE_ORDER_FLOW",
"text":"市审核不通过",
"pId":null,
"id":"05",
"isParent":false,
"children":[]
},
{
"ids":"80842",
"label":"省审核不通过",
"codeType":"CODE_ORDER_FLOW",
"text":"省审核不通过",
"pId":null,
"id":"06",
"isParent":false,
"children":[]
},
{
"ids":"80843",
"label":"部审核不通过",
"codeType":"CODE_ORDER_FLOW",
"text":"部审核不通过",
"pId":null,
"id":"07",
"isParent":false,
"children":[]
}
]
},
"success":true,
"message":"成功"
}
\ No newline at end of file
src/assets/styles/asjDetail.scss
......@@ -26,7 +26,7 @@
width: 100%;
min-height: 100vh;
background: #eaeaea;
padding-top: 10px;
/deep/ .el-dropdown-link {
cursor: pointer;
color: #409eff;
......@@ -107,11 +107,12 @@
}
.content-wrap {
width: 1360px;
margin: 0 auto;
width: 100%;
box-sizing: border-box;
margin: 0 18px;
padding-bottom: 104px;
position: relative;
padding-top: 52px;
padding-top: 0px;
background-color: #fff;
.dt_menu {
......@@ -331,6 +332,16 @@
width: 100% !important;
padding: 20px 0 30px 0 !important;
}
.line7 {
margin-right: 480px;
}
.line8 {
width: 480px !important;
position: absolute;
border-bottom: none!important;
top: 0;
right: 0;
}
.xqxx {
padding: 0 10px;
......@@ -421,6 +432,7 @@
}
.list-item {
position: relative;
display: flex;
flex-wrap: wrap;
}
......
src/utils/params2.js
......@@ -5295,7 +5295,7 @@ let lazczjspForm = {
trueName: JSON.parse(sessionStorage.getItem("userInfo")).realname,
identitycard: JSON.parse(sessionStorage.getItem("userInfo")).identitycard,
telephone: JSON.parse(sessionStorage.getItem("userInfo")).phone,
spyjJyqk: "通过"
spyjJyqk: ""
}
/*案件基本信息*/
let ajjbxxForm = {
......
src/utils/tableHeaderParams.js
......@@ -262,10 +262,6 @@ export const getGzqfxglAllColumns = () => {
prop: "checkUnit",
},
{
label: "审批节点",
prop: "spFlowStr",
},
{
label: "考核日期",
prop: "checkDate",
},
......@@ -279,7 +275,7 @@ export const getGzqfxglAllColumns = () => {
},
{
label: "审批状态",
prop: "spstatusStr",
prop: "spFlowStr",
},
]
return arr
......
src/views/jobDogManage/components/jobDogManageEdit2.vue
......@@ -408,7 +408,7 @@
type="warning"
size="small"
class="btnStylePub"
@click="tqsp"
@click="saveData(true)"
v-if="
userInfoJson.grade != 'B' &&
detailInfo.spstatus != '01' &&
......@@ -515,6 +515,9 @@ export default {
checkStaff: [
{ required: true, message: "请输入主考人", trigger: "blur" },
],
checkDate: [
{ required: true, message: "请选择考核日期", trigger: "blur" },
],
dateArr: [
{
type: "array",
......@@ -593,30 +596,34 @@ export default {
methods: {
tqsp() {
let self = this;
var spType;
if (this.userInfoJson) {
if (this.userInfoJson.grade == "S") {
spType = "03";
} else if (this.userInfoJson.grade == "D") {
spType = "02";
} else if (this.userInfoJson.grade == "X") {
spType = "01";
}
}
addSp({
orderXxzjbh: this.detailInfo.orderXxzjbh,
fxDogXxzjbh: this.$route.query.xxzjbh,
glxxzjbhSource: "01",
spType: spType,
}).then((res) => {
if (res.success) {
self.$alert("提请审批通过", "提示", {
confirmButtonText: "确定",
callback: (action) => {
window.location.reload();
window.open("about:blank", "_top").close();
self.$router.go(-1); //返回上一层
},
this.$refs.detailInfoRef.validate((result) => {
if (result) {
var spType;
if (this.userInfoJson) {
if (this.userInfoJson.grade == "S") {
spType = "03";
} else if (this.userInfoJson.grade == "D") {
spType = "02";
} else if (this.userInfoJson.grade == "X") {
spType = "01";
}
}
addSp({
orderXxzjbh: this.detailInfo.orderXxzjbh,
fxDogXxzjbh: this.$route.query.xxzjbh,
glxxzjbhSource: "01",
spType: spType,
}).then((res) => {
if (res.success) {
self.$alert("提请审批通过", "提示", {
confirmButtonText: "确定",
callback: (action) => {
window.location.reload();
window.open("about:blank", "_top").close();
self.$router.go(-1); //返回上一层
},
});
}
});
}
});
......@@ -921,7 +928,7 @@ export default {
this.loading = false;
});
},
saveData() {
saveData(boo) {
this.$refs.detailInfoRef.validate((result) => {
if (result) {
// 处理专业方向和分数
......@@ -966,14 +973,15 @@ export default {
};
if (this.routeName === "jobDogManageEdit") {
this.editParams(params);
this.editParams(params, boo);
} else {
this.addParams(params);
}
}
});
},
editParams(params) {
editParams(params, boo) {
let self = this;
let obj = {
xxzjbh: this.$route.query.xxzjbh,
checkUnit: params.checkUnit, //考核单位
......@@ -986,14 +994,20 @@ export default {
editJobDog(obj)
.then((res) => {
if (res.code === 200 && res.success) {
this.$message({
message: "保存成功",
type: "success",
duration: 1000,
});
this.loading = false;
this.goBack();
return;
if (boo) {
this.loading = false;
self.tqsp();
return
} else {
this.$message({
message: "保存成功",
type: "success",
duration: 1000,
});
this.loading = false;
this.goBack();
return;
}
}
this.loading = false;
this.$message({
......
src/views/jobDogManage/index.vue
......@@ -34,19 +34,22 @@
v-model="formData.pxrq"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择培训日期"
placeholder="请选择考核日期"
>
</el-date-picker>
</el-form-item>
<el-form-item label="审批状态" class="elItemClass">
<el-select
v-model="formData.spstatus"
v-model="formData.spFlow"
:clearable="true"
placeholder="请选择审批状态"
>
<el-option label="审批中" value="01"></el-option>
<el-option label="通过" value="02"></el-option>
<el-option label="未通过" value="03"></el-option>
<el-option
v-for="(item, index) in genderOptions"
:key="index"
:label="item.label"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</el-form>
......@@ -245,12 +248,13 @@ export default {
},
data() {
return {
genderOptions: [],
formData: {
chipCode: "",
name: "",
trainingUnit: "",
pxrq: "",
spstatus: "",
spFlow: "",
},
tableLoading: false,
......@@ -291,6 +295,7 @@ export default {
this.gzqdjOptions = await getJsonDataApi("CODE_GZQDJ");
this.trainCountOption = await getJsonDataApi("CODE_TRAINCOUNT");
this.zyfxOptions = await getJsonDataApi("CODE_BASEDATA");
this.genderOptions = await getJsonDataApi("CODE_ORDER_FLOW");
let options = await getColumns(this.headerSettInfo.menuId);
if (options?.length) {
......@@ -315,7 +320,7 @@ export default {
this.formData.name = "";
this.formData.pxrq = "";
this.formData.trainingUnit = "";
this.formData.spstatus = "";
this.formData.spFlow = "";
this.getLists(1);
},
......@@ -329,7 +334,7 @@ export default {
name: this.formData.name,
pxrq: this.formData.pxrq,
trainingUnit: this.formData.trainingUnit,
spstatus: this.formData.spstatus,
spFlow: this.formData.spFlow,
};
getJobDogList(params)
.then((res) => {
......@@ -447,7 +452,7 @@ export default {
name: this.formData.name,
pxrq: this.formData.pxrq,
trainingUnit: this.formData.trainingUnit,
spstatus: this.formData.spstatus,
spFlow: this.formData.spFlow,
};
axios
......
src/views/jobDogRefreshment/components/jobDogManageSp.vue
<template>
<div id="asjxq">
<div class="header">
<img src="@/assets/img/jh.png" style="margin-right: 16px" />
复训审批
</div>
<div class="content-wrap" id="scroolwrap" @scroll="handleScroll($event)">
<div class="dt_menu">
<el-steps
......@@ -565,11 +561,6 @@ export default {
id: "jbxx",
moduleName: "工作犬基本信息",
data: [
{
title: "警犬照片",
col: "6",
id: "tbStDogFile2",
},
{ title: "犬名", col: "3", id: "name" },
{ title: "芯片号", col: "3", id: "chipCode" },
{ title: "性别", col: "3", id: "gender" },
......@@ -589,6 +580,11 @@ export default {
col: "3",
id: "dna",
},
{
title: "警犬照片",
col: "6",
id: "tbStDogFile2",
},
],
},
{
......@@ -598,6 +594,11 @@ export default {
{ title: "工作犬等级", col: "3", id: "trainingLevelId" },
{ title: "评定日期", col: "3", id: "pdrq" },
{ title: "专业方向", col: "5", id: "workingDogClassificationId" },
{
title: "其他材料",
col: "6",
id: "tbStDogFile1",
},
],
},
{
......@@ -622,11 +623,6 @@ export default {
col: "5",
id: "trainSubjectStr#trainSubjectGrade",
},
{
title: "其他材料",
col: "6",
id: "tbStDogFile1",
},
],
},
],
......@@ -1146,7 +1142,7 @@ export default {
let s = "";
let ids = id.split("#");
str[ids[0]].split("#").forEach((j, index) => {
if(j) {
if (j) {
s += j + `(${str[ids[1]].split("#")[index]})、`;
}
});
......
src/views/jobDogRefreshment/index.vue
......@@ -26,13 +26,16 @@
</el-form-item>
<el-form-item label="审批状态" class="elItemClass">
<el-select
v-model="formData.spstatus"
v-model="formData.spFlow"
:clearable="true"
placeholder="请选择审批状态"
>
<el-option label="审批中" value="01"></el-option>
<el-option label="通过" value="02"></el-option>
<el-option label="未通过" value="03"></el-option>
<el-option
v-for="(item, index) in genderOptions"
:key="index"
:label="item.label"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</el-form>
......@@ -219,11 +222,12 @@ export default {
},
data() {
return {
genderOptions: [],
formData: {
chipCode: "",
name: "",
trainingUnit: "",
spstatus: "",
spFlow: "",
},
tableLoading: false,
......@@ -264,6 +268,7 @@ export default {
this.gzqdjOptions = await getJsonDataApi("CODE_GZQDJ");
this.trainCountOption = await getJsonDataApi("CODE_TRAINCOUNT");
this.zyfxOptions = await getJsonDataApi("CODE_BASEDATA");
this.genderOptions = await getJsonDataApi("CODE_ORDER_FLOW");
let options = await getColumns(this.headerSettInfo.menuId);
if (options?.length) {
......@@ -287,7 +292,7 @@ export default {
this.formData.chipCode = "";
this.formData.name = "";
this.formData.trainingUnit = "";
this.formData.spstatus = "";
this.formData.spFlow = "";
this.getLists(1);
},
......@@ -300,7 +305,7 @@ export default {
chipCode: this.formData.chipCode,
name: this.formData.name,
trainingUnit: this.formData.trainingUnit,
spstatus: this.formData.spstatus,
spFlow: this.formData.spFlow,
};
dogSpQuery(params)
.then((res) => {
......@@ -417,7 +422,7 @@ export default {
chipCode: this.formData.chipCode,
name: this.formData.name,
trainingUnit: this.formData.trainingUnit,
spstatus: this.formData.spstatus,
spFlow: this.formData.spFlow,
};
axios
......
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