From 1046f687b35cdcdbafab6e0bbb17cbb3d1982a8b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 07 三月 2024 10:47:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/default-auditing/index.vue | 147 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 96 insertions(+), 51 deletions(-)
diff --git a/src/views/system/default-auditing/index.vue b/src/views/system/default-auditing/index.vue
index aaf359a..b52c657 100644
--- a/src/views/system/default-auditing/index.vue
+++ b/src/views/system/default-auditing/index.vue
@@ -1,38 +1,33 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="杩濊" prop="defaultId">
- <el-input
- v-model="queryParams.defaultId"
- placeholder="璇疯緭鍏ヨ繚瑙�"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+ <el-form-item label="杩濈害杩愮淮鍗曚綅" prop="belongUnit">
+ <el-select v-model="queryParams.unitId" @change="handleQuery" clearable placeholder="杩濈害鍗曚綅">
+ <el-option
+ v-for="item in unitList"
+ :key="item.id"
+ :label="item.value"
+ :value="item.id">
+ </el-option>
+ </el-select>
</el-form-item>
<el-form-item label="瀹℃牳鏃堕棿">
<el-date-picker
v-model="daterangeAuditingTime"
style="width: 240px"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
type="daterange"
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
></el-date-picker>
</el-form-item>
- <el-form-item label="瀹℃牳浜�" prop="auditingUser">
- <el-input
- v-model="queryParams.auditingUser"
- placeholder="璇疯緭鍏ュ鏍镐汉"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
+
<el-form-item label="鍒涘缓鏃堕棿">
<el-date-picker
v-model="daterangeCreateTime"
style="width: 240px"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
type="daterange"
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
@@ -93,29 +88,29 @@
<el-table v-loading="loading" :data="auditingList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="杩濊" align="center" prop="defaultId" />
+ <el-table-column label="杩濈害鍗曚綅" align="center" prop="unitName" width="180"/>
+ <el-table-column label="杩濈害瑙勫垯" align="center" prop="defaultRuleName"width="120" />
+ <el-table-column label="瀹℃牳浜�" align="center" prop="auditingUserName" />
<el-table-column label="瀹℃牳鐘舵��" align="center" prop="auditingStatus" />
- <el-table-column label="瀹℃牳璇存槑" align="center" prop="remark" />
- <el-table-column label="瀹℃牳鏃堕棿" align="center" prop="auditingTime" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.auditingTime, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
- <el-table-column label="瀹℃牳浜�" align="center" prop="auditingUser" />
- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="瀹℃牳璇存槑" align="center" prop="remark" width="180"/>
+ <el-table-column label="瀹℃牳鏃堕棿" align="center" prop="auditingTime" width="180"/>
+ <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180"/>
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['system:auditing:edit']"
- >淇敼</el-button>
+ icon="el-icon-s-check"
+ @click="handleAuditing(scope.row)"
+ v-hasPermi="['system:auditing:auditing']"
+ >瀹℃牳</el-button>
+<!-- <el-button-->
+<!-- size="mini"-->
+<!-- type="text"-->
+<!-- icon="el-icon-edit"-->
+<!-- @click="handleUpdate(scope.row)"-->
+<!-- v-hasPermi="['system:auditing:edit']"-->
+<!-- >淇敼</el-button>-->
<el-button
size="mini"
type="text"
@@ -135,25 +130,42 @@
@pagination="getList"
/>
- <!-- 娣诲姞鎴栦慨鏀硅繚瑙勫鏍稿璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <!-- 瀹℃牳 -->
+ <el-dialog title="杩濈害瀹℃牳" :visible.sync="auditingOpen" width="500px" append-to-body>
+ <el-form ref="auditingForm" :model="auditingForm" :rules="auditingRules" label-width="80px">
+ <el-form-item label="杩濈害鍗曚綅">
+ <el-input v-model="auditingForm.unitName" disabled/>
+ </el-form-item>
+ <el-form-item label="杩濈害瑙勫垯">
+ <el-input v-model="auditingForm.defaultRuleName" disabled/>
+ </el-form-item>
+ <el-form-item label="瀹℃牳缁撴灉" prop="auditingStatus">
+ <el-radio v-model="auditingForm.auditingResult" label="pass">閫氳繃</el-radio>
+ <el-radio v-model="auditingForm.auditingResult" label="return">椹冲洖</el-radio>
+ </el-form-item>
+ <el-form-item label="瀹℃牳璇存槑" prop="remark">
+ <el-input v-model="auditingForm.remark" type="textarea" show-word-limit maxlength="100"/>
+ </el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitAuditing">纭� 瀹�</el-button>
+ <el-button @click="closeAuditing">鍙� 娑�</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
-import { listAuditing, getAuditing, delAuditing, addAuditing, updateAuditing } from "@/api/platform/default-auditing";
+import { listAuditing, getAuditing, delAuditing, addAuditing, updateAuditing,auditing } from "@/api/platform/default-auditing";
+import { unitSelect } from "@/api/platform/unit";
export default {
name: "Auditing",
data() {
return {
+ auditingOpen: false,
+ auditingForm: {},
+ unitList: [],
// 閬僵灞�
loading: true,
// 閫変腑鏁扮粍
@@ -189,31 +201,64 @@
// 琛ㄥ崟鍙傛暟
form: {},
// 琛ㄥ崟鏍￠獙
- rules: {
- defaultId: [
- { required: true, message: "杩濊涓嶈兘涓虹┖", trigger: "blur" }
+ auditingRules: {
+ auditingStatus: [
+ { required: true, message: "璇峰厛瀹屾垚瀹℃牳缁撴灉", trigger: "blur" }
],
}
};
},
created() {
this.getList();
+ this.getUnitSelect();
},
methods: {
+ // 鎻愪氦瀹℃牳
+ submitAuditing() {
+ this.$refs["auditingForm"].validate(valid => {
+ if (valid) {
+ auditing(this.auditingForm).then(res => {
+ if (res.code === 200) {
+ this.auditingOpen = false;
+ this.$modal.msgSuccess("瀹℃牳鎴愬姛");
+ this.getList();
+ } else {
+ this.$modal.msgSuccess(res.msg)
+ }
+ })
+ }
+ })
+ },
+ // 鎵撳紑瀹℃牳
+ handleAuditing(row) {
+ this.auditingOpen = true;
+ this.auditingForm = row;
+ this.auditingForm.auditingStatus = this.auditingForm.auditingStatus ? this.auditingForm.auditingStatus : null
+ },
+ // 鍏抽棴瀹℃牳
+ closeAuditing() {
+ this.auditingForm = {};
+ this.auditingOpen = false;
+ },
+ getUnitSelect() {
+ // 杩愮淮鍗曚綅涓嬫媺鍒楄〃
+ unitSelect().then((res) => {
+ this.unitList = res.data;
+ })
+ },
/** 鏌ヨ杩濊瀹℃牳鍒楄〃 */
getList() {
this.loading = true;
- this.queryParams.params = {};
if (null != this.daterangeAuditingTime && '' != this.daterangeAuditingTime) {
- this.queryParams.params["beginAuditingTime"] = this.daterangeAuditingTime[0];
- this.queryParams.params["endAuditingTime"] = this.daterangeAuditingTime[1];
+ this.queryParams["auditingStartTime"] = this.daterangeAuditingTime[0];
+ this.queryParams["auditingEndTime"] = this.daterangeAuditingTime[1];
}
if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
- this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
- this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
+ this.queryParams["createStartTime"] = this.daterangeCreateTime[0];
+ this.queryParams["createEndTime"] = this.daterangeCreateTime[1];
}
listAuditing(this.queryParams).then(response => {
- this.auditingList = response.rows;
+ this.auditingList = response.data;
this.total = response.total;
this.loading = false;
});
--
Gitblit v1.8.0