From 6e66b6ac65ace063af12a4ffbe6c2a101d6cc0ba Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 01 十一月 2023 10:17:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/modeling/Version.vue | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/modeling/Version.vue b/Source/UBCS-WEB/src/views/modeling/Version.vue
index a401e5e..0125121 100644
--- a/Source/UBCS-WEB/src/views/modeling/Version.vue
+++ b/Source/UBCS-WEB/src/views/modeling/Version.vue
@@ -5,6 +5,7 @@
:data="data"
:option="option"
:page.sync="page"
+ :permission="permissionList"
@on-load="getList"
@row-update="rowUpdate"
@row-save="rowSave"
@@ -19,6 +20,7 @@
plain
type="primary"
icon="el-icon-zoom-in"
+ v-if="permissionList.apply"
@click="applyRangeSearch">鏌ョ湅浣跨敤鑼冨洿
</el-button>
</el-tooltip>
@@ -37,6 +39,7 @@
<script>
import { getPage,add,update,remove,getAppayRange } from '../../api/omd/revisionRule';
+import {mapGetters} from "vuex";
export default {
name: "Version",
data(){
@@ -56,6 +59,7 @@
],
form:{},
option:{
+ height:'auto',
headerAlign:'center',
align: 'center',
border: true,
@@ -97,13 +101,16 @@
}
]
},
- {
- label:"璺宠穬瀛楃",
- prop: "skipCode"
- },
+ // {
+ // label:"璺宠穬瀛楃",
+ // prop: "skipCode"
+ // },
{
label: "鍒濆鍊�",
prop:"startCode",
+ type: 'number',
+ min:1,
+ max:99999,
rules: [
{
required: true,
@@ -115,6 +122,9 @@
{
label: "姝ラ暱",
prop: "serialStep",
+ type: 'number',
+ min:1,
+ max:99999,
rules: [
{
required: true,
@@ -123,14 +133,14 @@
}
]
},
- {
- label: "鍓嶇紑",
- prop:"prefixCode"
- },
- {
- label: "鍚庣紑",
- prop: "suffixCode"
- },
+ // {
+ // label: "鍓嶇紑",
+ // prop:"prefixCode"
+ // },
+ // {
+ // label: "鍚庣紑",
+ // prop: "suffixCode"
+ // },
{
label: "鎻忚堪",
prop:"description",
@@ -141,6 +151,17 @@
applyRangeData: []
}
},
+ computed:{
+ ...mapGetters(["permission"]),
+ permissionList(){
+ return{
+ addBtn:this.vaildData(this.permission.modeling_Version.version_add,false),
+ apply:this.vaildData(this.permission.modeling_Version.version_applyopen,false),
+ delBtn:this.vaildData(this.permission.modeling_Version.version_delete,false),
+ editBtn:this.vaildData(this.permission.modeling_Version.version_edit,false),
+ }
+ }
+ },
methods:{
// 琛岀偣鍑�
rowClick(row){
@@ -149,7 +170,7 @@
},
// 鏌ョ湅搴旂敤鑼冨洿
applyRangeSearch(){
- if (!this.selectRow && this.selectRow != 0){
+ if (!this.selectRowData && this.selectRowData.length != 0){
console.log(this.selectRow);
this.$message({
type:"warning",
--
Gitblit v1.9.3