From 076a425a64e01b6e24ebde8fb1902fae17ee2797 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 09 一月 2023 17:25:56 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/operate/myWait/index.vue | 79 ++++++++++-----------------------------
1 files changed, 20 insertions(+), 59 deletions(-)
diff --git a/src/views/operate/myWait/index.vue b/src/views/operate/myWait/index.vue
index 8e49ee7..bdd2e5d 100644
--- a/src/views/operate/myWait/index.vue
+++ b/src/views/operate/myWait/index.vue
@@ -15,17 +15,10 @@
<main>
<div class="mainContent">
<!-- 鏁版嵁灞曠ず -->
- <el-table
- ref="multipleTable"
- :header-cell-style="{
- 'font-weight': '650',
- 'line-height': '45px',
- }"
- :data="tableData"
- style="width: 100%"
- :row-class-name="tableRowClassName"
- @selection-change="tableChange"
- >
+ <el-table ref="multipleTable" :header-cell-style="{
+ 'font-weight': '650',
+ 'line-height': '45px',
+ }" :data="tableData" style="width: 100%" :row-class-name="tableRowClassName" @selection-change="tableChange">
<el-table-column type="selection" min-width="5"> </el-table-column>
<el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="10">
</el-table-column>
@@ -55,25 +48,11 @@
<el-table-column min-width="10"> </el-table-column>
</el-table>
<!-- 鏌ョ湅淇敼椤甸潰 -->
- <el-dialog
- :visible.sync="dialogUpdate"
- width="60%"
- :title="title"
- :destroy-on-close="true"
- :key="updateFlag"
- :before-close="handleClose"
- >
- <component
- v-if="dialogUpdate"
- @closeDialog="changeDialog"
- @changeDialog="changeDialog"
- v-bind:is="currentTabComponent"
- :caseId="caseId"
- :id="caseId"
- :mycode="caseCode"
- :info="info"
- :vioData="vioData"
- ></component>
+ <el-dialog :visible.sync="dialogUpdate" width="60%" :title="title" :destroy-on-close="true" :key="updateFlag"
+ :before-close="handleClose">
+ <component v-if="dialogUpdate" @closeDialog="changeDialog" @changeDialog="changeDialog"
+ v-bind:is="currentTabComponent" :caseId="caseId" :id="caseId" :mycode="caseCode" :info="info"
+ :vioData="vioData"></component>
<!-- <updateUser
v-if="dialogUpdate"
:updateFlag="updateFlag"
@@ -86,41 +65,22 @@
<div class="tools">
<div class="funs">
<div class="funsItem">
- <el-checkbox v-model="all" @change="selectAll()"
- >鍏ㄩ��</el-checkbox
- >
+ <el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox>
</div>
<div class="funsItem">
- <el-checkbox v-model="unsame" @change="disSame(tableData)"
- >鍙嶉��</el-checkbox
- >
+ <el-checkbox v-model="unsame" @change="disSame(tableData)">鍙嶉��</el-checkbox>
</div>
<div class="funsItem">
- <el-select
- v-model="myIdx"
- placeholder="鎵归噺鎿嶄綔"
- @change="selectChange"
- >
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- :disabled="item.disabled"
- >
+ <el-select v-model="myIdx" placeholder="鎵归噺鎿嶄綔" @change="selectChange">
+ <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"
+ :disabled="item.disabled">
</el-option>
</el-select>
</div>
</div>
<div class="pagination">
- <el-pagination
- background
- :current-page="currentPage"
- layout="prev, pager, next"
- :total="totalNum"
- :page-size="pageSize"
- @current-change="changeCurrentPage"
- >
+ <el-pagination background :current-page="currentPage" layout="prev, pager, next" :total="totalNum"
+ :page-size="pageSize" @current-change="changeCurrentPage">
</el-pagination>
</div>
</div>
@@ -213,7 +173,7 @@
},
// 鎵归噺鍒犻櫎
- mulDelete(idArr) {},
+ mulDelete(idArr) { },
// 鎵ц涓嬫媺妗嗘搷浣�
selectChange(val) {
let ids = [];
@@ -247,7 +207,7 @@
});
},
// 鍒犻櫎鍗曟潯鏁版嵁
- handleDelete({ number }) {},
+ handleDelete({ number }) { },
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
if ((rowIndex + 1) % 2 === 0) {
@@ -273,7 +233,7 @@
this.dialogUpdate = false;
done();
})
- .catch(() => {});
+ .catch(() => { });
},
// 璁＄畻鏃堕棿
getRestTime(time2) {
@@ -461,6 +421,7 @@
justify-content: center;
.el-pagination {
+
&::v-deep li,
&::v-deep .btn-prev,
&::v-deep .btn-next {
--
Gitblit v1.8.0