bug修改

src/utils/tableHeaderParams.js

@@ -277,6 +277,10 @@ export const getGzqfxglAllColumns = () => {
       label: "审核状态",
       prop: "spFlowStr",
     },
+    {
+      label: "评定方式",
+      prop: "xxlyms",
+    },
   ]
   return arr
 }

src/views/jobDogManage/components/jobDogManageEdit2.vue

@@ -195,9 +195,17 @@
             </template>
             <el-input
               disabled
+              v-model.trim="item.zhuanye"
+              class="itemSxjqClass"
+              placeholder="科目"
+              :clearable="true"
+            ></el-input>
+            <el-input
+              disabled
               v-model.trim="item.fenshu"
               placeholder="分数"
               :clearable="true"
+              class="itemJqxphClass"
             ></el-input>
           </el-form-item>
           <el-form-item
@@ -405,7 +413,10 @@
           >
             <el-select
               clearable
-              :disabled="updatepdtraininglevelidflag && updatepdtraininglevelidflag == '1'"
+              :disabled="
+                updatepdtraininglevelidflag &&
+                updatepdtraininglevelidflag == '1'
+              "
               placeholder="请选择评定等级"
               v-model="detailInfo.pdtraininglevelid"
             >
@@ -909,13 +920,16 @@ export default {
             }
             if (datas.workingDogClassificationId) {
               workDog = datas.workingDogClassificationId.split("#") || [];
+              let fArr = datas.score.split("#") || [];
               if (workDog && workDog.length > 0) workDog.pop();
               workDog.forEach((workItem, workIndex) => {
                 this.workingDogClassificationId.push({
                   zhuanye: "",
                   fenshu: "",
                 });
-                this.workingDogClassificationId[workIndex].fenshu = workItem;
+                this.workingDogClassificationId[workIndex].zhuanye = workItem;
+                this.workingDogClassificationId[workIndex].fenshu =
+                  fArr[workIndex];
               });
             }
             if (
@@ -939,10 +953,13 @@ export default {
                 this.kaoHeLists[scoreIndex].fenshu = scoreItem;
               });
             }
-            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.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;

src/views/jobDogManage/components/jobDogManageEdit3.vue

@@ -206,9 +206,17 @@
             </template>
             <el-input
               disabled
+              v-model.trim="item.zhuanye"
+              class="itemSxjqClass"
+              placeholder="科目"
+              :clearable="true"
+            ></el-input>
+            <el-input
+              disabled
               v-model.trim="item.fenshu"
               placeholder="分数"
               :clearable="true"
+              class="itemJqxphClass"
             ></el-input>
           </el-form-item>
           <el-form-item
@@ -841,14 +849,17 @@ export default {
                 }
                 if (datas.workingDogClassificationId) {
                   workDog = datas.workingDogClassificationId.split("#") || [];
+                  let fArr = datas.score.split("#") || [];
                   if (workDog && workDog.length > 0) workDog.pop();
                   workDog.forEach((workItem, workIndex) => {
                     this.workingDogClassificationId.push({
                       zhuanye: "",
                       fenshu: "",
                     });
-                    this.workingDogClassificationId[workIndex].fenshu =
+                    this.workingDogClassificationId[workIndex].zhuanye =
                       workItem;
+                    this.workingDogClassificationId[workIndex].fenshu =
+                      fArr[workIndex];
                   });
                 }
                 if (

src/views/jobDogRefreshment/components/jobDogManageSp.vue

@@ -50,7 +50,7 @@
               <span
                 class="zd-value"
                 v-if="
-                  item.id == 'workingDogClassificationId' ||
+                  item.id == 'workingDogClassificationId#score' ||
                   item.id == 'trainSubjectStr#trainSubjectGrade'
                 "
                 v-html="strReplace(item.id, detailObj)"
@@ -593,7 +593,7 @@ export default {
           data: [
             { title: "工作犬等级", col: "3", id: "trainingLevelId" },
             { title: "评定日期", col: "3", id: "pdrq" },
-            { title: "专业方向", col: "5", id: "workingDogClassificationId" },
+            { title: "专业方向及成绩", col: "5", id: "workingDogClassificationId#score" },
             {
               title: "其他材料",
               col: "6",