From c09f81131e8b7c83937206d7cf76f34d2020be75 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期三, 15 一月 2025 13:14:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/api/processTemplate/define.js | 9 +
Source/plt-web/plt-web-ui/src/views/processTemplate/customDefine/index.vue | 243 +++++++++++++++++++++++++++---------------------
Source/plt-web/plt-web-ui/src/styles/ui.scss | 13 +
3 files changed, 156 insertions(+), 109 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/api/processTemplate/define.js b/Source/plt-web/plt-web-ui/src/api/processTemplate/define.js
index 4945e45..7ef0064 100644
--- a/Source/plt-web/plt-web-ui/src/api/processTemplate/define.js
+++ b/Source/plt-web/plt-web-ui/src/api/processTemplate/define.js
@@ -50,3 +50,12 @@
params
})
}
+
+// 鍋滅敤鍚敤
+export function stopProcessTemp(params) {
+ return request({
+ url: "/api/userQueryController/stopUsers",
+ method: "post",
+ params
+ });
+}
diff --git a/Source/plt-web/plt-web-ui/src/styles/ui.scss b/Source/plt-web/plt-web-ui/src/styles/ui.scss
index 1faae30..de021e8 100644
--- a/Source/plt-web/plt-web-ui/src/styles/ui.scss
+++ b/Source/plt-web/plt-web-ui/src/styles/ui.scss
@@ -413,17 +413,22 @@
display: flex;
align-items: center;
}
+/**鍙充晶渚ф搷浣滄爮**/
+.avue-crud__right{
+ display: flex;
+ align-items: center;
+}
/**琛ㄥ唴鎿嶄綔鏍�**/
.avue-crud .avue-crud__menu{
min-height: 18px;
display: flex;
- justify-content: space-around;
+ justify-content: flex-start;
}
.avue-crud .avue-crud__menu .el-button{
}
.avue-crud .avue-crud__menu .el-button--text{
- padding: 2px 6px;
+ padding: 2px 3px;
display: flex;
}
.avue-crud .avue-crud__menu .el-button--text > span {
@@ -594,7 +599,7 @@
font-size: 12px !important;
width: 12px !important;
height: 12px !important;
- margin-right: 6px;
+ margin-right: 2px;
}
.el-table td.el-table__cell div.iconShow{
@@ -602,7 +607,7 @@
width: 14px !important;
height: 14px !important;
margin-top: -1px;
- margin-right: 3px;
+ margin-right: 1px;
}
/*
diff --git a/Source/plt-web/plt-web-ui/src/views/processTemplate/customDefine/index.vue b/Source/plt-web/plt-web-ui/src/views/processTemplate/customDefine/index.vue
index b8a8c09..c0ed872 100644
--- a/Source/plt-web/plt-web-ui/src/views/processTemplate/customDefine/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/processTemplate/customDefine/index.vue
@@ -1,16 +1,16 @@
<template>
<!--娴佺▼妯℃澘瀹氫箟-->
- <basic-container>
- <div>
+ <basic-container style="height: calc(100vh - 123px)">
+ <div style="margin-bottom: 5px;">
娴佺▼鍒嗙被锛�
<el-select v-model="tempType" :clearable="true" placeholder="璇烽�夋嫨" size="small"
style="width: 300px;margin-right: 20px;"
@change="tempTypeChange">
<el-option
v-for="item in tempTypeData"
- :key="item.oid"
+ :key="item.id"
:label="item.name"
- :value="item.oid">
+ :value="item.id">
</el-option>
</el-select>
娴佺▼妯℃澘鍚嶇О锛�
@@ -20,87 +20,90 @@
鏌ヨ
</el-button>
</div>
- <div>
- <el-main>
- <avue-crud
- ref="userCrud"
- :data="tableData"
- :option="option"
- :table-loading="tableLoading"
- @on-load="getTableList"
- @refresh-change="getTableList"
- @selection-change="selectionChange"
- @row-click="rowClickHandler"
- >
- <template slot="menuLeft" slot-scope="scope">
- <el-button v-if="permissionList.addBtn" class="button-custom-icon" plain size="small" type="primary"
- @click="addHandler">
- <icon-show :name="permissionList.addBtn.source"></icon-show>
- 澧炲姞
- </el-button>
- <el-button v-if="permissionList.downloadImportTemplateBtn" class="button-custom-icon" plain size="small"
- type="primary" @click="downloadTemplateHandler">
- <icon-show :name="permissionList.downloadImportTemplateBtn.source"></icon-show>
- 涓嬭浇瀵煎叆妯℃澘
- </el-button>
- <el-button v-if="permissionList.importBtn" class="button-custom-icon" plain size="small" type="primary"
- @click="uploadHandler">
- <icon-show :name="permissionList.importBtn.source"></icon-show>
- 瀵煎叆
- </el-button>
- <el-button v-if="permissionList.exportBtn" class="button-custom-icon" plain size="small" type="primary"
- @click="downloadHandler">
- <icon-show :name="permissionList.exportBtn.source"></icon-show>
- 瀵煎嚭
- </el-button>
- </template>
+ <el-container style="height: calc(100% - 100px)">
+ <el-aside style="width: 40%;min-width: 500px;margin-right: 5px;">
+ <avue-crud
+ ref="crud"
+ :data="tableData"
+ :option="option"
+ :table-loading="tableLoading"
+ @on-load="getTableList"
+ @refresh-change="getTableList"
+ @selection-change="selectionChange"
+ @row-click="rowClickHandler"
+ >
+ <template slot="menuLeft" slot-scope="scope">
+ <el-button v-if="permissionList.addBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="handlerAdd">
+ <icon-show :name="permissionList.addBtn.source"></icon-show>
+ 澧炲姞
+ </el-button>
+ <el-button v-if="permissionList.downloadImportTemplateBtn" class="button-custom-icon" plain size="small"
+ type="primary" @click="downloadTemplateHandler">
+ <icon-show :name="permissionList.downloadImportTemplateBtn.source"></icon-show>
+ 涓嬭浇瀵煎叆妯℃澘
+ </el-button>
+ <el-button v-if="permissionList.importBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="uploadHandler">
+ <icon-show :name="permissionList.importBtn.source"></icon-show>
+ 瀵煎叆
+ </el-button>
+ <el-button v-if="permissionList.exportBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="downloadHandler">
+ <icon-show :name="permissionList.exportBtn.source"></icon-show>
+ 瀵煎嚭
+ </el-button>
+ </template>
- <template slot="menu" slot-scope="scope">
- <el-button v-if="permissionList.editBtn" size="small" type="text"
- @click="editBtnClick(scope.row)">
- <icon-show :name="permissionList.editBtn.source"></icon-show>
- 缂栬緫
- </el-button>
- <el-button v-if="permissionList.delBtn" size="small" type="text"
- @click="rowDeleteHandler(scope.row)">
- <icon-show :name="permissionList.delBtn.source"></icon-show>
- 鍒犻櫎
- </el-button>
- <el-button size="small" type="text" @click.stop="stopUserHandler(scope.row)">
+ <template slot="menu" slot-scope="scope">
+ <el-button v-if="permissionList.editBtn" size="small" type="text"
+ @click="handleEdit(scope.row)">
+ <icon-show :name="permissionList.editBtn.source"></icon-show>
+ 缂栬緫
+ </el-button>
+ <el-button v-if="permissionList.delBtn" size="small" type="text"
+ @click="handleDel(scope.row)">
+ <icon-show :name="permissionList.delBtn.source"></icon-show>
+ 鍒犻櫎
+ </el-button>
+ <el-button size="small" type="text" @click.stop="stopHandler(scope.row)">
<span v-if="scope.row.status === 0 && permissionList.stopBtn" style="color: #fa3434;display: flex">
<icon-show :name="permissionList.stopBtn.source"></icon-show>
鍋滅敤
</span>
- <span v-if="scope.row.status === 1 && permissionList.actionBtn" style="color: #55b61d;display: flex">
+ <span v-if="scope.row.status === 1 && permissionList.actionBtn" style="color: #55b61d;display: flex">
<icon-show :name="permissionList.actionBtn.source"></icon-show>
鍚敤
</span>
- </el-button>
- </template>
+ </el-button>
+ </template>
- </avue-crud>
- <!-- 鍒涘缓缂栬緫鑷畾涔夊璇濇 -->
- <el-dialog
- v-dialogDrag
- v-loading="dialogLoading"
- :title="dialogType === 'add' ? ' 鍒涘缓' : '缂栬緫'"
- :visible.sync="dialogVisible"
- append-to-body="true"
- class="avue-dialog"
- width="1000px"
- @close="dialogClose"
- >
+ </avue-crud>
+ <!-- 鍒涘缓缂栬緫鑷畾涔夊璇濇 -->
+ <el-dialog
+ v-dialogDrag
+ v-loading="dialogLoading"
+ :title="dialogType === 'add' ? ' 鍒涘缓' : '缂栬緫'"
+ :visible.sync="dialogVisible"
+ append-to-body="true"
+ class="avue-dialog"
+ width="1000px"
+ @close="dialogClose"
+ >
<span slot="footer" class="dialog-footer">
- <el-button size="small" type="primary" @click="rowSaveHandler">纭� 瀹�</el-button>
- <el-button size="small" @click="dialogVisible = false">鍙� 娑�</el-button>
+ <el-button size="small" type="primary" @click="saveHandler">纭� 瀹�</el-button>
+ <el-button size="small" @click="dialogClose">鍙� 娑�</el-button>
</span>
- </el-dialog>
- </el-main>
-
- <el-aside width="35%">
- <div></div>
+ </el-dialog>
+ <!-- 瀵煎叆 -->
+ <upload-file ref="upload" :fileType="upFileType" :fileUrl="fileUrl" :tipList="tipList" title="瀵煎叆娴佺▼妯℃澘"
+ @updata="getTableList"></upload-file>
</el-aside>
- </div>
+
+ <el-main width="60%">
+ <div style="height: 100%;background-color: #eeeeea">璁捐鍣�</div>
+ </el-main>
+ </el-container>
</basic-container>
</template>
@@ -108,7 +111,7 @@
import {mapGetters} from "vuex";
import basicOption from "@/util/basic-option";
import {getTypeList} from "@/api/processTemplate/type";
-import {getProcessTempList,saveProcessTemp,updateProcessTemp,deleteProcessTemp,downloadTemplate,download} from "@/api/processTemplate/define";
+import {getProcessTempList,saveProcessTemp,updateProcessTemp,deleteProcessTemp,downloadTemplate,download,stopProcessTemp} from "@/api/processTemplate/define";
import func from "@/util/func";
export default {
@@ -123,6 +126,12 @@
tableData: [],
currentRow:null,
selectionList: [],
+ upFileType: ['xls', 'xlsx'],
+ fileUrl: 'api/userQueryController/importUser',
+ tipList:[],
+ dialogLoading:false,
+ dialogVisible:false,
+ dialogType:'add'
}
},
computed: {
@@ -152,10 +161,13 @@
addBtn:false,
editBtn:false,
delBtn:false,
- calcHeight: -60,
+ columnBtn:false,
+ gridBtn:false,
+ width:500,
+ calcHeight: -50,
align:'left',
headerAlign:'center',
- menuWidth:160,
+ menuWidth:190,
dialogMenuPosition: 'right',
dialogWidth:600,
column: [
@@ -164,10 +176,12 @@
prop: 'name'
},{
label: '鐗堟湰',
- prop: 'desc'
+ prop: 'desc',
+ width:50
},{
label: '鐘舵��',
- prop: 'status'
+ prop: 'status',
+ width:65
}]
}
}
@@ -192,36 +206,43 @@
searchData(){
this.getTableList();
},
- // 鏂板
- saveHandler(row, done, loading) {
- saveProcessTemp(row).then(res => {
- if (res.data.code === 200) {
- this.$message.success(res.data.obj);
- this.getTableList();
- done();
- }
- }).catch(err => {
- loading()
- });
- },
- handleEdit(row,index){
- this.$refs.crud.rowEdit(row, index);
+ handlerAdd(){
+ this.form={};
+ this.dialogVisible=true;
+ this.dialogType='add'
},
-
- // 缂栬緫
- updateHandler(row, index, done, loading) {
- updateProcessTemp(row).then(res => {
- if (res.data.code === 200) {
- this.$message.success(res.data.obj);
- this.getTableList();
- done()
- }
- }).catch(err => {
- loading()
- });
+ handleEdit(row,index) {
+ this.form={
+ ...row
+ }
+ this.dialogVisible = true;
+ this.dialogType = 'edit'
},
+ // 缂栬緫淇濆瓨
+ saveHandler() {
+ if(this.dialogType=='add'){
+ saveProcessTemp(this.form).then(res => {
+ if (res.data.code === 200) {
+ this.$message.success(res.data.obj);
+ this.getTableList();
+ }
+ });
+ }else{
+ updateProcessTemp(this.form).then(res => {
+ if (res.data.code === 200) {
+ this.$message.success(res.data.obj);
+ this.getTableList();
+ }
+ })
+ }
+ },
+ dialogClose(){
+ this.form={};
+ this.dialogLoading=false;
+ this.dialogVisible=false;
+ },
// 鍒犻櫎
handleDel(row,index) {
let params = {
@@ -293,7 +314,19 @@
//瀵煎叆
uploadHandler() {
this.$refs.upload.visible = true;
- }
+ },
+ // 鍋滅敤鍚敤
+ stopHandler(row) {
+ let params = {};
+ params = {
+ ids: row.oid,
+ flag: row.status === 0 ? true : false
+ }
+ stopProcessTemp(params).then(res => {
+ this.$message.success(res.data.obj);
+ this.getTableList();
+ });
+ },
}
}
</script>
--
Gitblit v1.9.3