Skip to content

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

Merge branch 'mhy' into 'master' 

Mhy

See merge request !55
parents 9a5b705e a9018c94
Show whitespace changes
Inline Side-by-side
Showing with 170 additions and 45 deletions
xichongSys/src/views/Core/KtTable.vue
View file @ b1c1a83a
......@@ -10,6 +10,20 @@
:fixed="column.fixed" :key="column.prop" :type="column.type" :formatter="column.formatter"
:sortable="column.sortable==null?true:column.sortable">
</el-table-column>
<el-table-column
v-if="showSeal"
label="签章">
<template slot-scope="scope">
<el-popover
v-if="scope.row.sealStr !== null && scope.row.sealStr != ''"
placement="left"
title=""
trigger="hover">
<img slot="reference" :src="'data:image/jpg;base64,' + scope.row.sealStr" height="50px" width="50px" class="head_pic">
<img :src="'data:image/jpg;base64,' + scope.row.sealStr" height="200px" width="200px" class="head_pic"/>
</el-popover>
</template>
</el-table-column>
<el-table-column :label="$t('action.operation')" width="185" fixed="right" v-if="showOperation" header-align="center" align="center">
<template slot-scope="scope">
<kt-button v-if="scope.row.name!=='admin'" icon="fa fa-edit" :label="$t('action.edit')" :perms="permsEdit" :size="size" @click="handleEdit(scope.$index, scope.row)" style="float: left"/>
......@@ -94,7 +108,11 @@ export default {
showBatchDelete: { // 是否显示操作组件
type: Boolean,
default: true
}
},
showSeal: { // 是否显示操作组件
type: Boolean,
default: false
},
},
data() {
return {
......
xichongSys/src/views/Core/candode.vue
View file @ b1c1a83a
......@@ -43,3 +43,8 @@
}
};
</script>
<style>
.block {
min-width: 200px;
}
</style>
xichongSys/src/views/Myvue/infoChange.vue
View file @ b1c1a83a
......@@ -257,7 +257,7 @@ export default {
}).catch(() => {
this.$message({
type: 'info',
message: '取消输入'
message: '已取消输入'
});
});
},
......
xichongSys/src/views/Myvue/insuranceCancellationAudit.vue
View file @ b1c1a83a
......@@ -239,6 +239,7 @@
this.$router.push({
name: "参保注销审核"
});
this.$router.back();
// 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) {
......@@ -304,6 +305,7 @@
message: res.message
});
}
this.$router.back();
// 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) {
......
xichongSys/src/views/Myvue/insuredReg.vue
View file @ b1c1a83a
......@@ -155,6 +155,7 @@ export default {
message: res.message
});
}
this.$router.back();
// 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) {
......@@ -216,6 +217,7 @@ export default {
message: res.message
});
}
this.$router.back();
// 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) {
......@@ -248,7 +250,7 @@ export default {
}).catch(() => {
this.$message({
type: 'info',
message: '取消输入'
message: '已取消输入'
});
});
},
......
xichongSys/src/views/Myvue/receivePersonnel.vue
View file @ b1c1a83a
......@@ -223,12 +223,12 @@
.idc {
margin-left: 20px;
/*min-width: 200px;*/
min-width: 200px;
}
.nam {
margin-left: 20px;
/*min-width: 200px;*/
min-width: 200px;
}
.grantState {
......
xichongSys/src/views/Myvue/supPaymentAudit.vue
View file @ b1c1a83a
......@@ -164,6 +164,7 @@
message: res.message
});
}
this.$router.back();
// 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) {
......@@ -223,6 +224,7 @@
message: res.message
});
}
this.$router.back();
// 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) {
......@@ -254,7 +256,7 @@
}).catch(() => {
this.$message({
type: 'info',
message: '取消输入'
message: '已取消输入'
});
});
},
......
xichongSys/src/views/Myvue/traRelationsAudit.vue
View file @ b1c1a83a
......@@ -152,6 +152,7 @@
message: res.message
});
}
this.$router.back();
// 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) {
......@@ -211,6 +212,7 @@
message: res.message
});
}
this.$router.back();
// 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) {
......@@ -242,7 +244,7 @@
}).catch(() => {
this.$message({
type: 'info',
message: '取消输入'
message: '已取消输入'
});
});
},
......
xichongSys/src/views/Myvue/treatmentApplicationAudit.vue
View file @ b1c1a83a
......@@ -86,6 +86,14 @@
</div>
</el-image>
</div>
<div class="block">
<p class="demonstration">个人照片</p>
<el-image :src="urls[4]">
<div slot="placeholder" class="image-slot">
加载中<span class="dot">...</span>
</div>
</el-image>
</div>
</div>
</div>
<div style="text-align:center;margin-bottom:40px" v-show="show">
......@@ -174,6 +182,7 @@
message: res.message
});
}
this.$router.back();
// 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) {
......@@ -234,6 +243,7 @@
message: res.message
});
}
this.$router.back();
// 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) {
......@@ -265,7 +275,7 @@
}).catch(() => {
this.$message({
type: 'info',
message: '取消输入'
message: '已取消输入'
});
});
},
......@@ -315,6 +325,11 @@
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/" + obj.signpic);
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/" + obj.idcardfrontpic);
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/" + obj.idcardbackpic);
if (this.form.personPhoto != null && this.form.personPhoto !== '') {
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/" + this.form.personPhoto);
} else {
this.urls.push("");
}
this.form.sex = this.form.sex === 1 ? "男" : "女";
}
}
......
xichongSys/src/views/Myvue/upgradeReoAudit.vue
View file @ b1c1a83a
......@@ -159,6 +159,7 @@
message: res.message
});
}
this.$router.back();
// 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) {
......@@ -218,6 +219,7 @@
message: res.message
});
}
this.$router.back();
// 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) {
......@@ -249,7 +251,7 @@
}).catch(() => {
this.$message({
type: 'info',
message: '取消输入'
message: '已取消输入'
});
});
},
......
xichongSys/src/views/Sys/Role.vue
View file @ b1c1a83a
......@@ -17,7 +17,7 @@
<!--表格内容栏-->
<kt-table :height="220" permsEdit="sys:role:edit" permsDelete="sys:role:delete" :highlightCurrentRow="true" :stripe="false"
:data="pageResult" :columns="columns" :showBatchDelete="false" @handleCurrentChange="handleRoleSelectChange"
@findPage="findPage" @handleEdit="handleEdit" @handleDelete="handleDelete">
@findPage="findPage" @handleEdit="handleEdit" @handleDelete="handleDelete" :showSeal="true">
</kt-table>
<!-- </el-col> -->
<!--新增编辑界面-->
......@@ -29,10 +29,32 @@
<el-form-item label="角色名" prop="name">
<el-input v-model="dataForm.name" auto-complete="off"></el-input>
</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-form-item>
<el-form-item label="签章" prop="seal" align="left">
<el-popover
v-if="dataForm.sealStr !== null && dataForm.sealStr != ''"
placement="left"
title=""
trigger="hover">
<img slot="reference" :src="'data:image/jpg;base64,' + dataForm.sealStr" height="50px" width="50px" class="head_pic">
<img :src="'data:image/jpg;base64,' + dataForm.sealStr" height="200px" width="200px" class="head_pic"/>
</el-popover>
<el-upload
align="left"
class="upload-demo"
ref="upload"
action=""
accept=".png,.jpg"
:on-change="changeSeal"
:limit="1"
:file-list="sealUrl"
:auto-upload="false">
<el-button slot="trigger" size="small" type="primary">选取文件</el-button>
<div slot="tip" class="el-upload__tip">只能上传jpg/png文件</div>
</el-upload>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :size="size" @click.native="dialogVisible = false">{{$t('action.cancel')}}</el-button>
......@@ -84,7 +106,8 @@ export default {
{prop:"name", label:"角色名", minWidth:120},
{prop:"remark", label:"备注", minWidth:120},
{prop:"createBy", label:"创建人", minWidth:120},
{prop:"createTime", label:"创建时间", minWidth:120, formatter:this.dateFormat}
{prop:"createTime", label:"创建时间", minWidth:120, formatter:this.dateFormat},
// {prop:"seal", label:"签章", minWidth:120}
// {prop:"lastUpdateBy", label:"更新人", minWidth:100},
// {prop:"lastUpdateTime", label:"更新时间", minWidth:120, formatter:this.dateFormat}
],
......@@ -103,7 +126,9 @@ export default {
dataForm: {
id: 0,
name: '',
remark: ''
remark: '',
seal: '',
sealStr: ''
},
selectRole: {},
menuData: [],
......@@ -115,7 +140,10 @@ export default {
defaultProps: {
children: 'children',
label: 'name'
}
},
sealUrl: [],
sealVisible: false,
imageUrl: '',
}
},
methods: {
......@@ -156,6 +184,7 @@ export default {
if (valid) {
this.$confirm('确认提交吗？', '提示', {}).then(() => {
this.editLoading = true
console.log(this.dataForm);
let params = Object.assign({}, this.dataForm)
this.$api.role.save(params).then((res) => {
this.editLoading = false
......@@ -270,8 +299,32 @@ export default {
// 时间格式化
       dateFormat: function (row, column, cellValue, index){
           return format(row[column.property])
       }
       },
changeSeal(file) {
var This = this;
this.sealUrl.length = 0;
this.sealUrl.push(file);
if (this.sealUrl.length > 0) {
var aa;
aa = this.convertImageToBase64();
console.log(aa);
console.log(this.dataForm);
}
},
convertImageToBase64() {
var This = this;
var base64;
let reader = new FileReader();
reader.readAsDataURL(this.sealUrl[0].raw);
reader.onload = function (e) {
console.log(this.result.substring(this.result.indexOf(",") + 1));
base64 = this.result.substring(this.result.indexOf(",") + 1);
This.sealUrl[0] = this.result.substring(this.result.indexOf(",") + 1);
}
console.log(This.sealUrl[0]);
console.log(base64);
return base64;
}
},
mounted() {
}
......@@ -289,4 +342,28 @@ export default {
color: rgb(20, 89, 121);
}
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
}
.avatar-uploader .el-upload:hover {
border-color: #409EFF;
}
.avatar-uploader-icon {
font-size: 28px;
color: #8c939d;
width: 178px;
height: 178px;
line-height: 178px;
text-align: center;
}
.avatar {
width: 178px;
height: 178px;
display: block;
}
</style>
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