Skip to content

F
founder_vue
Commit 6585d3db by liyuhang19990520
Options

22

parent 7163fe7c
Showing with 88 additions and 53 deletions
dist.zip
No preview for this file type
public/JsonData/CODE_ORDER_FLOW.json
......@@ -4,9 +4,9 @@
"rows":[
{
"ids":"80836",
"label":"等待提请审批",
"label":"等待提请审核",
"codeType":"CODE_ORDER_FLOW",
"text":"等待提请审批",
"text":"等待提请审核",
"pId":null,
"id":"00",
"isParent":false,
......@@ -44,9 +44,9 @@
},
{
"ids":"80840",
"label":"部审核通过",
"label":"审核通过",
"codeType":"CODE_ORDER_FLOW",
"text":"部审核通过",
"text":"审核通过",
"pId":null,
"id":"04",
"isParent":false,
......
src/api/menuDataApi/jobDogManageApi.js
......@@ -34,7 +34,7 @@ export const getJobDogDetail = params =>
// 审批及提请
export const addSp = params =>
postJson(`${baseUrl}/spmanager/addSp`, params)
postJson(`${baseUrl}/spmanager/addSpByDogTrainingLevelId`, params)
......
src/utils/tableHeaderParams.js
......@@ -42,6 +42,10 @@ export const getJsryglAllColumns = () => {
prop: "workYears",
},
{
label: "人员分类",
prop: "ryfl",
},
{
label: "带犬年限",
prop: "dqnx",
},
......@@ -196,17 +200,13 @@ export const getJygzqglAllColumns = () => {
prop: "wordForName",
},
{
label: "犬只来源",
label: "来源",
prop: "dogSource",
},
{
label: "评定日期",
prop: "pdrq",
},
{
label: "是否功勋犬",
prop: "ifexploitdog",
},
]
return arr
}
......@@ -274,7 +274,7 @@ export const getGzqfxglAllColumns = () => {
prop: "trainSubjectForName",
},
{
label: "审批状态",
label: "审核状态",
prop: "spFlowStr",
},
]
......@@ -316,11 +316,7 @@ export const getJyzqAllColumns = () => {
prop: "birthDate",
},
{
label: "疫苗接种",
prop: "ymjz",
},
{
label: "技术人员",
label: "带犬人员",
prop: "jsrymc",
},
{
......@@ -340,7 +336,7 @@ export const getJyzqAllColumns = () => {
prop: "speciesId",
},
{
label: "犬只来源",
label: "来源",
prop: "dogSource",
},
{
......
src/views/artisanManage/components/artisanManageEdit2.vue
......@@ -135,7 +135,7 @@
/>
</el-form-item>
<el-form-item class="elItemClass sxjqClass" prop="firstJqxph">
<!-- <el-form-item class="elItemClass sxjqClass" prop="firstJqxph">
<template slot="label">
<span class="labelNameClass">所带警犬</span>
<span class="yuandianClass"></span>
......@@ -155,7 +155,7 @@
<div class="conBtnClass" title="增加所带警犬" @click="addJqxph">
+
</div>
</el-form-item>
</el-form-item> -->
<el-form-item
class="elItemClass sxjqClass"
......@@ -732,8 +732,8 @@ export default {
gsdwGajgjgdm: this.detailInfo.unitCodeName,
jwjsxl: this.detailInfo.jwjsxl,
workYears: this.detailInfo.workYears,
sxjq: String(this.detailInfo.sxjq),
jqxph,
// sxjq: String(this.detailInfo.sxjq),
// jqxph,
};
if (this.routeName === "artisanManageEdit") {
......
src/views/jobDogManage/components/jobDogManageEdit2.vue
......@@ -316,7 +316,7 @@
<div class="titles" style="width: 182px">警犬训练考核</div>
<div class="divBoxClass">
<el-form-item
label="考核单位"
label="评定单位"
class="elItemClass"
prop="checkUnitName"
>
......@@ -343,13 +343,13 @@
:prop="'propKaoHe' + index"
>
<template slot="label">
<span class="labelNameClass">考核科目</span>
<span class="labelNameClass">评定科目</span>
<span class="yuandianClass"></span>
<span class="numClass">{{ index + 1 }}</span>
</template>
<el-select
clearable
placeholder="考核科目"
placeholder="评定科目"
class="itemSxjqClass"
v-model="item.zhuanye"
>
......@@ -369,7 +369,7 @@
></el-input>
<div
class="conBtnClass"
title="增加考核科目"
title="增加评定科目"
v-if="index === 0"
@click="addKaoHe"
>
......@@ -377,7 +377,7 @@
</div>
<div
class="conBtnClass"
title="删除考核科目"
title="删除评定科目"
v-if="index > 0"
@click="removeKaoHe(index)"
>
......@@ -385,7 +385,7 @@
</div>
</el-form-item>
<el-form-item
label="考核日期"
label="评定日期"
class="elItemClass elDateClass"
prop="checkDate"
>
......@@ -398,6 +398,26 @@
>
</el-date-picker>
</el-form-item>
<el-form-item
label="评定等级"
class="elItemClass elDateClass"
prop="pdtraininglevelid"
>
<el-select
clearable
:disabled="downleveflag && downleveflag == '1'"
placeholder="请选择评定等级"
v-model="detailInfo.pdtraininglevelid"
>
<el-option
v-for="(item, index) in gzqdjOptions"
:key="index"
:label="item.label"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
</div>
<div class="elBtns">
......@@ -461,6 +481,7 @@ export default {
},
data() {
return {
downleveflag: null,
disabled: false,
dialogImageUrl: "",
phIndex: 0,
......@@ -508,7 +529,7 @@ export default {
checkUnitName: [
{
required: true,
message: "请选择考核单位",
message: "请选择评定单位",
trigger: "change",
},
],
......@@ -516,7 +537,10 @@ export default {
{ required: true, message: "请输入主考人", trigger: "blur" },
],
checkDate: [
{ required: true, message: "请选择考核日期", trigger: "blur" },
{ required: true, message: "请选择评定日期", trigger: "blur" },
],
pdtraininglevelid: [
{ required: true, message: "请选择评定等级", trigger: "blur" },
],
dateArr: [
{
......@@ -549,12 +573,12 @@ export default {
djsj: [{ required: true, message: "采集时间必填", trigger: "blur" }],
},
unitInfo: {
name: "考核单位:",
name: "评定单位:",
id: "checkUnitName",
type: "lazyCodeTreeDialog",
value: "",
prop: "checkEmpty",
placeholder: "请选择考核单位",
placeholder: "请选择评定单位",
col: "2",
disabled: false,
codeTree: "CODE_QGUNIT",
......@@ -612,7 +636,8 @@ export default {
orderXxzjbh: this.detailInfo.orderXxzjbh,
fxDogXxzjbh: this.$route.query.xxzjbh,
glxxzjbhSource: "01",
spType: spType,
spType: "01",
// spType: spType,
}).then((res) => {
if (res.success) {
self.$alert("提请审批通过", "提示", {
......@@ -805,7 +830,7 @@ export default {
let zhuanye = item.zhuanye || "";
let fenshu = item.fenshu || "";
if (!zhuanye) {
callback(new Error(`请选择考核科目`));
callback(new Error(`请选择评定科目`));
} else if (!fenshu) {
callback(new Error(`请输入分数`));
} else if (!myreg.test(fenshu)) {
......@@ -914,7 +939,7 @@ export default {
this.kaoHeLists[scoreIndex].fenshu = scoreItem;
});
}
this.downleveflag = datas.downleveflag;
this.detailInfo = datas;
this.loading = false;
return;
......@@ -969,6 +994,7 @@ export default {
xxdjdwGajgmc: this.detailInfo.xxdjdwGajgmc,
xxdjdwGajgjgdm: this.detailInfo.xxdjdwGajgjgdm,
checkDate: this.detailInfo.checkDate,
pdtraininglevelid: this.detailInfo.pdtraininglevelid,
djsj: this.detailInfo.djsj,
};
......@@ -984,9 +1010,10 @@ export default {
let self = this;
let obj = {
xxzjbh: this.$route.query.xxzjbh,
checkUnit: params.checkUnit, //考核单位
checkUnit: params.checkUnit, //评定单位
checkStaff: params.checkStaff, //考核人员
checkDate: params.checkDate, //考核日期
checkDate: params.checkDate, //评定日期
pdtraininglevelid: params.pdtraininglevelid, //评定日期
trainSubject: params.trainSubject, //培训科目（多个以#号连接）
trainSubjectGrade: params.trainSubjectGrade, //对应分数（多个以#连接）
};
......@@ -997,7 +1024,7 @@ export default {
if (boo) {
this.loading = false;
self.tqsp();
return
return;
} else {
this.$message({
message: "保存成功",
......
src/views/jobDogManage/index.vue
......@@ -38,11 +38,11 @@
>
</el-date-picker>
</el-form-item>
<el-form-item label="审批状态" class="elItemClass">
<el-form-item label="审核状态" class="elItemClass">
<el-select
v-model="formData.spFlow"
:clearable="true"
placeholder="请选择审批状态"
placeholder="请选择审核状态"
>
<el-option
v-for="(item, index) in genderOptions"
......@@ -142,7 +142,7 @@
@click="editData(scope.row)"
v-if="scope.row.spstatus != '01' && scope.row.spstatus != '02'"
>
补采
修改
</el-button>
<el-button
type="text"
......
src/views/jobDogRefreshment/index.vue
......@@ -24,11 +24,11 @@
:currentItem="unitInfo"
/>
</el-form-item>
<el-form-item label="审批状态" class="elItemClass">
<el-form-item label="审核状态" class="elItemClass">
<el-select
v-model="formData.spFlow"
:clearable="true"
placeholder="请选择审批状态"
placeholder="请选择审核状态"
>
<el-option
v-for="(item, index) in genderOptions"
......
src/views/poDogJobManage/components/poDogJobManageEdit2.vue
......@@ -149,6 +149,7 @@
<el-select
clearable
placeholder="请选择工作犬等级"
:disabled="updatePdrqAndTrainingLevelIdFlag && updatePdrqAndTrainingLevelIdFlag=='1'"
v-model="detailInfo.trainingLevelId"
>
<el-option
......@@ -168,14 +169,16 @@
>
<el-date-picker
v-model="detailInfo.pdrq"
:disabled="updatePdrqAndTrainingLevelIdFlag && updatePdrqAndTrainingLevelIdFlag=='1'"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择评定日期"
:picker-options="pickerOptions"
>
</el-date-picker>
</el-form-item>
<el-form-item
<!-- <el-form-item
label="是否功勋犬"
class="elItemClass elDateClass"
prop="ifexploitdog"
......@@ -188,7 +191,7 @@
<el-option label="是" value="1"></el-option>
<el-option label="否" value="0"></el-option>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item
class="elItemClass sxjqClass"
......@@ -224,13 +227,14 @@
<div
class="conBtnClass"
title="增加考核"
v-if="index === 0"
@click="addKaoHe"
v-if="index == kaoHeLists.length - 1"
>
+
</div>
<div
class="conBtnClass"
style="right: 20px"
title="删除考核"
v-if="index > 0"
@click="removeKaoHe(index)"
......@@ -401,6 +405,13 @@ export default {
name: "poDogJobManageEdit",
data() {
return {
updatePdrqAndTrainingLevelIdFlag: null,
pickerOptions: {
disabledDate(time) {
console.log(time.getTime(), Date.now() - 8.64e6);
return time.getTime() < Date.now() - 1 * 24 * 60 * 60 * 1000;
},
},
phIndex: 0,
dialogImageUrl: "",
fileList2: [],
......@@ -409,7 +420,7 @@ export default {
loading: false,
routeName: "",
detailInfo: {
ifexploitdog: "0",
// ifexploitdog: "0",
pdrq: "",
dogSource: "",
file1: [],
......@@ -839,6 +850,7 @@ export default {
this.$set(this.detailInfo, "file1", arr);
this.fileList = arr;
}
this.updatePdrqAndTrainingLevelIdFlag = datas.updatePdrqAndTrainingLevelIdFlag;
this.$nextTick(() => {
if (this.detailInfo.jsrysfz) this.handleTiQu("detail");
});
......@@ -893,7 +905,7 @@ export default {
personName: this.detailInfo.personName,
policeCategory: this.detailInfo.policeCategory,
trainingLevelId: this.detailInfo.trainingLevelId,
ifexploitdog: this.detailInfo.ifexploitdog,
// ifexploitdog: this.detailInfo.ifexploitdog,
pdrq: this.detailInfo.pdrq,
speciesId: this.detailInfo.speciesId,
dogSource: this.detailInfo.dogSource,
......
src/views/poDogJobManage/index.vue
......@@ -23,13 +23,13 @@
></el-input>
</el-form-item>
<el-form-item
label="警犬名称"
label="犬名"
class="elItemClass"
>
<el-input
v-model="formData.name"
:clearable="true"
placeholder="请输入警犬名称"
placeholder="请输入犬名"
></el-input>
</el-form-item>
<el-form-item
......@@ -92,7 +92,7 @@
</el-select>
</el-form-item>
<el-form-item
label="警用犬种"
label="品种"
class="elItemClass"
>
<el-select
......@@ -110,13 +110,13 @@
</el-select>
</el-form-item>
<el-form-item
label="技术人员名称"
label="带犬人员"
class="elItemClass"
>
<el-input
v-model="formData.jsrymc"
:clearable="true"
placeholder="请输入技术人员名称"
placeholder="请输入带犬人员"
></el-input>
</el-form-item>
</el-form>
......@@ -456,7 +456,7 @@ export default {
this.sylbOptions
);
// 警用犬种
// 品种
item.speciesIdForName = getCodeName(
item.speciesId,
this.jyjqOptions
......
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