From 2d881714a7b35ec6208946a06243c9db6690aff7 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期六, 23 十一月 2024 15:26:47 +0800
Subject: [PATCH] 修改性别
---
ruoyi-ui/src/views/self/memo.vue | 14 ++++--
ruoyi-ui/src/views/travel/index.vue | 73 ------------------------------------
ruoyi-ui/vue.config.js | 2
ruoyi-ui/src/views/system/user/index.vue | 4 +-
ruoyi-ui/src/views/login.vue | 11 +++--
5 files changed, 20 insertions(+), 84 deletions(-)
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 16e5d83..232dfa6 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -193,13 +193,13 @@
</el-form-item>
<el-form-item style="width:100%;">
<el-button
- :loading="loading"
+ :loading="loadingr"
size="medium"
type="primary"
style="width:100%;"
@click.native.prevent="handleRegister"
>
- <span v-if="!loading">娉� 鍐�</span>
+ <span v-if="!loadingr">娉� 鍐�</span>
<span v-else>娉� 鍐� 涓�...</span>
</el-button>
@@ -263,6 +263,7 @@
code: [{ required: true, trigger: "change", message: "璇疯緭鍏ラ獙璇佺爜" }]
},
loading: false,
+ loadingr: false,
// 楠岃瘉鐮佸紑鍏�
captchaEnabled: true,
// 娉ㄥ唽寮�鍏�
@@ -314,7 +315,7 @@
//alert(this.registerForm.nickname)
this.$refs.registerForm.validate(valid => {
if (valid) {
- this.loading = true;
+ this.loadingr = false;
//alert(this.registerForm.nickname)
register(this.registerForm).then(res => {
const nickName = this.registerForm.nickname;
@@ -323,10 +324,12 @@
type: 'success'
}).then(() => {
this.openRegister = false;
+ this.resetForm("registerForm");
// this.$router.push("/login");
+
}).catch(() => {});
}).catch(() => {
- this.loading = false;
+ this.loadingr = true;
if (this.captchaEnabled) {
this.getCode();
}
diff --git a/ruoyi-ui/src/views/self/memo.vue b/ruoyi-ui/src/views/self/memo.vue
index 1f660e0..5be49cd 100644
--- a/ruoyi-ui/src/views/self/memo.vue
+++ b/ruoyi-ui/src/views/self/memo.vue
@@ -77,12 +77,12 @@
<!-- <el-input v-model="individualList.sex === 1 ? '鐢�':'濂�' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">-->
<!-- </el-input>-->
<template v-if="!isEditing">
- <el-input v-model="individualList.sex === 1 ? inds='鐢�':inds='濂�'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+ <el-input v-model="individualList.sex === 0 ? inds='鐢�':inds='濂�'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
</template>
<template v-else>
<el-select v-model="inds" placeholder="璇烽�夋嫨鎬у埆" clearable :style="{width: '100%'}" :disabled="dsb">
- <el-option label="鐢�" value='1'></el-option>
- <el-option label="濂�" value='0'></el-option>
+ <el-option label="鐢�" value='0'></el-option>
+ <el-option label="濂�" value='1'></el-option>
</el-select>
</template>
</el-form-item>
@@ -1159,16 +1159,19 @@
}, `self_${new Date().getTime()}.xlsx`)
}, //涓汉鍩烘湰淇℃伅
submitForm() {
+
if(this.inds=='1')
this.individualList.sex = 1;
else
this.individualList.sex = 0;
+
if(this.mrs=='0')
this.individualList.maritalStatus = 0
else if(this.mrs == '1')
this.individualList.maritalStatus = 1
else
this.individualList.maritalStatus = 2
+ //alert(123)
// alert(10)
// let ul = this.fileList.map(function (elem){
// return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
@@ -1184,7 +1187,8 @@
updateIndividual(this.individualList).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
// 寮哄埗鏇存柊鐩稿叧缁勪欢
- this.individualList={...this.individualList}
+
+ // this.individualList={...this.individualList}
// this.open = false;
this.dsb = true
@@ -1192,7 +1196,7 @@
this.isShow_2=false
this.isShow=true
this.isEditing = false
- });
+ })
} else {
this.$modal.msgSuccess("淇敼澶辫触");
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 468fce1..6514b48 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -815,7 +815,7 @@
this.dateRange = [];
this.resetForm("queryForm");
this.queryParams.deptId = undefined;
- this.$refs.tree.setCurrentKey(null);
+ // this.$refs.tree.setCurrentKey(null);
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
@@ -845,7 +845,7 @@
this.postOptions = response.posts;
// this.roleOptions = response.roles;
this.roleOptions= []
- this.roleOptions.push(response.roles[1])
+ // this.roleOptions.push(response.roles[1])
this.roleOptions.push(response.roles[3])
console.log(this.roleOptions,'roleOptionsroleOptionsroleOptions')
console.log("0-009888")
diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index bef6853..c915e83 100644
--- a/ruoyi-ui/src/views/travel/index.vue
+++ b/ruoyi-ui/src/views/travel/index.vue
@@ -580,78 +580,7 @@
<el-table v-loading="loading2" border :data="shareList1" :row-key="getRowId2" ref="multipleTable" @selection-change="handleSelectionChange2" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
- <el-table-column type="expand" :cell-class-name="expandRowClassName">
- <template slot-scope="props">
- <div >
- <el-table :header-row-class-name="tableHeaderRowClassName" v-loading="loading" :data="travelBase[props.row.id]" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;" :row-class-name="tableRowClassName1" >
- <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="50px"/>
-
- <el-table-column label="鏃堕棿" prop="happenDate" sortable width="100" align="center" >
- <template slot-scope="scope">{{scope.row.happenDate? scope.row.happenDate: '鈥斺�斺�斺��'}}</template>
- </el-table-column>
-
- <el-table-column label="鍦扮偣" prop="address" sortable width="100" />
-
- <el-table-column label="寤虹瓚" prop="scenic" sortable width="100" />
- <!-- <el-table-column label="鏃呮湡" prop="travelPeriod" sortable width="100" /> -->
- <el-table-column label="浣跨敤璇佷欢" prop="document" sortable width="100" />
- <el-table-column label="杞︽/鑸彮" prop="flight" sortable width="120px" />
- <el-table-column label="椁愯垂" prop="eat" sortable width="70px" />
- <el-table-column label="浣忓璐�" prop="stay" sortable width="100px" />
- <el-table-column label="浜ら��" prop="travel" sortable width="70px" />
- <el-table-column label="闂ㄧエ" prop="entrance" sortable width="70px" />
- <el-table-column label="鍏跺畠璐圭敤" prop="otherCost" sortable width="120px" />
- <el-table-column label="澶囨敞" prop="backInfo" sortable width="120px" />
-
- <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" >
- <template slot-scope="scope" >
- <img
- class="el-upload-list__item-thumbnail"
- src="../../assets/images/deviceLis.png"
- alt=""
- style="width: 35px; height: 35px;"
- fit="cover"
- v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
- >
- <img
- v-else
- class="el-upload-list__item-thumbnail"
- src="../../assets/images/deviceA.png"
- alt=""
- style="width: 35px; height: 35px;"
- fit="cover"
- >
- </template>
- </el-table-column>
- <!-- <el-table-column label="澶囨敞" prop="remark" sortable width="100" />-->
-
-
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" v-if="userId != 2">
- <template slot-scope="scope" v-if="scope.row.roleId !== 1">
-<!-- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate1(scope.row)"
- v-hasPermi="['familymodel:economy:info']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete1(scope.row)"
- v-hasPermi="['system:role:remove']"
- >鍒犻櫎</el-button> -->
- <el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck1(scope.row)">鏌ョ湅璇︽儏</el-button>
-
- </template>
- </el-table-column>
- </el-table>
- </div>
-
-
- </template>
- </el-table-column>
+
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60px"/>
<el-table-column label="璧�" prop="startTime" sortable width="100" align="center">
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 855bcf0..02bed06 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -37,7 +37,7 @@
// detail: https://cli.vuewww.bendudu.comjs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `https://10.39.18.174:8080/`,
- // target: `https://192.168.1.3:8080/`,
+ // target: `https://192.168.1.7:8080/`,
target: 'https://www.bendudu.com:8080/',
changeOrigin: true,
pathRewrite: {
--
Gitblit v1.9.1