From 233494b19c74c7678f36eef42d481f01ed0b360c Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 26 十月 2023 17:31:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/modeling/Version.vue | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/modeling/Version.vue b/Source/UBCS-WEB/src/views/modeling/Version.vue
index f1fc3ae..70d4178 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(){
@@ -141,6 +144,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){
@@ -182,13 +196,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('姝ゆ搷浣滃皢姘镐箙鍒犻櫎, 鏄惁缁х画?', '鎻愮ず', {
--
Gitblit v1.9.3