Merge remote-tracking branch 'origin/master'

jiangping

2024-01-23 3f44e29a7e2620bcc498f9d4bf7c454b00225ee2

 company/src/components/common/GlobalWindow.vue

@@ -18,7 +18,7 @@
    </div>
    <div v-if="withFooter" class="window__footer">
      <slot name="footer">
        <el-button @click="confirm" :loading="confirmWorking" type="primary">确定</el-button>
        <el-button @click="confirm" :loading="confirmWorking" type="primary">{{submitText}}</el-button>
        <el-button @click="close">取消</el-button>
      </slot>
    </div>
@@ -52,6 +52,11 @@
    visible: {
      type: Boolean,
      required: true
    },
    // 确认按钮文字
    submitText: {
      type: String,
      default: '确定'
    }
  },
  methods: {