hansha
/
szxc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
main
hansha 2 years ago
parent a015d2c8ed ffa39a1168
commit 640b38e929
3 changed files with 94 additions and 55 deletions
Show Stats Download Patch File Download Diff File

74
ruoyi-ui/src/views/szxc/jminfo/index.vue
Unescape View File

@ -286,17 +286,6 @@
v-hasPermi="['szxc:jminfo:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['szxc:jminfo:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
@ -409,7 +398,8 @@
<el-button
size="mini"
type="text"
@click="handleDelete(scope.row)"
v-if="scope.row.off==='0'"
@click="handleZx(scope.row)"
v-hasPermi="['szxc:jminfo:remove']"
>注销</el-button>
<el-button
@ -768,7 +758,7 @@
<el-dialog title="选择人员标签" :visible.sync="rybqInfo.visible" width="600px" append-to-body>
<div class="personnelTags">
<el-checkbox-group v-model="rybqInfo.checkListIds">
<el-checkbox v-for="item in rybqInfo.checkboxList" :key="item.id" :label="item.id" border>{{ item.tagName }}</el-checkbox>
<el-checkbox v-for="item in rybqInfo.checkboxList" :key="item.id" :label="item.id" border :disabled="item.checkEnable==='1'">{{ item.tagName }}</el-checkbox>
</el-checkbox-group>
</div>
<div slot="footer" class="dialog-footer">
@ -842,6 +832,27 @@
</div>
</el-dialog>
<!-- 注销对话框 -->
<el-dialog title="注销" :visible.sync="zxInfo.visible" width="500px" append-to-body>
<el-form ref="bankInfoForm" :model="zxInfo.form" :rules="zxInfo.rules" label-width="100px">
<el-form-item label="姓名" prop="name">
<el-input v-model="zxInfo.form.name" placeholder="请输入姓名" disabled/>
</el-form-item>
<el-form-item label="身份证号" prop="cardId">
<el-input v-model="zxInfo.form.cardId" placeholder="请输入身份证号" disabled/>
</el-form-item>
<el-form-item label="注销原因" prop="reason">
<el-input v-model="zxInfo.form.reason" type="textarea" placeholder="请输入注销原因" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="zxInfo.form.remark" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="zxInfoSubmit">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
@ -851,6 +862,7 @@ import { listAddress } from "@/api/szxc/address";
import { listJmtag, addAllJmtag } from "@/api/szxc/jmtag";
import { listTag } from "@/api/szxc/tag";
import { listBankinfo, editDefault, addBankinfo, updateBankinfo, delBankinfo } from "@/api/szxc/bankinfo";
import { addOffrecard } from "@/api/szxc/offrecard";
import { deptTreeSelect } from "@/api/system/user";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@ -1059,6 +1071,18 @@ export default {
],
},
},
// 注销登记
zxInfo: {
visible: false,
// 表单参数
form: {},
// 校验
rules: {
reason: [
{ required: true, message: "注销原因不能为空", trigger: "blur" }
],
}
}
};
},
created() {
@ -1196,16 +1220,6 @@ export default {
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除居民信息编号为"' + ids + '"的数据项？').then(function() {
return delJminfo(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('szxc/jminfo/export', {
@ -1390,6 +1404,20 @@ export default {
}
}
});
},
// 点击注销
handleZx(row){
this.zxInfo.form = row;
this.zxInfo.form.jmId = row.id;
this.zxInfo.visible = true;
},
// 注销提交
zxInfoSubmit(){
addOffrecard(this.zxInfo.form).then(response => {
this.$modal.msgSuccess("注销成功");
this.zxInfo.visible = false;
this.getList();
});
}
}
};

54
ruoyi-ui/src/views/szxc/offrecard/index.vue
Unescape View File

@ -1,14 +1,14 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="居民id" prop="jmId">
<!-- <el-form-item label="居民id" prop="jmId">
<el-input
v-model="queryParams.jmId"
placeholder="请输入居民id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item>-->
<el-form-item label="姓名" prop="name">
<el-input
v-model="queryParams.name"
@ -25,22 +25,22 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="注销原因" prop="reason">
<!-- <el-form-item label="注销原因" prop="reason">
<el-input
v-model="queryParams.reason"
placeholder="请输入注销原因"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建者ID" prop="userId">
</el-form-item>-->
<!-- <el-form-item label="创建者ID" prop="userId">
<el-input
v-model="queryParams.userId"
placeholder="请输入创建者ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -48,7 +48,7 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
@ -57,7 +57,7 @@
@click="handleAdd"
v-hasPermi="['szxc:offrecard:add']"
>新增</el-button>
</el-col>
</el-col>-->
<el-col :span="1.5">
<el-button
type="success"
@ -69,7 +69,7 @@
v-hasPermi="['szxc:offrecard:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="danger"
plain
@ -79,8 +79,8 @@
@click="handleDelete"
v-hasPermi="['szxc:offrecard:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
</el-col>-->
<!-- <el-col :span="1.5">
<el-button
type="warning"
plain
@ -89,19 +89,19 @@
@click="handleExport"
v-hasPermi="['szxc:offrecard:export']"
>导出</el-button>
</el-col>
</el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="offrecardList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="offrecardList" @selection-change="handleSelectionChange" border>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="id" align="center" prop="id" />
<el-table-column label="居民id" align="center" prop="jmId" />
<el-table-column label="ID" align="center" prop="id" />
<!-- <el-table-column label="居民id" align="center" prop="jmId" />-->
<el-table-column label="姓名" align="center" prop="name" />
<el-table-column label="身份证号" align="center" prop="cardId" />
<el-table-column label="注销原因" align="center" prop="reason" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="创建者ID" align="center" prop="userId" />
<!-- <el-table-column label="创建者ID" align="center" prop="userId" />-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -111,17 +111,17 @@
@click="handleUpdate(scope.row)"
v-hasPermi="['szxc:offrecard:edit']"
>修改</el-button>
<el-button
<!-- <el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['szxc:offrecard:remove']"
>删除</el-button>
>删除</el-button>-->
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -133,24 +133,24 @@
<!-- 添加或修改注销登记记录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="居民id" prop="jmId">
<!-- <el-form-item label="居民id" prop="jmId">
<el-input v-model="form.jmId" placeholder="请输入居民id" />
</el-form-item>
</el-form-item>-->
<el-form-item label="姓名" prop="name">
<el-input v-model="form.name" placeholder="请输入姓名" />
<el-input v-model="form.name" placeholder="请输入姓名" disabled/>
</el-form-item>
<el-form-item label="身份证号" prop="cardId">
<el-input v-model="form.cardId" placeholder="请输入身份证号" />
<el-input v-model="form.cardId" placeholder="请输入身份证号" disabled/>
</el-form-item>
<el-form-item label="注销原因" prop="reason">
<el-input v-model="form.reason" placeholder="请输入注销原因" />
<el-input v-model="form.reason" placeholder="请输入注销原因" type="textarea" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
<el-input v-model="form.remark" placeholder="请输入备注" type="textarea" />
</el-form-item>
<el-form-item label="创建者ID" prop="userId">
<!-- <el-form-item label="创建者ID" prop="userId">
<el-input v-model="form.userId" placeholder="请输入创建者ID" />
</el-form-item>
</el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>

21
ruoyi-ui/src/views/szxc/tag/index.vue
Unescape View File

@ -73,7 +73,11 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="标签ID" align="center" prop="id" />
<el-table-column label="标签名称" align="center" prop="tagName" />
<!-- <el-table-column label="部门id" align="center" prop="deptId" />-->
<el-table-column label="是否启用选择" align="center" prop="checkEnable" >
<template slot-scope="scope">
<dict-tag :options="dict.type.szxc_yes_no" :value="scope.row.checkEnable"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -104,13 +108,19 @@
<!-- 添加或修改人员标签对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="标签名称" prop="tagName">
<el-input v-model="form.tagName" placeholder="请输入标签名称" />
</el-form-item>
<!-- <el-form-item label="部门id" prop="deptId">
<el-input v-model="form.deptId" placeholder="请输入部门id" />
</el-form-item>-->
<el-form-item label="是否可选择">
<el-radio-group v-model="form.checkEnable">
<el-radio
v-for="dict in dict.type.szxc_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@ -125,6 +135,7 @@ import { listTag, getTag, delTag, addTag, updateTag } from "@/api/szxc/tag";
export default {
name: "Tag",
dicts: ['szxc_yes_no'],
data() {
return {
// 遮罩层

Write Preview
Loading…
Cancel
Save