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 | 125 +++++++++++++++++++++++++++++++----------
1 files changed, 95 insertions(+), 30 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/modeling/Version.vue b/Source/UBCS-WEB/src/views/modeling/Version.vue
index 5898873..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,
@@ -63,41 +67,80 @@
searchMenuSpan:5,
highlightCurrentRow: true,
stripe:true,
+ viewBtn:false,
+ columnBtn:false,
column:[
{
- label: '',
+ label: '閫夋嫨',
prop: 'radio',
- width: 120
+ width: 120,
+ display:false
},
{
label:'鑻辨枃鍚嶇О',
- prop: 'id'
+ prop: 'id',
+ editDisabled: true,
+ rules: [
+ {
+ required: true,
+ message: '鑻辨枃鍚嶇О涓嶈兘涓虹┖',
+ trigger: 'blur'
+ }
+ ]
},
{
label:"涓枃鍚嶇О",
prop:"name",
search:true,
+ required: true,
+ rules: [
+ {
+ required: true,
+ message: '涓枃鍚嶇О涓嶈兘涓虹┖',
+ trigger: 'blur'
+ }
+ ]
},
- {
- label:"璺宠穬瀛楃",
- prop: "skipCode"
- },
+ // {
+ // label:"璺宠穬瀛楃",
+ // prop: "skipCode"
+ // },
{
label: "鍒濆鍊�",
- prop:"startCode"
+ prop:"startCode",
+ type: 'number',
+ min:1,
+ max:99999,
+ rules: [
+ {
+ required: true,
+ message: '鍒濆鍊间笉鑳戒负绌�',
+ trigger: 'blur'
+ }
+ ]
},
{
label: "姝ラ暱",
- prop: "serialStep"
+ prop: "serialStep",
+ type: 'number',
+ min:1,
+ max:99999,
+ rules: [
+ {
+ required: true,
+ message: '姝ラ暱涓嶈兘涓虹┖',
+ trigger: 'blur'
+ }
+ ]
},
- {
- label: "鍓嶇紑",
- prop:"prefixCode"
- },
- {
- label: "鍚庣紑",
- prop: "suffixCode"
- },
+ // {
+ // label: "鍓嶇紑",
+ // prop:"prefixCode"
+ // },
+ // {
+ // label: "鍚庣紑",
+ // prop: "suffixCode"
+ // },
{
label: "鎻忚堪",
prop:"description",
@@ -108,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){
@@ -116,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",
@@ -149,13 +203,19 @@
})
},
rowUpdate(row, index, done, loading) {
- update(row).then(() => {
- this.$message.success('淇敼鎴愬姛')
- done()
- this.getList();
- }).catch(() => {
- loading()
- })
+ console.log(row);
+ const date = new Date(row.ts);
+ const formattedDate = `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')} ${date.getHours().toString().padStart(2, '0')}:${date.getMinutes().toString().padStart(2, '0')}:${date.getSeconds().toString().padStart(2, '0')}.${date.getMilliseconds().toString().padStart(3, '0')}`;
+ row.ts = formattedDate;
+ update(row)
+ .then(() => {
+ this.$message.success('淇敼鎴愬姛');
+ done();
+ this.getList();
+ })
+ .catch(() => {
+ loading();
+ });
},
rowDel(row) {
this.$confirm('姝ゆ搷浣滃皢姘镐箙鍒犻櫎, 鏄惁缁х画?', '鎻愮ず', {
@@ -171,11 +231,16 @@
})
},
searchChange(params, done) {
- if (done) done();
- this.params = params;
- this.page.currentPage = 1;
- this.getList();
- this.$message.success('鎼滅储鎴愬姛')
+ var p = {"name_like" : params.name}
+ getPage(this.page.currentPage,this.page.pageSize,p).then(res => {
+ const data = res.data.data
+ this.loading = false;
+ this.page.total = data.total;
+ this.data = data.records;
+ });
+ if (done) {
+ done();
+ }
},
refreshChange() {
this.getList();
--
Gitblit v1.9.3