Merge remote-tracking branch 'origin/feature/v6.0/6.0.3' into feature/v6.0/...

张含笑

2025-09-20 ee8589ea223a7ff864df467c4dbcafe9aa45909e

 src/views/license/license.vue

@@ -41,7 +41,7 @@
        </avue-crud>

        <!-- 新增弹窗 -->
        <el-dialog title="新增 License" v-model="addDialogVisible" width="70%" :close-on-click-modal="false"
        <el-dialog class="ztzf-dialog-mange" title="新增 License" v-model="addDialogVisible" width="70%" :close-on-click-modal="false"
            @close="resetForm">
            <el-form :model="newLicense" ref="licenseForm" label-width="120px">
                <el-form-item label="机构ID" prop="licenseId">
@@ -50,7 +50,7 @@
                <el-form-item label="机构名称" prop="licenseName" required>
                    <el-input v-model="newLicense.licenseName" />
                </el-form-item>
                <el-form-item label="是否验证过期时间类型" prop="licenseType" required>
                <el-form-item label="过期时间类型" prop="licenseType" required>
                    <el-select v-model="newLicense.licenseType" placeholder="请选择">
                        <el-option label="不验证过期时间" :value="1" />
                        <el-option label="验证过期时间" :value="2" />
@@ -79,8 +79,8 @@
            </el-form>
            <template #footer>
                <div class="dialog-footer">
                    <el-button @click="addDialogVisible = false">取消</el-button>
                    <el-button type="primary" @click="createLicense">保存</el-button>
                  <el-button type="primary" @click="createLicense" :icon="CircleCheck">保存</el-button>
                  <el-button @click="addDialogVisible = false"  :icon="CircleClose">取消</el-button>
                </div>
            </template>

@@ -91,6 +91,7 @@
<script>
import { getList, add } from '@/api/license/license'
import { mapGetters } from 'vuex'
import { CircleCheck, CircleClose } from '@element-plus/icons-vue';

export default {
    data () {
@@ -269,6 +270,12 @@
        }
    },
    computed: {
      CircleClose() {
        return CircleClose
      },
      CircleCheck() {
        return CircleCheck
      },
        ...mapGetters(['userInfo', 'permission']),
        permissionList () {
            return {