22

public/JsonData/CODE_RETIRED_HEALTHSTATUS.json

+{
+	"code":200,
+	"data":{
+		"rows":[
+			{
+				"ids":"80858",
+				"label":"健康",
+				"codeType":"CODE_RETIRED_HEALTHSTATUS",
+				"text":"健康",
+				"pId":null,
+				"id":"1",
+				"isParent":false,
+				"children":[]
+			},
+			{
+				"ids":"80859",
+				"label":"生病",
+				"codeType":"CODE_RETIRED_HEALTHSTATUS",
+				"text":"生病",
+				"pId":null,
+				"id":"2",
+				"isParent":false,
+				"children":[]
+			},
+			{
+				"ids":"80860",
+				"label":"死亡",
+				"codeType":"CODE_RETIRED_HEALTHSTATUS",
+				"text":"死亡",
+				"pId":null,
+				"id":"3",
+				"isParent":false,
+				"children":[]
+			},
+			{
+				"ids":"80861",
+				"label":"其他",
+				"codeType":"CODE_RETIRED_HEALTHSTATUS",
+				"text":"其他",
+				"pId":null,
+				"id":"4",
+				"isParent":false,
+				"children":[]
+			}
+		]
+	},
+	"success":true,
+	"message":"成功"
+}
\ No newline at end of file

public/JsonData/CODE_RETIRED_RETIREDREASONS.json

+{
+	"code":200,
+	"data":{
+		"rows":[
+			{
+				"ids":"80862",
+				"label":"到服役年限",
+				"codeType":"CODE_RETIRED_RETIREDREASONS",
+				"text":"到服役年限",
+				"pId":null,
+				"id":"1",
+				"isParent":false,
+				"children":[]
+			},
+			{
+				"ids":"80863",
+				"label":"考核不合格",
+				"codeType":"CODE_RETIRED_RETIREDREASONS",
+				"text":"考核不合格",
+				"pId":null,
+				"id":"2",
+				"isParent":false,
+				"children":[]
+			},
+			{
+				"ids":"80864",
+				"label":"其他",
+				"codeType":"CODE_RETIRED_RETIREDREASONS",
+				"text":"其他",
+				"pId":null,
+				"id":"3",
+				"isParent":false,
+				"children":[]
+			}
+		]
+	},
+	"success":true,
+	"message":"成功"
+}
\ No newline at end of file

src/api/menuDataApi/jobDogManageApi.js

@@ -5,9 +5,17 @@ export let baseUrl = '/api'
 export const getJobDogList = params =>
   postJson(`${baseUrl}/refreshment/dogQuery`, params)
 
+// 获取警犬复训列表接口
+export const dogQuery = params =>
+  postJson(`${baseUrl}/retired/dogQuery`, params)
+
 // 警犬复训（导出url）
 export const exportJobDogUrl = `${baseUrl}/refreshment/export`
 
+
+export const dogDelete = params =>
+  postJson(`${baseUrl}/retired/dogDelete`, params)
+
 // 警犬复训（删除）
 export const deleteJobDog = params =>
   postJson(`${baseUrl}/refreshment/dogDelete`, params)
@@ -24,6 +32,9 @@ export const batchAddJobDog = params =>
 export const editJobDog = params =>
   postJson(`${baseUrl}/refreshment/dogUpdate`, params)
 
+export const dogUpdate = params =>
+  postform(`${baseUrl}/retired/dogUpdate`, params)
+
 // 警犬复训（提取）
 export const extractJobDog = params =>
   postJson(`${baseUrl}/refreshment/extract`, params)
@@ -32,6 +43,10 @@ export const extractJobDog = params =>
 export const getJobDogDetail = params =>
   postJson(`${baseUrl}/refreshment/dogDetail`, params)
 
+
+export const dogDetail = params =>
+  postJson(`${baseUrl}/retired/dogDetail`, params)
+
 // 审批及提请
 export const addSp = params =>
   postJson(`${baseUrl}/spmanager/addSpByDogTrainingLevelId`, params)

src/router/modules/index.js

@@ -360,7 +360,7 @@ export default [
       {
         path: 'poDogRetireManageEdit',
         name: 'poDogRetireManageEdit',
-        component: () => import('@/views/poDogRetireManage/components/poDogRetireManageEdit.vue'),
+        component: () => import('@/views/poDogRetireManage/components/poDogRetireManageEdit2.vue'),
         meta: {
           title: '警用退役犬信息管理-编辑',
           // 编辑新增页面此字段务必设置为true

src/utils/tableHeaderParams.js

@@ -239,6 +239,52 @@ export const getJygzqglDefaultColumns = () => {
 }
 
 // 工作犬复训管理（全部列）
+export const gettyqlAllColumns = () => {
+  let arr = [
+    {
+      label: "警犬名称",
+      prop: "name",
+    },
+    {
+      label: "芯片号",
+      prop: "chipCode",
+    },
+    {
+      label: "工作犬等级",
+      prop: "trainingLevelIdStr",
+    },
+    {
+      label: "归属单位",
+      prop: "trainingUnit",
+    },
+    {
+      label: "审核状态",
+      prop: "spFlowStr",
+    },
+    {
+      label: "是否退役",
+      prop: "ifretiredStr",
+    },
+    {
+      label: "退役日期",
+      prop: "retiredDate",
+    },
+    {
+      label: "健康状态",
+      prop: "healthStatusStr",
+    },
+    {
+      label: "归宿单位",
+      prop: "destinationUnitName",
+    },
+    {
+      label: "退役原因",
+      prop: "retiredReasonsStr",
+    },
+  ]
+  return arr
+}
+// 工作犬复训管理（全部列）
 export const getGzqfxglAllColumns = () => {
   let arr = [
     {

src/views/jobDogManage/components/jobDogManageEdit3.vue

@@ -1121,7 +1121,7 @@ export default {
           if (this.routeName === "jobDogManageEdit") {
             this.editParams(params, boo);
           } else {
-            this.addParams(params);
+            this.addParams(params, boo);
           }
         }
       });
@@ -1173,7 +1173,7 @@ export default {
           });
         });
     },
-    addParams(params) {
+    addParams(params, boo) {
       let obj = {
         dogId: this.dogId,
         pdtraininglevelid: params.pdtraininglevelid, //评定等级