Skip to content

X
xichonght
Commit f38d1557 authored by miaohaoyun's avatar miaohaoyun
Browse files
Options

Merge branch 'mhy' into 'master' 

Mhy

See merge request !71
parents f091c264 e78c892c
Hide whitespace changes
Inline Side-by-side
Showing with 182 additions and 5 deletions
.idea/misc.xml 0 → 100644
View file @ f38d1557
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
</project>
\ No newline at end of file
.idea/modules.xml 0 → 100644
View file @ f38d1557
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/xichonght.iml" filepath="$PROJECT_DIR$/.idea/xichonght.iml" />
</modules>
</component>
</project>
\ No newline at end of file
.idea/vcs.xml 0 → 100644
View file @ f38d1557
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
.idea/xichonght.iml 0 → 100644
View file @ f38d1557
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
<excludeFolder url="file://$MODULE_DIR$/temp" />
<excludeFolder url="file://$MODULE_DIR$/tmp" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
xichongSys/src/views/Myvue/importBaseByExcel.vue 0 → 100644
View file @ f38d1557
<template>
<div>
<el-alert
align="left"
title="请上传格式完全相同的excel,格式如下:"
type="warning"
:closable="false"
show-icon>
</el-alert>
<table style="text-align: center;border-collapse: collapse" cellspacing="0px" cellpadding="0px">
<tr>
<td style="border: 1px solid black">&nbsp;统筹区&nbsp;</td>
<td style="border: 1px solid black">&nbsp;街道或乡镇名称&nbsp;</td>
<td style="border: 1px solid black">&nbsp;社区名称&nbsp;</td>
<td style="border: 1px solid black">&nbsp;所属组&nbsp;</td>
<td style="border: 1px solid black">&nbsp;户口所在地&nbsp;</td>
<td style="border: 1px solid black">&nbsp;户口性质&nbsp;</td>
<td style="border: 1px solid black">&nbsp;个人编号&nbsp;</td>
<td style="border: 1px solid black">&nbsp;证件号码&nbsp;</td>
<td style="border: 1px solid black">&nbsp;姓名&nbsp;</td>
<td style="border: 1px solid black">&nbsp;性别&nbsp;</td>
<td style="border: 1px solid black">&nbsp;民族&nbsp;</td>
<td style="border: 1px solid black">&nbsp;出生日期&nbsp;</td>
<td style="border: 1px solid black">&nbsp;险种类型&nbsp;</td>
<td style="border: 1px solid black">&nbsp;参保状态&nbsp;</td>
<td style="border: 1px solid black">&nbsp;是否老农保&nbsp;</td>
<td style="border: 1px solid black">&nbsp;缴费状态&nbsp;</td>
<td style="border: 1px solid black">&nbsp;缴费档次&nbsp;</td>
<td style="border: 1px solid black">&nbsp;人员类别&nbsp;</td>
<td style="border: 1px solid black">&nbsp;离退休标志&nbsp;</td>
<td style="border: 1px solid black">&nbsp;个人身份&nbsp;</td>
<td style="border: 1px solid black">&nbsp;参保日期&nbsp;</td>
<td style="border: 1px solid black">&nbsp;档案编号&nbsp;</td>
</tr>
</table>
<el-upload
style="margin-top: 10px"
class="upload-demo"
ref="upload1"
:action="baseInfoUrl"
multiple
drag
accept=".xls,.xlsx"
:limit="1"
:headers="myHeader"
:before-upload="handleBeforeUpload"
:file-list="fileList"
:on-exceed="handleExceed"
:on-success="uploadSuccess"
:on-error="uploadError"
:auto-upload="false">
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div slot="tip" class="el-upload__tip">只能上传xls/xlsx文件,一次最多只能上传1个文件</div>
</el-upload>
<el-button style="margin-top: 10px" size="small" type="success" @click="submitUpload1">数据导入</el-button>
<el-dialog
ref="dialog"
:title="dialogTitle"
width="30%"
:visible.sync="dialogVisible">
<span v-text="dialogContent" style="font-size: 16px"></span>
</el-dialog>
</div>
</template>
<script>
import {baseUrl} from "../../utils/global";
import Cookies from "js-cookie";
let uploadedList = [];
export default {
name: "importByExcel",
data() {
return {
baseInfoUrl: baseUrl + "/baseInfo/importFromNewExcel",
myHeader: {
token: Cookies.get("token")
},
fileList: [],
dialogTitle: "",
dialogVisible: false,
dialogContent: "",
loading: false
};
},
methods: {
submitUpload1() {
this.$refs.upload1.submit();
},
handleExceed() {
this.$message.warning("当前限制选择 1 个文件，请删除后继续上传");
},
handleBeforeUpload(file) {
this.loading = true;
if (!file.name.endsWith(".xls") && !file.name.endsWith(".xlsx")) {
this.$message.warning(file.name + "不是excel文件");
this.loading = false;
return false;
}
// if (uploadedList.includes(file.name)) {
// this.$message.warning(file.name + "已被选中过,请勿重复选择");
// return false;
// }
// uploadedList.push(file.name);
},
async uploadSuccess(response) {
this.fileList = [];
this.dialogTitle = "导入结果";
this.dialogContent = response.data;
// this.dialogVisible = true;
this.loading = false;
console.log("upload success");
this.$message({
type: "success",
message: response.data,
showClose: true,
duration: 0
});
},
async uploadError(response) {
this.fileList = [];
this.dialogTitle = "导入结果";
this.dialogContent = "导入失败";
// this.dialogVisible = true;
this.loading = false;
console.log(response);
this.$alert(response.data, '导入结果', {
confirmButtonText: '确定',
callback: action => {
// this.$message({
// type: 'info',
// message: `action: ${ action }`
// });
}
});
},
}
}
</script>
<style scoped>
</style>
xichongSys/src/views/Sys/Role.vue
View file @ f38d1557
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
<el-form-item label="角色名" prop="name"> <el-form-item label="角色名" prop="name">
<el-input v-model="dataForm.name" auto-complete="off"></el-input> <el-input v-model="dataForm.name" auto-complete="off"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <!-- <el-form-item label="备注" prop="remark">-->
<el-input v-model="dataForm.remark" auto-complete="off" type="textarea"></el-input> <!-- <el-input v-model="dataForm.remark" auto-complete="off" type="textarea"></el-input>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="签章" prop="seal" align="left" style="height: 80px"> <el-form-item label="签章" prop="seal" align="left" style="height: 80px">
<el-popover <el-popover
v-if="typeof(dataForm.sealStr) !== 'undefined' && dataForm.sealStr !== null && dataForm.sealStr !== ''" v-if="typeof(dataForm.sealStr) !== 'undefined' && dataForm.sealStr !== null && dataForm.sealStr !== ''"
...@@ -176,7 +176,7 @@ export default { ...@@ -176,7 +176,7 @@ export default {
this.dataForm = { this.dataForm = {
id: 0, id: 0,
name: '', name: '',
remark: '', remark: this.name,
seal: '', seal: '',
sealStr: '', sealStr: '',
} }
...@@ -195,6 +195,7 @@ export default { ...@@ -195,6 +195,7 @@ export default {
if (valid) { if (valid) {
this.$confirm('确认提交吗？', '提示', {}).then(() => { this.$confirm('确认提交吗？', '提示', {}).then(() => {
this.editLoading = true this.editLoading = true
this.dataForm.remark = this.dataForm.name;
console.log(this.dataForm); console.log(this.dataForm);
let params = Object.assign({}, this.dataForm) let params = Object.assign({}, this.dataForm)
this.$api.role.save(params).then((res) => { this.$api.role.save(params).then((res) => {
......
xichongSys/src/views/Sys/User.vue
View file @ f38d1557
...@@ -153,7 +153,7 @@ export default { ...@@ -153,7 +153,7 @@ export default {
], ],
password: [ password: [
{ required: true, message: '请输入密码', trigger: 'blur'}, { required: true, message: '请输入密码', trigger: 'blur'},
{ pattern: /^[\w_-]{6,18}$/, message: '密码必须为6至18位', trigger: 'blur'} // { pattern: /^[\w_-]{6,18}$/, message: '密码必须为6至18位', trigger: 'blur'}
], ],
}, },
// 新增编辑界面数据 // 新增编辑界面数据
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment