From 217bffa9704f2938391977605dcaae1a8baae86f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 10 九月 2025 16:00:41 +0800
Subject: [PATCH] 修改首页搜索错误
---
src/views/flow/donelist.vue | 137 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 110 insertions(+), 27 deletions(-)
diff --git a/src/views/flow/donelist.vue b/src/views/flow/donelist.vue
index 5453e24..2cd3bb5 100644
--- a/src/views/flow/donelist.vue
+++ b/src/views/flow/donelist.vue
@@ -11,7 +11,10 @@
@size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" >
<template #menu="scope">
<el-button type="primary" text size="default" @click.stop="handleView(scope.row, scope.index)">鏌ョ湅</el-button>
+ <el-button type="primary" :disabled="scope.row.processIsFinished==='true' || (scope.row.currentTaskKeys.toLowerCase().indexOf('program')==-1 && scope.row.currentTaskKeys.toLowerCase().indexOf('useable')==-1)" v-if="permission.takeback_button" text size="default" @click.stop="handleTakeBack(scope.row, scope.index)">鍙栧洖</el-button>
+ <el-button type="primary" :disabled="scope.row.processIsFinished==='true' || scope.row.currentTaskKeys.toLowerCase().indexOf('program')>-1" v-if="permission.withdraw_button" text size="default" @click.stop="handleWithdraw(scope.row, scope.index)">鎾ゅ洖</el-button>
</template>
+
</avue-crud>
<el-dialog title="鏌ョ湅璇︽儏" v-model="dialogVisible" width="60%">
<avue-form v-model="viewRow" :option="viewFormOption" readonly class="viewRowForm"></avue-form>
@@ -26,16 +29,18 @@
</basic-container>
</template>
<script>
-import { getDoneList} from '@/api/flow/todolist';
+import { getDoneList,todoChangeNotify} from '@/api/flow/todolist';
import { mapGetters } from 'vuex';
export default {
data() {
return {
tableData: [],
+ query:{},
viewFormOption: {
emptyBtn: false,
submitBtn: false,
menuBtn: false,
+
labelWidth: 100,
span: 8,
column: [
@@ -68,7 +73,7 @@
}
},
{
- label: '宸ヨ壓鐗堟',
+ label: '鎵规鍙�',
prop: 'variables.craftEdition',
render: ({ row }) => {
return h('p',{'class': 'margin0'}, row?.variables?.craftEdition || '');
@@ -111,9 +116,9 @@
},
{
label: '杩囩▼鍗″彿',
- prop: 'empty',
+ prop: '',
render: ({ row }) => {
- return h('p',{'class': 'margin0'}, row?.variables?.empty || '');
+ return h('p',{'class': 'margin0'}, row?.variables?.processCard || '');
}
},
{
@@ -185,6 +190,7 @@
columnBtn: false,
tip: false,
searchShow: true,
+ searchEnter:true,
searchMenuSpan: 6,
dialogWidth: '60%',
border: true,
@@ -192,7 +198,7 @@
selection: false,
// viewBtn: true,
menu: true,
- menuWidth: 100,
+ menuWidth: 120,
column: [
{
label: '鍏抽敭瀛�',
@@ -201,21 +207,31 @@
search: true,
searchType: 'input',
hide: true,
+ },
+ {
+ label: '鐘舵��',
+ prop: 'status',
+ //cleerable:true,
+ search: true,
+ type: 'select',
dicData: [
{
- label: '娑夊瘑缃戠▼搴�',
- value: 1,
+ label:'杩涜涓�',
+ value:'1'
},
{
- label: '宸ユ帶缃戣溅搴婄▼搴�',
- value: 2,
+ label:'宸茬粨鏉�',
+ value:'2'
},
],
+ labelKey: 'label',
+
+ span: "8"
},
{
label: '鏍囬',
prop: '',
- width: 100,
+ width: 200,
render: ({ row }) => {
return h('p',
{
@@ -259,7 +275,7 @@
},
{
label: '鍒涘缓鏃堕棿',
- width: 200,
+ width: 100,
prop: 'processCreateTime',
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
@@ -271,7 +287,7 @@
},
{
label: '寮�濮嬫椂闂�',
- width: 200,
+ width: 100,
prop: 'createTime',
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
@@ -283,11 +299,12 @@
},
{
label: '缁撴潫鏃堕棿',
- width: 200,
+ width: 100,
prop: 'endTime',
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ sortable:true,
search: false,
searchRange: true,
searchSpan: 8,
@@ -295,7 +312,7 @@
},
{
label: '浠诲姟鍚嶇О',
- width: 200,
+ width: 100,
prop: 'taskName',
},
{
@@ -328,6 +345,70 @@
});
this.dialogVisible = true;
},
+ handleTakeBack(row){
+ //缁勯暱鍙栧洖
+ this.$confirm('纭瑕佸彇鍥炲悧锛�', '', {
+ confirmButtonText: this.$t('submitText'),
+ cancelButtonText: this.$t('cancelText'),
+ type: 'warning',
+ }).then(() => {
+ axios({
+ url: '/blade-mdm/flow/mgr/takeback',
+ method: 'get',
+ params: {processInstanceId: row.processInstanceId}
+ }).then(res => {
+ if(res.data.code !== 200) {
+ this.$message.error(res.data.msg);
+ return;
+ }
+ this.$message.success('鎿嶄綔鎴愬姛');
+
+ todoChangeNotify();
+
+ this.refreshChange();
+ }).catch(err => {
+ console.error(err);
+ //done()
+ });
+
+ }).catch(() => {
+ console.log('>>>>>>')
+ // this.$message.info('宸插彇娑堟搷浣�');
+ //done();
+ });
+ },
+ handleWithdraw(row) {
+ //console.log(row,row.processInstanceId)
+ this.$confirm('纭瑕佹挙鍥炲悧锛�', '', {
+ confirmButtonText: this.$t('submitText'),
+ cancelButtonText: this.$t('cancelText'),
+ type: 'warning',
+ }).then(() => {
+ axios({
+ url: '/blade-mdm/flow/mgr/withdraw',
+ method: 'get',
+ params: {processInstanceId: row.processInstanceId}
+ }).then(res => {
+ if(res.data.code !== 200) {
+ this.$message.error(res.data.msg);
+ return;
+ }
+ this.$message.success('鎿嶄綔鎴愬姛');
+
+ todoChangeNotify();
+
+ this.refreshChange();
+ }).catch(err => {
+ console.error(err);
+ //done()
+ });
+
+ }).catch(() => {
+ console.log('>>>>>>')
+ // this.$message.info('宸插彇娑堟搷浣�');
+ //done();
+ });
+ },
currentChange(currentPage) {
this.page.currentPage = currentPage;
},
@@ -338,34 +419,29 @@
console.log('searchChange', params);
params.createTimeBegin = params?.processCreateTime?.[0] || '';
params.createTimeEnd = params?.processCreateTime?.[1] || '';
- console.log(params);
- // data = {
- // createTimeBegin: dayjs(params.createTimeBegin).isValid() ? dayjs(params.createTimeBegin).format('YYYY-MM-DD') : '',
- // createTimeEnd: dayjs(params.createTimeEnd).isValid() ? dayjs(params.createTimeEnd).format('YYYY-MM-DD') : '',
- // keyword: params.keyword || ''
- // }
+
data = {
createTimeBegin: params.createTimeBegin,
createTimeEnd: params.createTimeEnd,
- keyword: params.keyword || ''
+ keyword: params.keyword || '',
+ status: params.status || 0
}
this.query = data
this.onLoad(this.page, data);
done();
},
searchReset () {
- this.loading = true;
this.form = {};
- this.getList();
+ this.getDoneList();
},
sizeChange() {
- this.loading = true;
- this.getList();
+
+ this.getDoneList();
},
refreshChange() {
this.onLoad(this.page, this.query);
},
- onLoad(page, params = {}) {
+ onLoad(page, params = {},done) {
const query = {
...this.query,
// category: params.category ? flowCategory(params.category) : null,
@@ -376,15 +452,22 @@
console.error('鏃ユ湡鏍煎紡鍖栭敊璇�', error);
}
- this.loading = true;
+ //this.loading = true;
getDoneList(page.currentPage, page.pageSize, Object.assign(query, params)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ if(done){
+ done();
+ }
});
},
+ },
+ computed: {
+
+ ...mapGetters(['userInfo', 'permission']),
}
}
</script>
--
Gitblit v1.9.3