Merge branch 'master' of http://101.42.248.108:3000/wangyu/post-check-web

src/views/postImplementation/problemEntry.vue

@@ -355,7 +355,7 @@
         >添加问题</el-button
       >
       <div slot="footer" class="dialog-footer" v-if="this.title !== '查看'">
-        <el-button type="primary" @click="submitForm">保存</el-button>
+        <el-button type="primary" @click="submitForm">提交</el-button>
         <el-button @click="cancelEstablish">取消</el-button>
       </div>
     </el-dialog>

src/views/postInspectionPlanning/planManagement/jobPlan.vue

@@ -490,16 +490,16 @@ export default {
         "operation",
       ];
       if (fields.includes(column.property)) {
-        const cellValue = row["checkTeamId"];
+        const cellValue = row["id"];
         if (cellValue && fields.includes(column.property)) {
           const prevRow = this.postList[rowIndex - 1];
           let nextRow = this.postList[rowIndex + 1];
-          if (prevRow && prevRow["checkTeamId"] === cellValue) {
+          if (prevRow && prevRow["id"] === cellValue) {
             return { rowspan: 0, colspan: 0 };
           } else {
             // return { rowspan: row.rowspan, colspan: 1 }
             let countRowspan = 1;
-            while (nextRow && nextRow["checkTeamId"] === cellValue) {
+            while (nextRow && nextRow["id"] === cellValue) {
               nextRow = this.postList[++countRowspan + rowIndex];
             }
             if (countRowspan > 1) {

src/views/postInspectionPlanning/planManagement/jobPlanAudit.vue

@@ -533,16 +533,16 @@ export default {
         "operation",
       ];
       if (fields.includes(column.property)) {
-        const cellValue = row["checkTeamId"];
+        const cellValue = row["id"];
         if (cellValue && fields.includes(column.property)) {
           const prevRow = this.postList[rowIndex - 1];
           let nextRow = this.postList[rowIndex + 1];
-          if (prevRow && prevRow["checkTeamId"] === cellValue) {
+          if (prevRow && prevRow["id"] === cellValue) {
             return { rowspan: 0, colspan: 0 };
           } else {
             // return { rowspan: row.rowspan, colspan: 1 }
             let countRowspan = 1;
-            while (nextRow && nextRow["checkTeamId"] === cellValue) {
+            while (nextRow && nextRow["id"] === cellValue) {
               nextRow = this.postList[++countRowspan + rowIndex];
             }
             if (countRowspan > 1) {

src/views/postInspectionPlanning/planManagement/jobPlanLook.vue

@@ -505,16 +505,16 @@ export default {
         "operation",
       ];
       if (fields.includes(column.property)) {
-        const cellValue = row["checkTeamId"];
+        const cellValue = row["id"];
         if (cellValue && fields.includes(column.property)) {
           const prevRow = this.postList[rowIndex - 1];
           let nextRow = this.postList[rowIndex + 1];
-          if (prevRow && prevRow["checkTeamId"] === cellValue) {
+          if (prevRow && prevRow["id"] === cellValue) {
             return { rowspan: 0, colspan: 0 };
           } else {
             // return { rowspan: row.rowspan, colspan: 1 }
             let countRowspan = 1;
-            while (nextRow && nextRow["checkTeamId"] === cellValue) {
+            while (nextRow && nextRow["id"] === cellValue) {
               nextRow = this.postList[++countRowspan + rowIndex];
             }
             if (countRowspan > 1) {