Merge branch 'fix_bug_first_stage'

# Conflicts: # jero-web/src/components/CollectionType/index.vue
2022-07-05 19:48:17 +08:00
parent 7ddac7eb75 eb6ab02004
commit 4b092fc07c
15 changed files with 415 additions and 251 deletions
@@ -729,10 +729,9 @@
    font-weight: bold;
  }

-  .ant-table td {
-    white-space: nowrap;
-  }
-
+  /*.ant-table td {*/
+  /*  white-space: nowrap;*/
+  /*}*/
  .selectWid .ant-select-selection--multiple {
    overflow: auto;
  }
@@ -277,9 +277,6 @@
    font-weight: bold;
  }

-  .ant-table td {
-    white-space: nowrap;
-  }
  .split-detail-wrap{
    .table{
      .ant-table-row-cell-break-word{
@@ -305,6 +302,9 @@
  }
 </style>
 <style lang="less" scoped>
+  .ant-table td {
+    white-space: nowrap;
+  }
  .box {
    width: 100%;
    height: calc(100% - 100px);
@@ -54,7 +54,7 @@
    position: absolute;
    top: 0;
    left: 0;
-    z-index: 111999;
+    z-index: 1009;
    width: 100%;
    height: 100%;
    background-color: rgba(255, 255, 255, 0.9);
@@ -327,6 +327,7 @@
                this.$emit('addFormClick')
              } else {
                this.confirmLoading = false
+                this.$emit('addFormWarning')
                if (res.message.indexOf('发布日期不能大于') >= 0) {
                  this.$message.warning(res.message)
                } else if (res.message.indexOf('编号已存在') >= 0) {
@@ -337,6 +338,7 @@
              }
            })
          } else {
+            this.$emit('addFormWarning')
            return false
          }
        })
@@ -671,10 +671,6 @@
    font-weight: bold;
  }

-  .ant-table td {
-    white-space: nowrap;
-  }
-
  .content-text {
    width: 100%;
    display: flex;