From e1ac04b42be89ca26ff5f94c17c4e2eebe52a0a2 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 03 一月 2023 09:52:39 +0800
Subject: [PATCH] Merge branch 'dev1.0' of ssh://42.193.1.25:29418/sccg_ui into dev1.0
---
src/views/operate/writManager/writ/index.vue | 207 +++++++++++++++++++++++++++++++++------------------
1 files changed, 132 insertions(+), 75 deletions(-)
diff --git a/src/views/operate/writManager/writ/index.vue b/src/views/operate/writManager/writ/index.vue
index a47dc4b..3decf47 100644
--- a/src/views/operate/writManager/writ/index.vue
+++ b/src/views/operate/writManager/writ/index.vue
@@ -3,37 +3,20 @@
<header>
<div class="header-content">
<div class="search">
- <span style="padding-right: 20px">绛涢�夋潯浠�:</span>
- <el-select
- v-model="context"
- placeholder="绛涢�夋潯浠�"
- @change="handleStateChange"
- >
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
+ <span>绛涢�夋潯浠�:</span>
+ <el-input placeholder="璇疯緭鍏ュ唴瀹�" v-model="context"></el-input>
+ <div class="findBtn">
+ <el-button type="primary" @click="setTableData">鏌ヨ</el-button>
+ </div>
</div>
</div>
</header>
<main>
<div class="main-content">
- <div class="main-title">
- <el-button class="el-icon-plus" type="primary" @click="handleAdd"
- >娣诲姞</el-button
- >
- </div>
<!-- 鏁版嵁灞曠ず -->
<el-table
ref="multipleTable"
:header-cell-style="{
- background: '#06122c',
- 'font-size': '12px',
- color: '#4b9bb7',
'font-weight': '650',
'line-height': '45px',
}"
@@ -42,33 +25,56 @@
style="width: 100%"
>
<el-table-column type="selection" min-width="5"> </el-table-column>
- <el-table-column prop="name" label="鍗曞叺鍚嶇О" min-width="10">
+ <el-table-column prop="writCode" label="鏂囦功缂栧彿" min-width="100">
</el-table-column>
- <el-table-column prop="code" label="鍗曞叺缂栧彿" min-width="10">
+ <el-table-column prop="writTypeName" label="鏂囦功绉嶇被" min-width="180">
</el-table-column>
- <el-table-column prop="user" label="浣跨敤浜哄憳" min-width="10">
+ <el-table-column prop="categoryName" label="杩濇硶绫诲瀷" min-width="300">
</el-table-column>
- <el-table-column prop="phone" label="鑱旂郴鏂瑰紡" min-width="10">
+ <el-table-column prop="eventCode" label="浜嬩欢缂栧彿" width="160">
</el-table-column>
- <el-table-column prop="pdepartName" label="鎵�灞為儴闂�" min-width="10">
+ <el-table-column prop="sendTime" label="鏂囦功鍙戞斁鏃堕棿" min-width="120">
</el-table-column>
- <el-table-column prop="departName" label="鎵�灞炲ぇ闃�" min-width="10">
+ <el-table-column prop="limitTime" label="鏂囦功闄愬畾鏃堕棿" min-width="120">
+ </el-table-column>
+ <el-table-column
+ prop="sendContent"
+ label="鏂囦功鍙戞斁鍐呭"
+ min-width="110"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="rectifyTime"
+ label="瀹為檯鏁存敼鏃堕棿"
+ min-width="120"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="rectifySituation"
+ label="鏁存敼鎯呭喌"
+ min-width="110"
+ >
</el-table-column>
<el-table-column
prop="state"
:formatter="formatSate"
label="鐘舵��"
- min-width="5"
+ width="60"
>
</el-table-column>
- <el-table-column prop="operation" label="鎿嶄綔" min-width="20">
+ <el-table-column prop="operation" label="鎿嶄綔" min-width="150">
<template slot-scope="scope">
<div class="operation">
- <span @click="handleEdit(scope.row)">缂栬緫</span>
+ <span v-if="!scope.row.value" @click="handleEdit(scope.row)"
+ >涓嬪彂鏂囦功</span
+ >
+ <span v-if="scope.row.value" @click="handleView(scope.row)"
+ >鏌ョ湅</span
+ >
<span class="line">|</span>
- <span @click="handleDelete(scope.row)">鍒犻櫎</span>
+ <span @click="handleDelete(scope.row)">鍒犻櫎鏂囦功</span>
</div>
</template>
</el-table-column>
@@ -94,15 +100,19 @@
</div>
</main>
<footer>
- <!-- 娣诲姞闊虫煴 -->
+ <!-- 涓嬪彂鏂囦功 -->
<el-dialog
- title="娣诲姞闊虫煴"
+ title="涓嬪彂鏂囦功"
:visible.sync="dialogCreate"
v-if="dialogCreate"
- width="60%"
+ width="80%"
:before-close="handleClose"
>
- <MyForm :info="handheldTerminal" @closeDialog="handleCallBack"></MyForm>
+ <component
+ :is="componentName"
+ :writ="writ"
+ @closeDialog="handleCallBack"
+ ></component>
</el-dialog>
</footer>
</div>
@@ -111,13 +121,13 @@
import { createNamespacedHelpers } from "vuex";
const { mapActions } = createNamespacedHelpers("writ");
-import InquestRecord from "../components/inquest_record/view.vue";
-import Notification from "../components/instruct_notification/view.vue";
+import InquestRecordEdit from "../components/inquest_record/edit.vue";
+import NotificationEdit from "../components/instruct_notification/edit.vue";
export default {
components: {
- InquestRecord,
- Notification,
+ InquestRecordEdit,
+ NotificationEdit,
},
data() {
return {
@@ -142,33 +152,39 @@
pageSize: 10,
currentPage: 1,
renderFlag: false,
- handheldTerminal: {},
+ writ: {},
+ componentName: "",
};
},
created() {
this.setTableData();
},
methods: {
- ...mapActions(["getHandheldTerminalList", "deleteHandheldTerminal"]),
- handleAdd() {
- this.handheldTerminal = {
- id: 0,
- name: "",
- code: "",
- user: "",
- phone: "",
- departId: 0,
- departName: "",
- };
+ ...mapActions(["getWritList", "updateWrit", "deleteWrit"]),
+
+ handleEdit(row) {
+ this.writ = row;
+ this.setComponent(row);
this.dialogCreate = true;
},
- handleEdit(row) {
- this.handheldTerminal = row;
+ handleView(row) {
+ this.writ = row;
+ this.setComponent(row);
this.dialogCreate = true;
+ },
+ setComponent(row, isEdit) {
+ switch (row.templateCode) {
+ case "inquest_record":
+ this.componentName = InquestRecordEdit;
+ break;
+ case "instruct_to_correct_notification":
+ this.componentName = NotificationEdit;
+ break;
+ }
},
handleDelete(row) {
this.$confirm("纭鍒犻櫎锛�").then((_) => {
- this.deleteHandheldTerminal(row.id).then((res) => {
+ this.deleteWrit(row.id).then((res) => {
this.$message({
type: "success",
message: "鍒犻櫎鎴愬姛锛�",
@@ -184,17 +200,16 @@
this.setTableData();
},
formatSate(row, column) {
- return row.state == 1 ? "鍦ㄧ嚎" : "绂荤嚎";
+ return row.value ? "宸蹭笅鍙�" : "鏈笅鍙�";
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
- if ((rowIndex + 1) % 2 == 0) {
+ if ((rowIndex + 1) % 2 === 0) {
return "warning-row";
} else {
return "success-row";
}
- return "";
},
// 寮圭獥鍏抽棴
handleClose(done) {
@@ -206,10 +221,10 @@
// 璁剧疆tableData
setTableData() {
const { currentPage, pageSize, context } = this;
- this.getHandheldTerminalList({
+ this.getWritList({
currentPage,
pageSize,
- state: context,
+ keyword: context,
}).then((res) => {
this.list = res.records;
this.totalNum = res.total;
@@ -243,8 +258,7 @@
color: #4b9bb7;
header {
- background-color: #09152f;
- border: 1pox solid #fff;
+ background-color: white;
.header-content {
padding: 0 40px;
@@ -266,7 +280,7 @@
color: #1d3f57;
&::v-deep .el-input__inner {
- background-color: #09152f;
+ background-color: #fff;
border: 1px solid #17324c;
}
}
@@ -275,10 +289,9 @@
}
main {
- background-color: #09152f;
+ background-color: #fff;
margin-top: 20px;
padding-bottom: 50px;
- border: 1pox solid #fff;
.main-title {
line-height: 60px;
@@ -314,7 +327,7 @@
&::v-deep .el-input__inner {
border: none;
- background-color: #09152f;
+ // background-color: #09152f;
}
&:hover {
@@ -337,7 +350,7 @@
&::v-deep li,
&::v-deep .btn-prev,
&::v-deep .btn-next {
- background-color: #071f39;
+ // background-color: #071f39;
color: #4b9bb7;
}
@@ -348,13 +361,13 @@
}
}
}
- &::v-deep .warning-row {
- background-color: #06122c;
- }
+ // &::v-deep .warning-row {
+ // background-color: #06122c;
+ // }
- &::v-deep .success-row {
- background-color: #071f39;
- }
+ // &::v-deep .success-row {
+ // background-color: #071f39;
+ // }
.operationBox {
display: flex;
@@ -364,8 +377,8 @@
background-color: #4b9bb7;
}
.el-table {
- color: #4b9bb7;
- font-size: 10px;
+ // color: #4b9bb7;
+ // font-size: 10px;
.operation {
display: flex;
@@ -379,5 +392,49 @@
}
}
}
+ // 璁剧疆dialog鏍峰紡
+ ::v-deep .el-dialog__body {
+ background-color: #fff;
+ // color: #000;
+ }
+
+ ::v-deep .el-dialog__header {
+ // background-color: #06122c !important;
+ color: #fff;
+ }
+}
+.headerContent {
+ padding: 0 40px;
+ display: flex;
+ line-height: 100px;
+ justify-content: space-between;
+ align-items: center;
+
+ .search {
+ display: flex;
+ justify-content: flex-start;
+
+ span {
+ flex: 1;
+ }
+
+ .el-input {
+ flex: 2;
+ color: #1d3f57;
+ }
+ }
+}
+
+.findBtn {
+ line-height: 100px;
+ margin-left: 15px;
+ display: flex;
+ align-items: center;
+ margin-top: -2px;
+
+ .el-button {
+ padding: 12px 25px;
+ border-radius: 20px;
+ }
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0