From c30ef32089a7e4ac5c36c6d60ec0128e515edd54 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 14 三月 2024 15:30:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/modeling/Version.vue | 171 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 101 insertions(+), 70 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/modeling/Version.vue b/Source/UBCS-WEB/src/views/modeling/Version.vue
index 2aaa39c..74baaf3 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"
@@ -14,35 +15,38 @@
@search-change="searchChange"
@row-click="rowClick">
<template slot="menuLeft">
- <el-tooltip class="item" effect="dark" content="鏌ユ壘鐗堟湰瑙勫垯浣跨敤鑼冨洿" placement="top">
- <el-button size="small"
- plain
- type="primary"
+ <el-tooltip class="item" content="鏌ユ壘鐗堟湰瑙勫垯浣跨敤鑼冨洿" effect="dark" placement="top">
+ <el-button v-if="permissionList.apply"
icon="el-icon-zoom-in"
+ plain
+ size="small"
+ type="primary"
@click="applyRangeSearch">鏌ョ湅浣跨敤鑼冨洿
</el-button>
</el-tooltip>
</template>
<template slot="radio"
- slot-scope="{row}">
- <el-radio v-model="selectRow"
- :label="row.$index">
- </el-radio>
- </template>
+ slot-scope="{row}">
+ <el-radio v-model="selectRow"
+ :label="row.$index">
+ </el-radio>
+ </template>
</avue-crud>
- <versionpackage :rangeData="applyRangeData" ref="applyRange"></versionpackage>
+ <versionpackage ref="applyRange" :rangeData="applyRangeData"></versionpackage>
</basic-container>
</template>
<script>
-import { getPage,add,update,remove,getAppayRange } from '../../api/omd/revisionRule';
+import {getPage, add, update, remove, getAppayRange} from '../../api/omd/revisionRule';
+import {mapGetters} from "vuex";
+
export default {
name: "Version",
- data(){
+ data() {
return {
//鏌ョ湅浣跨敤鑼冨洿
- packageSearchBox:false,
+ packageSearchBox: false,
// 鐐瑰嚮鏁版嵁
selectRow: '',
selectRowData: {},
@@ -52,29 +56,31 @@
currentPage: 1,
total: 100
},
- data:[
- ],
- form:{},
- option:{
- headerAlign:'center',
+ data: [],
+ form: {},
+ option: {
+ height: 'auto',
+ calcHeight: 20,
+ headerAlign: 'center',
align: 'center',
border: true,
index: true,
- searchMenuSpan:5,
+ searchMenuSpan: 5,
highlightCurrentRow: true,
- stripe:true,
- viewBtn:false,
- columnBtn:false,
- column:[
+ stripe: true,
+ viewBtn: false,
+ columnBtn: false,
+ column: [
{
label: '閫夋嫨',
prop: 'radio',
width: 120,
- display:false
+ display: false
},
{
- label:'鑻辨枃鍚嶇О',
+ label: '鑻辨枃鍚嶇О',
prop: 'id',
+ editDisabled: true,
rules: [
{
required: true,
@@ -84,9 +90,9 @@
]
},
{
- label:"涓枃鍚嶇О",
- prop:"name",
- search:true,
+ label: "涓枃鍚嶇О",
+ prop: "name",
+ search: true,
required: true,
rules: [
{
@@ -96,13 +102,16 @@
}
]
},
- {
- label:"璺宠穬瀛楃",
- prop: "skipCode"
- },
+ // {
+ // label:"璺宠穬瀛楃",
+ // prop: "skipCode"
+ // },
{
label: "鍒濆鍊�",
- prop:"startCode",
+ prop: "startCode",
+ type: 'number',
+ min: 1,
+ max: 99999,
rules: [
{
required: true,
@@ -114,6 +123,9 @@
{
label: "姝ラ暱",
prop: "serialStep",
+ type: 'number',
+ min: 1,
+ max: 99999,
rules: [
{
required: true,
@@ -122,49 +134,62 @@
}
]
},
- {
- label: "鍓嶇紑",
- prop:"prefixCode"
- },
- {
- label: "鍚庣紑",
- prop: "suffixCode"
- },
+ // {
+ // label: "鍓嶇紑",
+ // prop:"prefixCode"
+ // },
+ // {
+ // label: "鍚庣紑",
+ // prop: "suffixCode"
+ // },
{
label: "鎻忚堪",
- prop:"description",
- type:"textarea"
+ prop: "description",
+ type: "textarea"
}
]
},
applyRangeData: []
}
},
- methods:{
+ 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){
+ rowClick(row) {
this.selectRow = row.$index;
this.selectRowData = row;
},
// 鏌ョ湅搴旂敤鑼冨洿
- applyRangeSearch(){
- if (!this.selectRow && this.selectRow != 0){
- console.log(this.selectRow);
- this.$message({
- type:"warning",
- message: "璇峰厛閫夋嫨灞炴��"
- })
- }
- getAppayRange(this.selectRowData.id).then(res => {
- this.applyRangeData = res.data.data;
- this.$refs.applyRange.rangeData = this.applyRangeData;
- this.$refs.applyRange.showDialog = true;
- })
+ applyRangeSearch() {
+ if (this.selectRow === '') {
+ this.$message({
+ type: "warning",
+ message: "璇峰厛閫夋嫨灞炴��"
+ })
+ return
+ }
+ getAppayRange(this.selectRowData.id).then(res => {
+ this.applyRangeData = res.data.data;
+ this.$refs.applyRange.rangeData = this.applyRangeData;
+ this.$refs.applyRange.showDialog = true;
+ })
+
+
// this.packageSearchBox=true
},
getList() {
this.loading = true;
- getPage(this.page.currentPage,this.page.pageSize,this.params).then(res => {
+ getPage(this.page.currentPage, this.page.pageSize, this.params).then(res => {
const data = res.data.data
this.loading = false;
this.page.total = data.total;
@@ -181,13 +206,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('姝ゆ搷浣滃皢姘镐箙鍒犻櫎, 鏄惁缁х画?', '鎻愮ず', {
@@ -196,22 +227,22 @@
type: 'warning'
}).then(() => {
console.log(row);
- return remove({oid : row.oid})
+ return remove({oid: row.oid})
}).then(() => {
this.$message.success('鍒犻櫎鎴愬姛')
this.getList();
})
},
searchChange(params, done) {
- var p = {"name_like" : params.name}
- getPage(this.page.currentPage,this.page.pageSize,p).then(res => {
+ 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();
+ done();
}
},
refreshChange() {
--
Gitblit v1.9.3