警犬

src/api/menuDataApi/jobDogManageApi.js

@@ -36,6 +36,14 @@ export const getJobDogDetail = params =>
 export const addSp = params =>
   postJson(`${baseUrl}/spmanager/addSpByDogTrainingLevelId`, params)
 
+// 审批及提请
+export const awaitPdWorkExtract = params =>
+  postJson(`${baseUrl}/refreshment/awaitPdWorkExtract`, params)
+
+
+export const dogAdd = params =>
+  postJson(`${baseUrl}/refreshment/dogAdd`, params)
+
 
 
 // 警犬复训审批查询

src/router/modules/index.js

@@ -202,7 +202,7 @@ export default [
       {
         path: 'jobDogManageAdd',
         name: 'jobDogManageAdd',
-        component: () => import('@/views/jobDogManage/components/jobDogManageEdit2.vue'),
+        component: () => import('@/views/jobDogManage/components/jobDogManageEdit3.vue'),
         meta: {
           title: '工作犬复训管理-新增',
           // 编辑新增页面此字段务必设置为true

src/utils/tableHeaderParams.js

@@ -251,7 +251,7 @@ export const getGzqfxglAllColumns = () => {
     },
     {
       label: "工作犬等级",
-      prop: "trainingLevelId",
+      prop: "trainingLevelIdStr",
     },
     {
       label: "归属单位",

src/views/jobDogManage/components/jobDogManageEdit2.vue

@@ -940,6 +940,11 @@ export default {
               });
             }
             this.updatepdtraininglevelidflag = datas.updatepdtraininglevelidflag;
+            if(this.updatepdtraininglevelidflag == '0') {
+              if(datas.ifregularassessment == '0' && datas.pdtraininglevelid) {
+                this.gzqdjOptions = this.gzqdjOptions.filter(e => parseInt(e.id) <= parseInt(datas.pdtraininglevelid));
+              }
+            }
             this.detailInfo = datas;
             this.loading = false;
             return;

src/views/jobDogManage/index.vue

@@ -94,22 +94,22 @@
           >
         </div>
         <div class="rightC">
-          <!-- <el-button
+          <el-button
             icon="el-icon-plus"
             size="small"
             type="primary"
             plain
             class="btnStylePub btnStyle1"
             @click="addData"
-          >新增</el-button> -->
-          <el-button
+          >新增</el-button>
+          <!-- <el-button
             size="small"
             icon="el-icon-plus"
             type="warning"
             class="btnStylePub btnStyle2"
             @click="batchAdd"
             >批量新增</el-button
-          >
+          > -->
           <el-button
             size="small"
             icon="el-icon-upload2"

src/views/jobDogRefreshment/components/jobDogManageSp.vue

@@ -618,6 +618,7 @@ export default {
             { title: "考核单位", col: "3", id: "checkUnitName" },
             { title: "主考人", col: "3", id: "checkStaff" },
             { title: "考核日期", col: "3", id: "checkDate" },
+            { title: "评定等级", col: "3", id: "pdtraininglevelidStr" },
             {
               title: "考核科目及成绩",
               col: "5",

src/views/jobDogRefreshment/index.vue

@@ -88,14 +88,14 @@
             class="btnStylePub btnStyle1"
             @click="addData"
           >新增</el-button> -->
-          <el-button
+          <!-- <el-button
             size="small"
             icon="el-icon-plus"
             type="warning"
             class="btnStylePub btnStyle2"
             @click="batchAdd"
             >批量新增</el-button
-          >
+          > -->
           <el-button
             size="small"
             icon="el-icon-upload2"