From 6e912707b2c73bb183563f197b92b08ac19790ff Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 06 十一月 2023 17:12:59 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/ProjectService.java | 15 --
/dev/null | 26 ----
modules/mainPart/src/main/resources/mapper/project/ProjectDao.xml | 20 +++
modules/mainPart/src/main/java/com/zt/life/modules/project/model/Project.java | 7
zt/core/src/main/resources/template/index.vue.vm | 8
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java | 12 -
web/src/views/modules/olderForm/SoftwareTestingOrderForm.vue | 83 ++++---------
web/src/views/modules/project/project-add-or-update.vue | 85 ++++++++++++++
modules/mainPart/src/main/java/com/zt/life/modules/project/dao/ProjectDao.java | 5
modules/mainPart/src/main/resources/mapper/mainParts/TaskCenterDao.xml | 0
web/src/views/modules/project/project.vue | 49 ++++++++
zt/core/src/main/resources/template/add-or-update.vue.vm | 4
12 files changed, 202 insertions(+), 112 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/project/controller/ProjectController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
similarity index 87%
rename from modules/mainPart/src/main/java/com/zt/life/modules/mainPart/project/controller/ProjectController.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
index 0107290..483d93a 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/project/controller/ProjectController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
@@ -1,4 +1,4 @@
-package com.zt.life.modules.mainPart.project.controller;
+package com.zt.life.modules.project.controller;
import com.zt.common.annotation.LogOperation;
@@ -12,8 +12,8 @@
import com.zt.common.validator.group.AddGroup;
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
-import com.zt.life.modules.mainPart.project.model.Project;
-import com.zt.life.modules.mainPart.project.service.ProjectService;
+import com.zt.life.modules.project.model.Project;
+import com.zt.life.modules.project.service.ProjectService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -93,10 +93,4 @@
return Result.ok();
}
- @GetMapping("check")
- @ApiOperation("鏌ヨ鎵�鏈夐」鐩瓧娈�")
- public Result<List<String>> checkProjects() {
- List<String> columnNames = projectService.checkProjects();
- return Result.ok(columnNames);
- }
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/project/dao/ProjectDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/ProjectDao.java
similarity index 70%
rename from modules/mainPart/src/main/java/com/zt/life/modules/mainPart/project/dao/ProjectDao.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/project/dao/ProjectDao.java
index 33cd469..0a88920 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/project/dao/ProjectDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/ProjectDao.java
@@ -1,7 +1,7 @@
-package com.zt.life.modules.mainPart.project.dao;
+package com.zt.life.modules.project.dao;
import com.zt.common.dao.BaseDao;
-import com.zt.life.modules.mainPart.project.model.Project;
+import com.zt.life.modules.project.model.Project;
import org.apache.ibatis.annotations.Mapper;
@@ -19,6 +19,5 @@
public interface ProjectDao extends BaseDao<Project> {
List<Project> getList(Map<String, Object> params);
- List<String> checkList();
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/project/model/Project.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Project.java
similarity index 89%
rename from modules/mainPart/src/main/java/com/zt/life/modules/mainPart/project/model/Project.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/project/model/Project.java
index aa57716..9d7cdc1 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/project/model/Project.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Project.java
@@ -1,4 +1,4 @@
-package com.zt.life.modules.mainPart.project.model;
+package com.zt.life.modules.project.model;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
@@ -21,6 +21,9 @@
public class Project extends BusiEntity {
private static final long serialVersionUID = 1L;
+ @ApiModelProperty(value = "杞欢鍚嶇О")
+ private String softwarename;
+
@ApiModelProperty(value = "椤圭洰缂栧彿")
private String code;
@@ -37,7 +40,7 @@
private String optEnviron;
@ApiModelProperty(value = "缂栫▼璇█")
- private String programlang;
+ private String programLang;
@ApiModelProperty(value = "杞欢绫诲瀷")
private Integer softwareType;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/project/service/ProjectService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/ProjectService.java
similarity index 65%
rename from modules/mainPart/src/main/java/com/zt/life/modules/mainPart/project/service/ProjectService.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/project/service/ProjectService.java
index 5233af3..f9d905c 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/project/service/ProjectService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/ProjectService.java
@@ -1,8 +1,8 @@
-package com.zt.life.modules.mainPart.project.service;
+package com.zt.life.modules.project.service;
import com.zt.common.service.BaseService;
-import com.zt.life.modules.mainPart.project.dao.ProjectDao;
-import com.zt.life.modules.mainPart.project.model.Project;
+import com.zt.life.modules.project.dao.ProjectDao;
+import com.zt.life.modules.project.model.Project;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
import javax.annotation.Resource;
@@ -36,14 +36,5 @@
public void delete(Long[] ids) {
super.deleteLogic(ids);
}
- /**
- * 鑾峰彇鎵�鏈夐」鐩瓧娈�
- *
- * @return 鍖呭惈鎵�鏈夐」鐩瓧娈电殑鍒楄〃
- */
- public List<String> checkProjects() {
- return baseDao.checkList();
- }
-
}
diff --git a/modules/mainPart/src/main/resources/mapper/mainParts/ProjectDao.xml b/modules/mainPart/src/main/resources/mapper/mainParts/ProjectDao.xml
deleted file mode 100644
index e047f3d..0000000
--- a/modules/mainPart/src/main/resources/mapper/mainParts/ProjectDao.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.zt.life.modules.mainPart.project.dao.ProjectDao">
-
- <select id="getList" resultType="com.zt.life.modules.mainPart.project.model.Project">
- select a.*
- from project a
- <where>
- a.is_delete = 0
- <if test="whereSql!=null">
- and ${whereSql}
- </if>
- </where>
- <if test="orderBySql!=null">
- ORDER BY ${orderBySql}
- </if>
- </select>
- <select id="checkList" resultType="java.lang.String">
- SELECT COLUMN_NAME
- FROM INFORMATION_SCHEMA.COLUMNS
- WHERE TABLE_NAME = 'project'
- AND TABLE_SCHEMA = 'test_project';
- </select>
-
-</mapper>
diff --git a/modules/mainPart/src/main/resources/mapper/newplan/TaskCenterDao.xml b/modules/mainPart/src/main/resources/mapper/mainParts/TaskCenterDao.xml
similarity index 100%
rename from modules/mainPart/src/main/resources/mapper/newplan/TaskCenterDao.xml
rename to modules/mainPart/src/main/resources/mapper/mainParts/TaskCenterDao.xml
diff --git a/modules/mainPart/src/main/resources/mapper/project/ProjectDao.xml b/modules/mainPart/src/main/resources/mapper/project/ProjectDao.xml
new file mode 100644
index 0000000..e905979
--- /dev/null
+++ b/modules/mainPart/src/main/resources/mapper/project/ProjectDao.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.zt.life.modules.project.dao.ProjectDao">
+
+ <select id="getList" resultType="com.zt.life.modules.project.model.Project">
+ select a.*
+ from project a
+ <where>
+ a.is_delete = 0
+ <if test="whereSql!=null">
+ and ${whereSql}
+ </if>
+ </where>
+ <if test="orderBySql!=null">
+ ORDER BY ${orderBySql}
+ </if>
+ </select>
+
+</mapper>
diff --git a/web/src/views/modules/olderForm/SoftwareTestingOrderForm.vue b/web/src/views/modules/olderForm/SoftwareTestingOrderForm.vue
index 2724b9d..4cf0803 100644
--- a/web/src/views/modules/olderForm/SoftwareTestingOrderForm.vue
+++ b/web/src/views/modules/olderForm/SoftwareTestingOrderForm.vue
@@ -58,7 +58,7 @@
</el-form-item>
<!-- 鑱旂郴浜� -->
<el-form-item label="杞欢鏍囪瘑" style="width: 49%">
- <el-input v-model="form.identification" placeholder="璇疯緭鍏ヨ蒋浠舵爣璇�"></el-input>
+ <el-input v-model="form.identity" placeholder="璇疯緭鍏ヨ蒋浠舵爣璇�"></el-input>
</el-form-item>
<!-- 璇︾粏鍦板潃 -->
<el-form-item label="瀵嗙骇" style="width: 49%">
@@ -76,32 +76,11 @@
</el-radio-group>
</el-form-item>
<el-form-item label="杩愯鐜" style="width: 49%">
- <el-input v-model="form.runtimeEnvironment" placeholder="璇疯緭鍏ヨ繍琛岀幆澧�"></el-input>
+ <el-input v-model="form.optEnviron" placeholder="璇疯緭鍏ヨ繍琛岀幆澧�"></el-input>
</el-form-item>
<el-form-item label="缂栫▼璇█" style="width: 49%">
- <el-input v-model="form.programmingLanguage" placeholder="璇疯緭鍏ョ紪绋嬭瑷�"></el-input>
+ <el-input v-model="form.programlang" placeholder="璇疯緭鍏ョ紪绋嬭瑷�"></el-input>
</el-form-item>
- <div class="el-flex">
- <div class="DWidth DAlign DHold">
- 琚祴浠跺強鍏朵粬鐩稿叧鐗╁搧娓呭崟
- </div>
- <div style="width: calc(100% - 120px)">
- <el-table class="el-software" height="230" border :data="form.tableData"
- stripe>
- <el-table-column prop="code" align="center" width="80" label="搴忓彿"></el-table-column>
- <el-table-column prop="name" min-width="300" label="鍚嶇О"></el-table-column>
- <el-table-column prop="identification" align="center" width="180" label="鏍囪瘑/鐗堟湰"></el-table-column>
- <el-table-column label="鏄惁琚祴浠�" width="180" align="center">
- <template slot-scope="scope">
- <el-radio-group v-model="scope.row.isTested">
- <el-radio :label="1">鏄�</el-radio>
- <el-radio :label="0">鍚�</el-radio>
- </el-radio-group>
- </template>
- </el-table-column>
- </el-table>
- </div>
- </div>
<div class="el-flex" style="height: 40px;">
<div class="DWidth DAlign DHold">
杞欢绫诲瀷
@@ -123,19 +102,19 @@
<div class="DOldForm">
<!-- 鍗曚綅鍚嶇О -->
<el-form-item label="椤圭洰璐熻矗浜�" style="width: 99%">
- <el-input v-model="form.delegateUnitName" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"></el-input>
+ <el-input v-model="form.projectLeader" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"></el-input>
</el-form-item>
<!-- 鑱旂郴浜� -->
<el-form-item label="椤圭洰娴嬭瘯浜哄憳" style="width: 99%">
- <el-input v-model="form.delegateUnitContactPerson" placeholder="璇疯緭鍏ヨ仈绯讳汉"></el-input>
+ <el-input v-model="form.projectTesters" placeholder="璇疯緭鍏ヨ仈绯讳汉"></el-input>
</el-form-item>
<!-- 璇︾粏鍦板潃 -->
<el-form-item label="椤圭洰瀹℃牳浜�" style="width: 99%">
- <el-input v-model="form.delegateUnitAddress" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
+ <el-input v-model="form.projectReviewer" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
</el-form-item>
<!-- 鑱旂郴鏂瑰紡 -->
<el-form-item label="鏄惁绛剧讲鍚堝悓" style="width: 99%">
- <el-input v-model="form.delegateUnitContact" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�"></el-input>
+ <el-input v-model="form.isContract" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�"></el-input>
</el-form-item>
</div>
</div>
@@ -158,37 +137,33 @@
developmentAddress: '',
developmentContact: '',
softwareName: '',
- identification: '',
+ identity: '',
secretClass: '',
criticalLevel: 0,
- runtimeEnvironment: '',
- programmingLanguage: '',
- checkList: [1, 0],
- tableData: [
- {code: 1, name: '灏忛箤楣�', identification: '3/121', isTested: 1},
- {code: 2, name: '灏忛箤楣�', identification: '3/122', isTested: 0},
- {code: 3, name: '灏忛箤楣�', identification: '3/111', isTested: 0},
- {code: 4, name: '灏忛箤楣�', identification: '36/121', isTested: 1},
- {code: 5, name: '灏忛箤楣�', identification: '3/121a', isTested: 0},
- {code: 6, name: '灏忛箤楣�', identification: '3c/121', isTested: 0},
- {code: 7, name: '灏忛箤楣�', identification: '3ac/12ac1', isTested: 0},
- {code: 8, name: '灏忛箤楣�', identification: '3aca/ac121', isTested: 1},
- {code: 9, name: '灏忛箤楣�', identification: '3ww/ca121', isTested: 1},
- {code: 10, name: '灏忛箤楣�', identification: '3aw/12wd1', isTested: 1},
- {code: 1, name: '灏忛箤楣�', identification: '3/121', isTested: 1},
- {code: 2, name: '灏忛箤楣�', identification: '3/122', isTested: 0},
- {code: 3, name: '灏忛箤楣�', identification: '3/111', isTested: 0},
- {code: 4, name: '灏忛箤楣�', identification: '36/121', isTested: 1},
- {code: 5, name: '灏忛箤楣�', identification: '3/121a', isTested: 1},
- {code: 6, name: '灏忛箤楣�', identification: '3c/121', isTested: 0},
- {code: 7, name: '灏忛箤楣�', identification: '3ac/12ac1', isTested: 0},
- {code: 8, name: '灏忛箤楣�', identification: '3aca/ac121', isTested: 1},
- {code: 9, name: '灏忛箤楣�', identification: '3ww/ca121', isTested: 1},
- {code: 10, name: '灏忛箤楣�', identification: '3aw/12wd1', isTested: 1}
- ],
+ optEnviron: '',
+ programlang: '',
+ softwareType: [1, 0],
+ id: '',
+ code: '',
+ projectLeader: '',
+ projectTesters: '',
+ projectReviewer: '',
+ isContract: ''
},
}
},
+ methods: {
+ // 鑾峰彇淇℃伅
+ async getInfo() {
+ let res = await this.$http.get(`/modules/check/`)
+ console.log(res.data);
+ console.log(res);
+ /* this.dataForm = {
+ ...this.dataForm,
+ ...res.data
+ }*/
+ },
+ }
}
</script>
diff --git a/web/src/views/modules/project/project-add-or-update.vue b/web/src/views/modules/project/project-add-or-update.vue
new file mode 100644
index 0000000..5fac391
--- /dev/null
+++ b/web/src/views/modules/project/project-add-or-update.vue
@@ -0,0 +1,85 @@
+<template>
+ <zt-dialog ref="dialog" column="2" @confirm="formSubmit">
+ <el-form :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" label-width="120px">
+ <zt-form-item label="杞欢鍚嶇О" prop="softwarename" rules="required">
+ <el-input v-model="dataForm.softwarename"></el-input>
+ </zt-form-item>
+ <zt-form-item label="椤圭洰缂栧彿" prop="code" rules="required">
+ <el-input v-model="dataForm.code"></el-input>
+ </zt-form-item>
+ <zt-form-item label="椤圭洰鏍囪瘑" prop="identity" rules="required">
+ <el-input v-model="dataForm.identity"></el-input>
+ </zt-form-item>
+ <zt-form-item label="瀵嗙骇" prop="secretClass" rules="required">
+ <el-input v-model="dataForm.secretClass"></el-input>
+ </zt-form-item>
+ <zt-form-item label="鍏抽敭绛夌骇" prop="criticalLevel" rules="required">
+ <el-input v-model="dataForm.criticalLevel"></el-input>
+ </zt-form-item>
+ <zt-form-item label="杩愯鐜" prop="optEnviron" rules="required">
+ <el-input v-model="dataForm.optEnviron"></el-input>
+ </zt-form-item>
+ <zt-form-item label="缂栫▼璇█" prop="programLang" rules="required">
+ <el-input v-model="dataForm.programLang"></el-input>
+ </zt-form-item>
+ <zt-form-item label="杞欢绫诲瀷" prop="softwareType" rules="required">
+ <el-input v-model="dataForm.softwareType"></el-input>
+ </zt-form-item>
+ <zt-form-item label="椤圭洰璐熻矗浜�" prop="projectLeader" rules="required">
+ <el-input v-model="dataForm.projectLeader"></el-input>
+ </zt-form-item>
+ <zt-form-item label="椤圭洰娴嬭瘯浜哄憳" prop="projectTesters" rules="required">
+ <el-input v-model="dataForm.projectTesters"></el-input>
+ </zt-form-item>
+ <zt-form-item label="椤圭洰瀹℃牳浜哄憳" prop="projectReviewer" rules="required">
+ <el-input v-model="dataForm.projectReviewer"></el-input>
+ </zt-form-item>
+ <zt-form-item label="鏄惁绛剧讲鍚堝悓" prop="isContract" rules="required">
+ <el-input v-model="dataForm.isContract"></el-input>
+ </zt-form-item>
+ </el-form>
+ </zt-dialog>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ dataForm: {
+ id: '',
+ softwarename: '',
+ code: '',
+ identity: '',
+ secretClass: '',
+ criticalLevel: '',
+ optEnviron: '',
+ programLang: '',
+ softwareType: '',
+ projectLeader: '',
+ projectTesters: '',
+ projectReviewer: '',
+ isContract: ''
+ }
+ }
+ },
+ methods: {
+ // 鑾峰彇淇℃伅
+ async getInfo() {
+ let res = await this.$http.get(`/project//${this.dataForm.id}`)
+ this.dataForm = {
+ ...this.dataForm,
+ ...res.data
+ }
+ },
+ // 琛ㄥ崟鎻愪氦
+ async formSubmit() {
+ let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/project//', this.dataForm)
+ if (res.success) {
+ await this.$tip.success()
+ this.$refs.dialog.close()
+ this.$emit('refreshDataList')
+ }
+ }
+ }
+ }
+</script>
diff --git a/web/src/views/modules/project/project.vue b/web/src/views/modules/project/project.vue
new file mode 100644
index 0000000..8efe674
--- /dev/null
+++ b/web/src/views/modules/project/project.vue
@@ -0,0 +1,49 @@
+<template>
+ <el-card shadow="never" class="aui-card--fill">
+ <div class="mod-project-project}">
+ <zt-table-wraper query-url="/project//page" delete-url="/project/" v-slot="{ table }">
+ <el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
+ <el-form-item>
+ <zt-button type="query" @click="table.query()"/>
+ <zt-button type="add" perm="project::add" @click="table.editHandle()"/>
+ <zt-button type="delete" perm="project::delete" @click="table.deleteHandle()"/>
+ </el-form-item>
+ </el-form>
+ <el-table v-loading="table.dataLoading" :data="table.dataList" border @selection-change="table.selectionChangeHandle">
+ <el-table-column type="selection" width="40"/>
+ <el-table-column prop="softwarename" label="杞欢鍚嶇О"/>
+ <el-table-column prop="code" label="椤圭洰缂栧彿"/>
+ <el-table-column prop="identity" label="椤圭洰鏍囪瘑"/>
+ <el-table-column prop="secretClass" label="瀵嗙骇"/>
+ <el-table-column prop="criticalLevel" label="鍏抽敭绛夌骇"/>
+ <el-table-column prop="optEnviron" label="杩愯鐜"/>
+ <el-table-column prop="programLang" label="缂栫▼璇█"/>
+ <el-table-column prop="softwareType" label="杞欢绫诲瀷"/>
+ <el-table-column prop="projectLeader" label="椤圭洰璐熻矗浜�"/>
+ <el-table-column prop="projectTesters" label="椤圭洰娴嬭瘯浜哄憳"/>
+ <el-table-column prop="projectReviewer" label="椤圭洰瀹℃牳浜哄憳"/>
+ <el-table-column prop="isContract" label="鏄惁绛剧讲鍚堝悓"/>
+
+ <zt-table-column-handle :table="table" edit-perm="project:update" delete-perm="project::delete"/>
+ </el-table>
+ <!-- 寮圭獥, 鏂板 / 淇敼 -->
+ <add-or-update @refreshDataList="table.query"/>
+ </zt-table-wraper>
+ </div>
+ </el-card>
+</template>
+
+<script>
+ import AddOrUpdate from './project-add-or-update'
+ export default {
+ data() {
+ return {
+ dataForm: {
+ }
+ }
+ },
+ components: {
+ AddOrUpdate
+ }
+ }
+</script>
diff --git a/zt/core/src/main/resources/template/add-or-update.vue.vm b/zt/core/src/main/resources/template/add-or-update.vue.vm
index 8c2775c..e7b9b4a 100644
--- a/zt/core/src/main/resources/template/add-or-update.vue.vm
+++ b/zt/core/src/main/resources/template/add-or-update.vue.vm
@@ -26,7 +26,7 @@
methods: {
// 鑾峰彇淇℃伅
async getInfo() {
- let res = await #[[this.$http.get(]]#`/${moduleName}/${pathName}/#[[${]]#this.dataForm.${pk.attrName}}`)
+ let res = await #[[this.$http.get(]]#`/${moduleName}/${pathName}/#[[${]]#this.dataForm.id}`)
this.dataForm = {
...this.dataForm,
...res.data
@@ -34,7 +34,7 @@
},
// 琛ㄥ崟鎻愪氦
async formSubmit() {
- let res = await #[[this.$http]]#[!this.dataForm.${pk.attrName} ? 'post' : 'put']('/${moduleName}/${pathName}/', this.dataForm)
+ let res = await #[[this.$http]]#[!this.dataForm.id ? 'post' : 'put']('/${moduleName}/${pathName}/', this.dataForm)
if (res.success) {
await this.$tip.success()
this.$refs.dialog.close()
diff --git a/zt/core/src/main/resources/template/index.vue.vm b/zt/core/src/main/resources/template/index.vue.vm
index 5e9e789..d1e57e7 100644
--- a/zt/core/src/main/resources/template/index.vue.vm
+++ b/zt/core/src/main/resources/template/index.vue.vm
@@ -12,8 +12,8 @@
#end
<el-form-item>
<zt-button type="query" @click="table.query()"/>
- <zt-button type="add" perm="${moduleName}:${permName}:add" @click="table.editHandle()"/>
- <zt-button type="delete" perm="${moduleName}:${permName}:delete" @click="table.deleteHandle()"/>
+ <zt-button type="add" perm="${moduleName}::add" @click="table.editHandle()"/>
+ <zt-button type="delete" perm="${moduleName}::delete" @click="table.deleteHandle()"/>
</el-form-item>
</el-form>
<el-table v-loading="table.dataLoading" :data="table.dataList" border @selection-change="table.selectionChangeHandle">
@@ -24,7 +24,7 @@
#end
#end
- <zt-table-column-handle :table="table" edit-perm="${moduleName}:${permName}:update" delete-perm="${moduleName}:${permName}:delete"/>
+ <zt-table-column-handle :table="table" edit-perm="${moduleName}:update" delete-perm="${moduleName}::delete"/>
</el-table>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<add-or-update @refreshDataList="table.query"/>
@@ -34,7 +34,7 @@
</template>
<script>
- import AddOrUpdate from './${pathName}-add-or-update'
+ import AddOrUpdate from './${tableName}-add-or-update'
export default {
data() {
return {
--
Gitblit v1.9.1