From 5a685b76c6a54d72bbfe082d85454513e81dcf48 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 23 二月 2023 17:34:00 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/operate/sms/smsIndex/index.vue | 5 +++--
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue | 4 ++--
src/api/operate/writ.js | 2 +-
src/views/operate/message/myIndex/update/index.vue | 6 +++---
src/views/operate/message/myIndex/index.vue | 2 +-
src/views/operate/fivepack/threepack/components/content.vue | 10 ++++++++++
src/views/operate/writManager/writ/index.vue | 1 +
7 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/api/operate/writ.js b/src/api/operate/writ.js
index acbd279..98aa179 100644
--- a/src/api/operate/writ.js
+++ b/src/api/operate/writ.js
@@ -17,4 +17,4 @@
deleteWrit: (id) => {
return http.delete('/sccg/writ/delete/' + id);
},
-};
\ No newline at end of file
+};
diff --git a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue
index e0d7f0b..45b8a07 100644
--- a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue
@@ -153,7 +153,7 @@
.upImg {
display: flex;
-
+ overflow: auto;
.tip {
position: absolute;
bottom: 0;
@@ -208,4 +208,4 @@
// ::v-deep .el-form-item__label {
// color: #4b9bb7;
// }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/operate/fivepack/threepack/components/content.vue b/src/views/operate/fivepack/threepack/components/content.vue
index 9843f34..33ea1a9 100644
--- a/src/views/operate/fivepack/threepack/components/content.vue
+++ b/src/views/operate/fivepack/threepack/components/content.vue
@@ -61,6 +61,7 @@
: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="storeNumber" label="搴楅摵缂栧彿" min-width="10">
@@ -340,6 +341,10 @@
}
};
return {
+ tempList: [],
+ myIdx: 0,
+ all: false,
+ unsame: false,
storeCode: null,
storeStatus: null,
options: [
@@ -404,6 +409,11 @@
},
methods: {
+ // 鐩戝惉琛ㄦ牸閫変腑鐘舵��
+ tableChange(list) {
+ this.tempList = list;
+ this.all = list.length === this.tableData.length;
+ },
// 鎵归噺鍒犻櫎
mulDelete(idArr) {
this.$axios({
diff --git a/src/views/operate/message/myIndex/index.vue b/src/views/operate/message/myIndex/index.vue
index dc091b5..cda0e44 100644
--- a/src/views/operate/message/myIndex/index.vue
+++ b/src/views/operate/message/myIndex/index.vue
@@ -380,7 +380,7 @@
line-height: 100px;
justify-content: space-between;
align-items: center;
-
+ flex-wrap: wrap;
.search {
display: flex;
justify-content: space-between;
diff --git a/src/views/operate/message/myIndex/update/index.vue b/src/views/operate/message/myIndex/update/index.vue
index 6d8400a..d9713ac 100644
--- a/src/views/operate/message/myIndex/update/index.vue
+++ b/src/views/operate/message/myIndex/update/index.vue
@@ -327,7 +327,7 @@
);
}
}
- if(mystatus==0){
+ if(mystatus==0){
const { body, head, messageType, channelCode } = this.role;
const params = {
body,
@@ -367,7 +367,7 @@
);
}
}
-
+
} else {
this.$message.error({ type: "warning", message: "璇锋鏌ュ繀濉」" });
}
@@ -388,7 +388,7 @@
url: "sccg/admin/info?name=" + name,
}).then((res) => {
this.role.targetFrom = res.data.userId;
- this.sendUser = res.data.username;
+ this.sendUser = res.data.user.username;
});
},
diff --git a/src/views/operate/sms/smsIndex/index.vue b/src/views/operate/sms/smsIndex/index.vue
index c7ea05c..9f7d39e 100644
--- a/src/views/operate/sms/smsIndex/index.vue
+++ b/src/views/operate/sms/smsIndex/index.vue
@@ -70,7 +70,7 @@
</el-table-column>
</el-table>
<!-- 鏂板缓娑堟伅 -->
- <el-dialog title="鏂板缓娑堟伅" :destroy-on-close="true" :key="dialogType" :visible.sync="isShowDialog" width="80%"
+ <el-dialog title="鏂板缓娑堟伅" :destroy-on-close="true" :key="dialogTypeOne" :visible.sync="isShowDialog" width="80%"
:before-close="handleConfirmClose">
<MyCreate @closeMyDialog="closeDialog" :type="dialogType"></MyCreate>
</el-dialog>
@@ -258,7 +258,8 @@
columnName: "鐭俊",
},
],
- dialogType: "",
+ dialogType: "1",
+ dialogTypeOne:'2'
};
},
created() {
diff --git a/src/views/operate/writManager/writ/index.vue b/src/views/operate/writManager/writ/index.vue
index d60462e..eb4c656 100644
--- a/src/views/operate/writManager/writ/index.vue
+++ b/src/views/operate/writManager/writ/index.vue
@@ -187,6 +187,7 @@
},
handleDelete(row) {
this.$confirm("纭鍒犻櫎锛�").then((_) => {
+ console.log(row)
this.deleteWrit(row.baseCaseId).then((res) => {
this.$message({
type: "success",
--
Gitblit v1.8.0