From 829b451481bc3737ad3d56679860d9601fa25490 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 02 八月 2023 20:02:31 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 45 +++++++++++++++++++++++++++------------------
1 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 61fbfc8..430e090 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -18,6 +18,15 @@
<el-input v-model="WupinFindValue" placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�"
size="small" style="width: 180px; margin-left: 5px; margin-top: 10px"
@keyup.enter.native="tableFindInp" v-if="tableData.length != 0"></el-input>
+ <span style="margin-left: 10px" v-if="tableData.length != 0">
+ <p style="font-size: 13px;display: inline-block;"> 鐘舵�侊細</p>
+ <el-select v-model="statusSelect" slot="prepend" placeholder="璇烽�夋嫨" size="small" @change="cellSelectHandler">
+ <el-option label="鍏ㄩ儴" value="all"></el-option>
+ <el-option label="宸插彂甯�" value="Released"></el-option>
+ <el-option label="缂栬緫涓�" value="Editing"></el-option>
+ <el-option label="宸插仠鐢�" value="Disabled"></el-option>
+ <el-option label="瀹℃牳涓�" value="Auditing"></el-option>
+ </el-select></span>
</div>
<el-table ref="dataTable" v-loading="isLoading" :data="tableData"
:height="tableHeight"
@@ -156,6 +165,7 @@
},
data() {
return {
+ statusSelect:"",
searchResults: [],
//棣栭〉鍙充晶鎼滅储
WupinFindValue: "",
@@ -234,11 +244,14 @@
hasDownload: true,
hasUpload: true,
height: 100
- }
+ },
+ result:''
};
},
computed: {},
created() {
+ const index = this.$route.query.id.indexOf('@');
+ this.result = this.$route.query.id.substring(0, index);
},
mounted() {
},
@@ -263,6 +276,7 @@
},
tableDataArray: {
handler(newval, oldval) {
+ this.statusSelect=''
this.tableData = newval;
this.searchResults = newval
this.doLayout()
@@ -311,6 +325,10 @@
}
},
methods: {
+ //鐘舵�佹悳绱�
+ cellSelectHandler(row){
+ console.log(row)
+ },
//灞曞紑闄勪欢
handleCollapse(activeNames) {
if (activeNames.length > 0) {
@@ -386,7 +404,7 @@
processTS({templateId: this.templateOid, buttonTypeKey: 'PUBLIC'}).then(res => {
if (res.data.data.records && res.data.data.records.length!=0) {
this.userName = localStorage.getItem("username");
- this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]";
+ this.parameter.template = this.userName + '-鍙戝竷['+this.result+'-' + this.selectRow[0].name + ']';
this.parameter.type = 'PUBLIC';
this.parameter.code=this.templateOid
this.title = '娴佺▼瀹℃壒'
@@ -397,11 +415,8 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- const index = this.$route.query.id.indexOf('@');
- const result = this.$route.query.id.substring(0, index);
- console.log(this.$route.query)
const oid = this.selectRow.map(obj => obj.oid).join(",");
- changeStatus({ oid: oid, btmname: result, lcStatus: 'Released' }).then(res => {
+ changeStatus({ oid: oid, btmname: this.result, lcStatus: 'Released' }).then(res => {
if(res.data.code == 200 ){
this.$message.success('鍙戝竷鎴愬姛')
this.onLoad()
@@ -439,7 +454,7 @@
processTS({ templateId: this.templateOid, buttonTypeKey: 'PUBLIC' }).then(res => {
if (res.data.records != [] && res.data.data.records.length!=0) {
this.userName = localStorage.getItem("username");
- this.parameter.template = this.userName + "鍋滅敤" + "[鐗╁搧]";
+ this.parameter.template = this.userName + '-鍋滅敤['+this.result+'-' + this.selectRow[0].name + ']';
this.parameter.type = 'DISABLE';
this.parameter.code=this.templateOid
this.title = '鍋滅敤锛堝喕缁擄級缂栫爜鏁版嵁'
@@ -452,10 +467,8 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- const index = this.$route.query.id.indexOf('@');
- const result = this.$route.query.id.substring(0, index);
const oid = this.selectRow.map(obj => obj.oid).join(",");
- changeStatus({ oid: oid, btmname: result, lcStatus: 'Disabled' }).then(res => {
+ changeStatus({ oid: oid, btmname: this.result, lcStatus: 'Disabled' }).then(res => {
if(res.data.code == 200 ){
this.$message.success('鍋滅敤鎴愬姛')
this.onLoad()
@@ -492,7 +505,7 @@
if (res.data.data.records && res.data.data.records.length!=0) {
this.parameter=res.data.data.records[0]
this.userName = localStorage.getItem("username");
- this.parameter.template = this.userName + "鍚敤" + "[鐗╁搧]";
+ this.parameter.template = this.userName + '-鍚敤['+this.result+'-' + this.selectRow[0].name + ']';
this.parameter.type = 'Released';
this.parameter.code=this.templateOid
this.title = '鍚敤缂栫爜鏁版嵁'
@@ -505,10 +518,8 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- const index = this.$route.query.id.indexOf('@');
- const result = this.$route.query.id.substring(0, index);
const oid = this.selectRow.map(obj => obj.oid).join(",");
- changeStatus({ oid: oid, btmname: result, lcStatus: 'Released' }).then(res => {
+ changeStatus({ oid: oid, btmname: this.result, lcStatus: 'Released' }).then(res => {
if(res.data.code == 200 ){
this.$message.success('鍚敤鎴愬姛')
this.onLoad()
@@ -551,7 +562,7 @@
processTS({ templateId: this.templateOid, buttonTypeKey: 'PUBLIC' }).then(res => {
if (res.data.records != [] && res.data.data.records.length!=0) {
this.userName = localStorage.getItem("username");
- this.parameter.template = this.userName + "鍥炴敹" + "[鐗╁搧]";
+ this.parameter.template = this.userName + '-鍥炴敹['+this.result+'-' + this.selectRow[0].name + ']';
this.parameter.type = 'TakeBack';
this.parameter.code=this.templateOid
this.title = '鍥炴敹缂栫爜鏁版嵁'
@@ -564,10 +575,8 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- const index = this.$route.query.id.indexOf('@');
- const result = this.$route.query.id.substring(0, index);
const oid = this.selectRow.map(obj => obj.oid).join(",");
- changeStatus({ oid: oid, btmname: result, lcStatus: 'TakeBack' }).then(res => {
+ changeStatus({ oid: oid, btmname: this.result, lcStatus: 'TakeBack' }).then(res => {
if(res.data.code == 200 ){
this.$message.success('鍥炴敹鎴愬姛')
this.onLoad()
--
Gitblit v1.9.3