From a8532e35b1a39de9bbcc5f2a648fe02c72d9c2b0 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 16 二月 2023 14:09:53 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue | 71 ++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 35 deletions(-)
diff --git a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue
index 957a25a..009da8f 100644
--- a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue
@@ -52,7 +52,7 @@
<div class="user-form-content">
<el-form ref="userForm" label-width="120px" :model="user" :rules="userRules" autoComplete="on">
<!-- 绫诲瀷 -->
- <el-form-item label="绫诲瀷:" prop="illegalType">
+ <el-form-item label="绫诲瀷:" prop="illegalType" :disabled="true">
<el-input v-model="user.illegalType"></el-input>
</el-form-item>
<!-- 濮撳悕銆佹墜鏈哄彿 -->
@@ -271,15 +271,15 @@
}
},
async created() {
- await this.getCardTypeList();
- await this.getSchoolList();
- await this.getNationList();
- if (this.evidenceData) {
+ await this.getCardTypeList();
+ await this.getSchoolList();
+ await this.getNationList();
+ this.$set(this.user, 'illegalType', this.illegalType);
+ if (this.evidenceData) {
this.evidence = deepClone(this.evidenceData);
this.evidence.pic = this.evidenceData.pic.split(',');
this.user = this.evidence.partyInfo;
this.evidence.userInfo = this.evidence.partyInfo.name;
- this.user.illegalType = JSON.parse(JSON.stringify(this.mytype));
}
},
methods: {
@@ -300,16 +300,17 @@
openDialog(e) {
this.userFlag = true;
this.userInfo = true;
+ this.$set(this.user, 'illegalType', this.illegalType);
},
// 妫�楠寀ser
checkUser() {
- debugger;
this.$refs.userForm.validate((valid) => {
if (valid) {
- this.userFlag = false;
+ this.evidence.userInfo = this.user.name + '...';
+ this.userFlag = false;
} else {
- this.evidence.userInfo = false;
- return false;
+ this.evidence.userInfo = null;
+ this.$message.warning('璇锋鏌ュ繀濉」');
}
})
},
@@ -351,7 +352,7 @@
this.evidence.pic.splice(this.evidence.pic.indexOf(baseUrl + url),1);
}
},
- props:['mytype','mycode', 'evidenceData']
+ props:['evidenceData', 'illegalType']
}
</script>
<style lang="scss" scoped>
@@ -458,23 +459,23 @@
}
}
- ::v-deep .el-textarea__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
- }
+ // ::v-deep .el-textarea__inner {
+ // // background-color: #09152f;
+ // border: 1px solid #17324c;
+ // }
- ::v-deep .el-input__count {
- background-color: #09152f;
- }
+ // ::v-deep .el-input__count {
+ // // background-color: #09152f;
+ // }
- ::v-deep .el-form-item__label {
- color: #4b9bb7;
- }
+ // ::v-deep .el-form-item__label {
+ // color: #4b9bb7;
+ // }
- ::v-deep .el-input__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
- }
+ // ::v-deep .el-input__inner {
+ // background-color: #09152f;
+ // border: 1px solid #17324c;
+ // }
}
.user-form-footer {
@@ -482,18 +483,18 @@
justify-content: flex-end;
}
-::v-deep .el-textarea__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
-}
+// ::v-deep .el-textarea__inner {
+// // background-color: #09152f;
+// border: 1px solid #17324c;
+// }
-::v-deep .el-input__count {
- background-color: #09152f;
-}
+// ::v-deep .el-input__count {
+// // background-color: #09152f;
+// }
-::v-deep .el-form-item__label {
- color: #4b9bb7;
-}
+// ::v-deep .el-form-item__label {
+// color: #4b9bb7;
+// }
::v-deep .el-dialog__header,
::v-deep .el-dialog__body {
--
Gitblit v1.8.0