From 85adc3faa522b5cab8dbdfe9a052700c24909b2a Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期四, 19 六月 2025 17:28:11 +0800
Subject: [PATCH] -
---
Web/src/views/ADPenalty/aDPenalty/index.vue | 83 +++++++++++++++++++++++------------------
Web/src/views/ADPenalty/aDPenalty/component/editDialog.vue | 29 ++++++++------
2 files changed, 64 insertions(+), 48 deletions(-)
diff --git a/Web/src/views/ADPenalty/aDPenalty/component/editDialog.vue b/Web/src/views/ADPenalty/aDPenalty/component/editDialog.vue
index 65ffb27..a2ba6f6 100644
--- a/Web/src/views/ADPenalty/aDPenalty/component/editDialog.vue
+++ b/Web/src/views/ADPenalty/aDPenalty/component/editDialog.vue
@@ -80,23 +80,28 @@
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" >
- <el-form-item label="褰撲簨浜轰俊鎭�" prop="parties">
- <el-input v-model="state.ruleForm.parties" placeholder="璇疯緭鍏ュ綋浜嬩汉淇℃伅" maxlength="255" show-word-limit clearable />
+ <el-form-item label="褰撲簨浜�" prop="parties">
+ <el-input v-model="state.ruleForm.parties" placeholder="璇疯緭鍏ュ綋浜嬩汉" maxlength="255" show-word-limit clearable />
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" >
+ <el-form-item label="妗堢敱" prop="caseReason">
+ <el-input v-model="state.ruleForm.caseReason" placeholder="璇疯緭鍏ユ鐢�" type="textarea" show-word-limit clearable />
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" >
+ <el-form-item label="澶勭悊鍐冲畾" prop="disposalDecision">
+ <el-input v-model="state.ruleForm.disposalDecision" type="textarea" placeholder="璇疯緭鍏ュ鐞嗗喅瀹�" show-word-limit clearable />
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" >
- <el-form-item label="妗堢敱鎻忚堪" prop="caseReason">
- <el-input v-model="state.ruleForm.caseReason" placeholder="璇疯緭鍏ユ鐢辨弿杩�" show-word-limit clearable />
+ <el-form-item label="閲囪喘鐩戠潱閮ㄩ棬" prop="supervisionDepartment">
+ <el-input v-model="state.ruleForm.supervisionDepartment" placeholder="璇疯緭鍏ラ噰璐洃鐫ｉ儴闂�" maxlength="255" show-word-limit clearable />
</el-form-item>
</el-col>
- <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" >
- <el-form-item label="澶勭悊鍐冲畾鍐呭" prop="disposalDecision">
- <el-input v-model="state.ruleForm.disposalDecision" placeholder="璇疯緭鍏ュ鐞嗗喅瀹氬唴瀹�" show-word-limit clearable />
- </el-form-item>
- </el-col>
- <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" >
- <el-form-item label="閲囪喘鐩戠潱閮ㄩ棬鍚嶇О" prop="supervisionDepartment">
- <el-input v-model="state.ruleForm.supervisionDepartment" placeholder="璇疯緭鍏ラ噰璐洃鐫ｉ儴闂ㄥ悕绉�" maxlength="255" show-word-limit clearable />
+ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+ <el-form-item label="绾夸笂鍦板潃" prop="url">
+ <el-input v-model="state.ruleForm.url" placeholder="璇疯緭鍏ョ嚎涓婂湴鍧�" maxlength="255" show-word-limit clearable />
</el-form-item>
</el-col>
</el-row>
diff --git a/Web/src/views/ADPenalty/aDPenalty/index.vue b/Web/src/views/ADPenalty/aDPenalty/index.vue
index 756cdaa..e414120 100644
--- a/Web/src/views/ADPenalty/aDPenalty/index.vue
+++ b/Web/src/views/ADPenalty/aDPenalty/index.vue
@@ -7,7 +7,9 @@
import editDialog from '/@/views/ADPenalty/aDPenalty/component/editDialog.vue'
import printDialog from '/@/views/system/print/component/hiprint/preview.vue'
import ModifyRecord from '/@/components/table/modifyRecord.vue';
+import commonFunction from "/@/utils/commonFunction";
+const { dateFormatYMD } = commonFunction();
const aDPenaltyApi = useADPenaltyApi();
const printDialogRef = ref();
const editDialogRef = ref();
@@ -19,14 +21,14 @@
dropdownData: {} as any,
selectData: [] as any[],
tableQueryParams: {} as any,
- tableParams: {
- page: 1,
- pageSize: 20,
- total: 0,
- field: 'createTime', // 榛樿鐨勬帓搴忓瓧娈�
- order: 'descending', // 鎺掑簭鏂瑰悜
- descStr: 'descending', // 闄嶅簭鎺掑簭鐨勫叧閿瓧绗�
- },
+ tableParams: {
+ page: 1,
+ pageSize: 20,
+ total: 0,
+ field: 'decisionDate', // 榛樿鐨勬帓搴忓瓧娈�
+ order: 'descending', // 鎺掑簭鏂瑰悜
+ descStr: 'descending', // 闄嶅簭鎺掑簭鐨勫叧閿瓧绗�
+ },
tableData: [],
});
@@ -85,37 +87,38 @@
<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
<el-form :model="state.tableQueryParams" ref="queryForm" labelWidth="90">
<el-row>
- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
+ <!-- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
<el-form-item label="鍏抽敭瀛�">
<el-input v-model="state.tableQueryParams.keyword" clearable placeholder="璇疯緭鍏ユā绯婃煡璇㈠叧閿瓧"/>
</el-form-item>
- </el-col>
- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="state.showAdvanceQueryUI">
+ </el-col> -->
+ <el-col :xs="24" :sm="12" :md="12" :lg="4" :xl="4" class="mb10">
<el-form-item label="鍐冲畾鏃ユ湡">
<el-date-picker type="daterange" v-model="state.tableQueryParams.decisionDateRange" value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" />
</el-form-item>
</el-col>
- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="state.showAdvanceQueryUI">
- <el-form-item label="褰撲簨浜轰俊鎭�">
- <el-input v-model="state.tableQueryParams.parties" clearable placeholder="璇疯緭鍏ュ綋浜嬩汉淇℃伅"/>
+ <el-col :xs="24" :sm="12" :md="12" :lg="4" :xl="4" class="mb10" v-if="state.showAdvanceQueryUI">
+ <el-form-item label="褰撲簨浜�">
+ <el-input v-model="state.tableQueryParams.parties" clearable placeholder="璇疯緭鍏ュ綋浜嬩汉"/>
</el-form-item>
</el-col>
- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="state.showAdvanceQueryUI">
- <el-form-item label="妗堢敱鎻忚堪">
- <el-input v-model="state.tableQueryParams.caseReason" clearable placeholder="璇疯緭鍏ユ鐢辨弿杩�"/>
+ <el-col :xs="24" :sm="12" :md="12" :lg="4" :xl="4" class="mb10" v-if="state.showAdvanceQueryUI">
+ <el-form-item label="閲囪喘鐩戠潱閮ㄩ棬">
+ <el-input v-model="state.tableQueryParams.supervisionDepartment" clearable placeholder="璇疯緭鍏ラ噰璐洃鐫ｉ儴闂�"/>
</el-form-item>
</el-col>
- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="state.showAdvanceQueryUI">
- <el-form-item label="澶勭悊鍐冲畾鍐呭">
- <el-input v-model="state.tableQueryParams.disposalDecision" clearable placeholder="璇疯緭鍏ュ鐞嗗喅瀹氬唴瀹�"/>
+ <el-col :xs="24" :sm="12" :md="12" :lg="4" :xl="4" class="mb10" v-if="state.showAdvanceQueryUI">
+ <el-form-item label="妗堢敱">
+ <el-input v-model="state.tableQueryParams.caseReason" clearable placeholder="璇疯緭鍏ユ鐢�"/>
</el-form-item>
</el-col>
- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="state.showAdvanceQueryUI">
- <el-form-item label="閲囪喘鐩戠潱閮ㄩ棬鍚嶇О">
- <el-input v-model="state.tableQueryParams.supervisionDepartment" clearable placeholder="璇疯緭鍏ラ噰璐洃鐫ｉ儴闂ㄥ悕绉�"/>
+ <el-col :xs="24" :sm="12" :md="12" :lg="4" :xl="4" class="mb10" v-if="state.showAdvanceQueryUI">
+ <el-form-item label="澶勭悊鍐冲畾">
+ <el-input v-model="state.tableQueryParams.disposalDecision" clearable placeholder="璇疯緭鍏ュ鐞嗗喅瀹�"/>
</el-form-item>
</el-col>
- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
+
+ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb10">
<el-form-item >
<el-button-group style="display: flex; align-items: center;">
<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'aDPenalty:page'" v-reclick="1000"> 鏌ヨ </el-button>
@@ -131,24 +134,32 @@
</el-form>
</el-card>
<el-card class="full-table" shadow="hover" style="margin-top: 5px">
- <el-table :data="state.tableData" @selection-change="(val: any[]) => { state.selectData = val; }" style="width: 100%" v-loading="state.tableLoading" tooltip-effect="light" row-key="id" @sort-change="sortChange" border>
+ <el-table :data="state.tableData" @selection-change="(val: any[]) => { state.selectData = val; }" style="width: 100%" v-loading="state.tableLoading" :default-sort="{ prop: 'decisionDate', order: 'descending' }" tooltip-effect="light" row-key="id" @sort-change="sortChange" border>
<el-table-column type="selection" width="40" align="center" v-if="auth('aDPenalty:batchDelete') || auth('aDPenalty:export')" />
<el-table-column type="index" label="搴忓彿" width="55" align="center"/>
- <el-table-column prop='decisionDate' label='鍐冲畾鏃ユ湡' show-overflow-tooltip />
- <el-table-column prop='parties' label='褰撲簨浜轰俊鎭�' show-overflow-tooltip />
- <el-table-column prop='caseReason' label='妗堢敱鎻忚堪' show-overflow-tooltip />
- <el-table-column prop='disposalDecision' label='澶勭悊鍐冲畾鍐呭' show-overflow-tooltip />
- <el-table-column prop='supervisionDepartment' label='閲囪喘鐩戠潱閮ㄩ棬鍚嶇О' show-overflow-tooltip />
- <el-table-column prop='url' label='绾夸笂鍦板潃' show-overflow-tooltip />
- <el-table-column label="淇敼璁板綍" width="100" align="center" show-overflow-tooltip>
+ <el-table-column prop='decisionDate' label='鍐冲畾鏃ユ湡' width="90" show-overflow-tooltip sortable >
+ <template #default="{ row }">
+ <span>{{dateFormatYMD(null,null,row.decisionDate)}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop='parties' label='褰撲簨浜�' show-overflow-tooltip />
+ <el-table-column prop='caseReason' label='妗堢敱' show-overflow-tooltip />
+ <el-table-column prop='disposalDecision' label='澶勭悊鍐冲畾' show-overflow-tooltip />
+ <el-table-column prop='supervisionDepartment' width="130" label='閲囪喘鐩戠潱閮ㄩ棬' show-overflow-tooltip />
+ <el-table-column prop='url' label='绾夸笂鍦板潃' show-overflow-tooltip >
+ <template #default="{ row }">
+ <el-link underline :href='row.url' target='_blank'>{{row.url}}</el-link>
+ </template>
+ </el-table-column>
+ <!-- <el-table-column label="淇敼璁板綍" width="100" align="center" show-overflow-tooltip>
<template #default="scope">
<ModifyRecord :data="scope.row" />
</template>
- </el-table-column>
- <el-table-column label="鎿嶄綔" width="140" align="center" fixed="right" show-overflow-tooltip v-if="auth('aDPenalty:update') || auth('aDPenalty:delete')">
+ </el-table-column> -->
+ <el-table-column label="鎿嶄綔" width="80" align="center" fixed="right" show-overflow-tooltip v-if="auth('aDPenalty:update') || auth('aDPenalty:delete')">
<template #default="scope">
- <el-button icon="ele-Edit" size="small" text type="primary" @click="editDialogRef.openDialog(scope.row, '缂栬緫琛屾斂澶勭綒')" v-auth="'aDPenalty:update'"> 缂栬緫 </el-button>
- <el-button icon="ele-Delete" size="small" text type="primary" @click="delADPenalty(scope.row)" v-auth="'aDPenalty:delete'"> 鍒犻櫎 </el-button>
+ <el-button icon="ele-Edit" size="small" text type="primary" @click="editDialogRef.openDialog(scope.row, '缂栬緫琛屾斂澶勭綒')" v-auth="'aDPenalty:update'"> </el-button>
+ <el-button icon="ele-Delete" size="small" text type="primary" @click="delADPenalty(scope.row)" v-auth="'aDPenalty:delete'"> </el-button>
</template>
</el-table-column>
</el-table>
--
Gitblit v1.9.1