From 6ceaecf1a3eb4b8801b2200cf692cb093263a493 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 08 八月 2023 15:14:47 +0800
Subject: [PATCH] 前端代码打包
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 78 ++++++++++++++++++++++++---------------
1 files changed, 48 insertions(+), 30 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 0b8e3cd..f7c83ad 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -16,7 +16,7 @@
}}
</el-button>
<span v-if="tableHeadFindData.length > 0">
- <el-select v-model="keyWordFind" slot="prepend" placeholder="璇烽�夋嫨" size="small">
+ <el-select slot="prepend" v-model="keyWordFind" placeholder="璇烽�夋嫨" size="small">
<el-option v-for="item in tableHeadFindData" :label="item.label" :value="item.prop"></el-option>
</el-select>
<el-input v-model="WupinFindValue" placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�"
@@ -66,8 +66,8 @@
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
:disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid"
:title="'宸插彂甯冩暟鎹洿鏀�'"
- :type="edit"
- :visible.sync="DataVisible"></FormTemplateDialog>
+ :visible.sync="DataVisible"
+ type="edit" @submit="updataSumbit"></FormTemplateDialog>
<!-- 鍙戝竷-->
<set-personnel :parameter="this.parameter" :title="title" :visible.sync="visibleFlow"
@onLoad="onLoad"></set-personnel>
@@ -116,7 +116,7 @@
</basic-container>
</template>
<script>
-import {MasterTable, TableData, FindData, addSaveCode, editSaveCode, deleteCode} from "@/api/GetItem";
+import {MasterTable, TableData, FindData, addSaveCode, editSaveCode, deleteCode, upSaveCode} from "@/api/GetItem";
import {processTS, changeStatus} from "@/api/template/setPersonnel"
import {listCodeAttributeByClassId} from "@/api/integration/integration.js";
import integrationTransfer from "@/views/integration/integrationTransfer";
@@ -125,6 +125,7 @@
import BatchImport from '@/components/BatchImport'
import {validatenull} from "@/util/validate";
import fileInHtml from "@/components/file/inHtml.vue";
+import {getUserInfo} from "@/api/system/user";
export default {
components: {
@@ -174,8 +175,8 @@
tableHeadBtnData: {
type: Array,
},
- Treedata:{
- type:Array
+ Treedata: {
+ type: Array
}
},
data() {
@@ -183,7 +184,7 @@
// 鐘舵�佹悳绱�
statusSelect: "all",
// 鍏抽敭瀛楁煡璇�
- keyWordFind:"",
+ keyWordFind: "",
searchResults: [],
//棣栭〉鍙充晶鎼滅储
WupinFindValue: "",
@@ -192,7 +193,7 @@
//鍙戝竷
parameter: {
ids: [],
- btmtype:'',
+ btmtype: '',
code: "",
type: '',
// this.visibleDeactivate ?'ENABLE':this.visibleEnable ? 'DISABLE' :this.visibleRecovery ? 'ROLLBACK' :'PUBLIC'
@@ -269,8 +270,12 @@
},
computed: {},
created() {
- const index = this.$route.query.id.indexOf('@name=') + '@name='.length;
- this.result = this.$route.query.id.substring(index);
+ // const index = this.$route.query.id.indexOf('@name=') + '@name='.length;
+ // this.result = this.$route.query.id.substring(index);
+ getUserInfo().then(res => {
+ console.log(res.data.data)
+ this.result = res.data.data.realName
+ })
},
mounted() {
},
@@ -295,8 +300,6 @@
},
tableDataArray: {
handler(newval, oldval) {
- this.keyWordFind='';
- this.WupinFindValue=''
this.tableData = newval;
this.searchResults = newval
this.doLayout()
@@ -318,8 +321,13 @@
}
}
}
+
+ if (_index == 0) {
+ this.keyWordFind = record.field
+ }
})
this.tableHeadFindDatas = newval;
+ this.WupinFindValue = ''
},
},
total: {
@@ -426,7 +434,7 @@
},
// 鍙戝竷
setHandler() {
- console.log('Treedata',this.Treedata)
+ console.log('Treedata', this.Treedata)
if (this.selectRow.length > 0) {
let hasEditing = this.selectRow.some(item => item.lcstatus !== 'Editing');
let showMessage = true;
@@ -440,11 +448,10 @@
} else if (showMessage) {
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.Treedata[0].name + '-' + this.selectRow[0].name + ']';
+ this.parameter.processName = this.result + '-鐢宠[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
this.parameter.type = 'PUBLIC';
this.parameter.code = this.templateOid;
- this.parameter.btmtype=this.selectRow[0].btmname || this.selectRow[0].btmtype;
+ this.parameter.btmtype = this.selectRow[0].btmname || this.selectRow[0].btmtype;
this.title = '娴佺▼瀹℃壒'
this.visibleFlow = true;
} else {
@@ -491,11 +498,10 @@
} else if (this.selectRow.length >= 1 && hasEditing && showMessage) {
processTS({templateId: this.templateOid, buttonTypeKey: 'DISABLE'}).then(res => {
if (res.data.records != [] && res.data.data.records.length != 0) {
- this.userName = localStorage.getItem("username");
- this.parameter.template = this.userName + '-鍋滅敤[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
+ this.parameter.processName = this.result + '-鍋滅敤[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
this.parameter.type = 'DISABLE';
this.parameter.code = this.templateOid
- this.parameter.btmtype=this.selectRow[0].btmname || this.selectRow[0].btmtype;
+ this.parameter.btmtype = this.selectRow[0].btmname || this.selectRow[0].btmtype;
this.title = '鍋滅敤锛堝喕缁擄級缂栫爜鏁版嵁'
this.visibleDeactivate = true;
} else {
@@ -522,7 +528,7 @@
}
}
});
- } else if(this.selectRow.length == 1 && !hasEditing && showMessage ) {
+ } else if (this.selectRow.length == 1 && !hasEditing && showMessage) {
this.$message.warning('鎮ㄩ�夋嫨鐨勬暟鎹负銆愬彂甯冪姸鎬併�戞墠鍙互鍙戣捣娴佺▼')
}
});
@@ -543,11 +549,10 @@
processTS({templateId: this.templateOid, buttonTypeKey: 'ENABLE'}).then(res => {
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.Treedata[0].name + '-' + this.selectRow[0].name + ']';
+ this.parameter.processName = this.result + '-鍚敤[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
this.parameter.type = 'Released';
this.parameter.code = this.templateOid
- this.parameter.btmtype=this.selectRow[0].btmname || this.selectRow[0].btmtype;
+ this.parameter.btmtype = this.selectRow[0].btmname || this.selectRow[0].btmtype;
this.title = '鍚敤缂栫爜鏁版嵁'
this.visibleDeactivate = true;
} else {
@@ -601,11 +606,10 @@
//disabledCount 鍜� releasedCount 涓换鎰忎竴涓瓑浜� this.selectRow 鏁扮粍鐨勯暱搴﹀垯琛ㄧず鍏ㄩ儴鏄悓涓�绉嶇姸鎬侊紝杩斿洖 true 濡傛灉disabledCount 鍜� releasedCount 閮藉ぇ浜�0锛屽垯琛ㄧず鏃㈡湁Disabled涔熸湁Released杩斿洖 true
processTS({templateId: this.templateOid, buttonTypeKey: 'ROLLBACK'}).then(res => {
if (res.data.records != [] && res.data.data.records.length != 0) {
- this.userName = localStorage.getItem("username");
- this.parameter.template = this.userName + '-鍥炴敹[' + this.selectRow[0].btmname + '-' + this.selectRow[0].name + ']';
+ this.parameter.processName = this.result + '-鍥炴敹[' + this.selectRow[0].btmname + '-' + this.selectRow[0].name + ']';
this.parameter.type = 'TakeBack';
this.parameter.code = this.templateOid
- this.parameter.btmtype=this.selectRow[0].btmname || this.selectRow[0].btmtype;
+ this.parameter.btmtype = this.selectRow[0].btmname || this.selectRow[0].btmtype;
this.title = '鍥炴敹缂栫爜鏁版嵁'
this.visibleDeactivate = true;
} else {
@@ -848,6 +852,7 @@
this.$message.warning("鍙湁鐘舵�佷负宸插彂甯冪殑鏁版嵁鎵嶈兘杩涜鏁版嵁鏇存敼");
} else {
this.DataVisible = true;
+ this.rowOid = this.selectRow[0]['oid']
}
},
//澧炲姞淇濆瓨
@@ -859,9 +864,23 @@
})
})
},
+ //淇敼鍥炶皟
EditSumbit(val) {
this.editvisible = false;
editSaveCode(val).then(res => {
+ this.$nextTick(() => {
+ this.onLoad()
+ })
+ })
+ },
+ //鏁版嵁鏇存敼鍥炶皟
+ updataSumbit(val) {
+ this.DataVisible = false;
+ val.copyFromVersion = this.rowOid;
+ val.oid = '';
+ console.log(val)
+ upSaveCode(val).then(res => {
+ console.log(res)
this.$nextTick(() => {
this.onLoad()
})
@@ -874,18 +893,17 @@
},
//杈撳叆鍥炶溅鎼滅储
tableFindInp() {
- if (this.WupinFindValue.trim() === '') {
+ /*if (this.WupinFindValue.trim() === '') {
this.$message.warning('杈撳叆鍊间笉鑳戒负绌�')
return;
- }
+ }*/
TableData({
templateOid: this.templateOid,
codeClassifyOid: this.codeClassifyOid,
page: this.page.currentPage,
limit: this.page.pageSize,
- [ 'conditionMap[' + this.keyWordFind + ']']: '*' + this.WupinFindValue + '*'
+ ['conditionMap[' + this.keyWordFind + ']']: '*' + this.WupinFindValue + '*'
}).then(res => {
- console.log(res)
this.tableData = res.data.data
})
}
--
Gitblit v1.9.3