Merge remote-tracking branch 'origin/develop' into develop

2021-07-27 15:49:51 +08:00
parent 2eca268fd0 23c6e90950
commit 8b960b384e
21 changed files with 2326 additions and 2238 deletions
@@ -361,7 +361,7 @@ export default {
        page: 1,
        pageSize: this.$store.getters.userInfo.configContent,
        total: 0,
-        standType: 'INLAND',
+        standType: 'ALL',
        quoteIdList: '',
        validFlag: '0'
      }
@@ -329,7 +329,7 @@ export default {
        page: 1,
        pageSize: this.$store.getters.userInfo.configContent,
        total: 0,
-        standType: 'FOREIGN',
+        standType: 'ALL',
        quoteIdList: '',
        validFlag: '0'
      }
@@ -6,6 +6,7 @@
            :size="width"
            :append-to-body=true
            :before-close="cancelUserInfo"
+            :show-checkbox="showCheckBox"
            >
        <el-tree class="common-tree" :style="style" ref="tree" :data="data" :props="defaultProps"
                 :load="loadNode"
@@ -111,6 +112,12 @@
                    return '';
                }
            },
+          showCheckBox:{
+                type: Boolean,
+                default () {
+                    return true;
+                }
+            },
            // 配置是否展开
            modalShowFlag: {
                type: Boolean,