页面修改

main
mo 1 year ago
parent 166c42ef80
commit 6b1c5cdd8c

@ -52,3 +52,23 @@ export function exportInvoicesExcel(query) {
responseType: 'blob' responseType: 'blob'
}) })
} }
// 下载模板
export function outTemplate() {
return request({
url: '/accounting/invoices/outTemplate',
method: 'get',
responseType: 'blob'
})
}
// 下载元数据
export function downloadXml(query) {
return request({
url: '/accounting/invoices/downloadXml',
method: 'get',
params: query,
responseType: 'blob'
})
}

@ -16,8 +16,9 @@ import './permission' // permission control
import './tongji' // 百度统计 import './tongji' // 百度统计
import { getDicts } from "@/api/system/dict/data"; import { getDicts } from "@/api/system/dict/data";
import { getConfigKey } from "@/api/infra/config"; import { getConfigKey } from "@/api/infra/config";
import { parseTime, resetForm, handleTree, addBeginAndEndTime, divide } from "@/utils/ruoyi"; import { parseTime,parseTime2, resetForm, handleTree, addBeginAndEndTime, divide } from "@/utils/ruoyi";
import Pagination from "@/components/Pagination"; import Pagination from "@/components/Pagination";
// 自定义表格工具扩展 // 自定义表格工具扩展
import RightToolbar from "@/components/RightToolbar" import RightToolbar from "@/components/RightToolbar"
// 代码高亮插件 // 代码高亮插件
@ -29,6 +30,7 @@ import { DICT_TYPE, getDictDataLabel, getDictDatas, getDictDatas2 } from "@/util
Vue.prototype.getDicts = getDicts Vue.prototype.getDicts = getDicts
Vue.prototype.getConfigKey = getConfigKey Vue.prototype.getConfigKey = getConfigKey
Vue.prototype.parseTime = parseTime Vue.prototype.parseTime = parseTime
Vue.prototype.parseTime2 = parseTime2
Vue.prototype.resetForm = resetForm Vue.prototype.resetForm = resetForm
Vue.prototype.getDictDatas = getDictDatas Vue.prototype.getDictDatas = getDictDatas
Vue.prototype.getDictDatas2 = getDictDatas2 Vue.prototype.getDictDatas2 = getDictDatas2
@ -38,6 +40,7 @@ Vue.prototype.handleTree = handleTree
Vue.prototype.addBeginAndEndTime = addBeginAndEndTime Vue.prototype.addBeginAndEndTime = addBeginAndEndTime
Vue.prototype.divide = divide Vue.prototype.divide = divide
// 全局组件挂载 // 全局组件挂载
Vue.component('DictTag', DictTag) Vue.component('DictTag', DictTag)
Vue.component('DocAlert', DocAlert) Vue.component('DocAlert', DocAlert)

@ -48,6 +48,46 @@ export function parseTime(time, pattern) {
return time_str return time_str
} }
// 日期格式化2 - 去除时分秒
export function parseTime2(time, pattern) {
if (arguments.length === 0 || !time) {
return null
}
const format = pattern || '{y}-{m}-{d}'
let date
if (typeof time === 'object') {
date = time
} else {
if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
time = parseInt(time)
} else if (typeof time === 'string') {
time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.\d{3}/gm),'');
}
if ((typeof time === 'number') && (time.toString().length === 10)) {
time = time * 1000
}
date = new Date(time)
}
const formatObj = {
y: date.getFullYear(),
m: date.getMonth() + 1,
d: date.getDate(),
a: date.getDay()
}
const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => {
let value = formatObj[key]
// Note: getDay() returns 0 on Sunday
if (key === 'a') {
return ['日', '一', '二', '三', '四', '五', '六'][value]
}
if (result.length > 0 && value < 10) {
value = '0' + value
}
return value || 0
})
return time_str
}
// 表单重置 // 表单重置
export function resetForm(refName) { export function resetForm(refName) {
if (this.$refs[refName]) { if (this.$refs[refName]) {

@ -9,6 +9,14 @@
v-show="showSearch" v-show="showSearch"
label-width="98px" label-width="98px"
> >
<el-form-item label="发票号码" prop="invoiceNum">
<el-input
v-model="queryParams.invoiceNum"
placeholder="请输入发票号码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="发票代码" prop="invoiceCode"> <el-form-item label="发票代码" prop="invoiceCode">
<el-input <el-input
v-model="queryParams.invoiceCode" v-model="queryParams.invoiceCode"
@ -17,36 +25,49 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="发票号码" prop="invoiceNum"> <el-form-item label="销方名称" prop="sellerName">
<el-input <el-input
v-model="queryParams.invoiceNum" v-model="queryParams.sellerName"
placeholder="请输入发票号码" placeholder="请输入销方名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="销方税号" prop="sellerRegisterNum">
<el-form-item label="发票种类" prop="invoiceType">
<el-input <el-input
v-model="queryParams.invoiceType" v-model="queryParams.sellerRegisterNum"
placeholder="请输入发票种类" placeholder="请输入销方税号"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="发票状态" prop="invoiceState"> <el-form-item label="购方名称" prop="purchaserName">
<el-select <el-input
v-model="queryParams.invoiceState" v-model="queryParams.purchaserName"
placeholder="请选择发票状态" placeholder="请输入购方名称"
> clearable
<el-option @keyup.enter.native="handleQuery"
v-for="item in invoiceStateOptions" />
:key="item.id" </el-form-item>
:value="item.value" <el-form-item label="购方税号" prop="purchaserRegisterNum">
:label="item.label" <el-input
> v-model="queryParams.purchaserRegisterNum"
</el-option> placeholder="请输入购方税号"
</el-select> clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="开票日期" prop="invoiceDate">
<el-date-picker
v-model="queryParams.invoiceDate"
style="width: 240px"
value-format="yyyy-MM-dd HH:mm:ss"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery" <el-button type="primary" icon="el-icon-search" @click="handleQuery"
@ -55,7 +76,6 @@
<el-button icon="el-icon-refresh" @click="resetQuery"></el-button> <el-button icon="el-icon-refresh" @click="resetQuery"></el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- 操作工具栏 --> <!-- 操作工具栏 -->
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
@ -81,19 +101,46 @@
>导出</el-button >导出</el-button
> >
</el-col> </el-col>
<el-col :span="1.5">
<el-button
type="info"
plain
icon="el-icon-upload2"
size="mini"
@click="handleImport"
v-hasPermi="['accounting:invoices:export']"
>导入</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-download"
size="mini"
@click="handleDownloadData"
v-hasPermi="['accounting:invoices:export']"
>下载元数据</el-button
>
</el-col>
<right-toolbar <right-toolbar
:showSearch.sync="showSearch" :showSearch.sync="showSearch"
@queryTable="getList" @queryTable="getList"
></right-toolbar> ></right-toolbar>
</el-row> </el-row>
<!-- tab栏列表切换 -->
<el-tabs v-model="accountingType" @tab-click="handleClick" type="card"> <el-tabs v-model="accountingType" @tab-click="handleClick" type="card">
<el-tab-pane label="进项" name="in"></el-tab-pane> <el-tab-pane label="进项" name="in"></el-tab-pane>
<el-tab-pane label="销项" name="out"></el-tab-pane> <el-tab-pane label="销项" name="out"></el-tab-pane>
</el-tabs> </el-tabs>
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list"> <el-table
<el-table-column label="查看" align="center" prop="fileUrl"> v-loading="loading"
:data="list"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="查看发票" align="center" prop="fileUrl">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="openLink(scope.row.fileUrl)"> <el-button type="text" @click="openLink(scope.row.fileUrl)">
{{ scope.row.fileUrl }} {{ scope.row.fileUrl }}
@ -114,14 +161,9 @@
align="center" align="center"
prop="amountinFiguers" prop="amountinFiguers"
/> />
<el-table-column label="开票人" align="center" prop="foteDrawer" /> <el-table-column label="销方名称" align="center" prop="sellerName" />
<el-table-column
label="销方地址电话"
align="center"
prop="sellerAddress"
/>
<el-table-column <el-table-column
label="销方识别号" label="销方税号"
align="center" align="center"
prop="sellerRegisterNum" prop="sellerRegisterNum"
/> />
@ -130,17 +172,12 @@
align="center" align="center"
prop="sellerBank" prop="sellerBank"
/> />
<el-table-column label="校验码" align="center" prop="checkCode" />
<el-table-column <el-table-column
label="开票日期" label="销方地址电话"
align="center" align="center"
prop="invoiceDate" prop="sellerAddress"
width="180" />
> <el-table-column label="购方名称" align="center" prop="purchaserName" />
<template v-slot="scope">
<span>{{ parseTime(scope.row.invoiceDate) }}</span>
</template>
</el-table-column>
<el-table-column <el-table-column
label="购方税号" label="购方税号"
align="center" align="center"
@ -151,17 +188,17 @@
align="center" align="center"
prop="purchaserBank" prop="purchaserBank"
/> />
<el-table-column label="复核人" align="center" prop="checker" />
<el-table-column label="购方公司名" align="center" prop="purchaserName" />
<el-table-column label="发票种类" align="center" prop="invoiceType">
</el-table-column>
<el-table-column <el-table-column
label="购方地址电话" label="购方地址电话"
align="center" align="center"
prop="purchaserAddress" prop="purchaserAddress"
/> />
<el-table-column label="发票种类" align="center" prop="invoiceType">
</el-table-column>
<el-table-column label="开票人" align="center" prop="foteDrawer" />
<el-table-column label="收款人" align="center" prop="payee" /> <el-table-column label="收款人" align="center" prop="payee" />
<el-table-column label="销方名称" align="center" prop="sellerName" /> <el-table-column label="复核人" align="center" prop="checker" />
<el-table-column label="校验码" align="center" prop="checkCode" />
<el-table-column label="发票状态" align="center" prop="invoiceState"> <el-table-column label="发票状态" align="center" prop="invoiceState">
<template v-slot="scope"> <template v-slot="scope">
<dict-tag <dict-tag
@ -170,14 +207,24 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
label="开票日期"
align="center"
prop="invoiceDate"
width="100"
>
<template v-slot="scope">
<span>{{ parseTime2(scope.row.invoiceDate) }}</span>
</template>
</el-table-column>
<el-table-column <el-table-column
label="作废日期" label="作废日期"
align="center" align="center"
prop="printNum" prop="printNum"
width="180" width="100"
> >
<template v-slot="scope"> <template v-slot="scope">
<span>{{ parseTime(scope.row.printNum) }}</span> <span>{{ parseTime2(scope.row.printNum) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="进销项" align="center" prop="inoutMark"> <el-table-column label="进销项" align="center" prop="inoutMark">
@ -248,7 +295,6 @@
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
<!-- 对话框(添加 / 修改) --> <!-- 对话框(添加 / 修改) -->
<el-dialog <el-dialog
:title="title" :title="title"
@ -273,7 +319,6 @@
只能上传图片PDFOFD文件 只能上传图片PDFOFD文件
</div> </div>
</el-upload> --> </el-upload> -->
<el-form ref="form" :model="form" :rules="rules" label-width="140px"> <el-form ref="form" :model="form" :rules="rules" label-width="140px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -472,10 +517,15 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="二维码查验" prop="qrCheckCode"> <el-form-item label="二维码查验" prop="qrCheckCode">
<el-input <el-select v-model="form.qrCheckCode" placeholder="请选择">
v-model="form.qrCheckCode" <el-option
placeholder="请输入二维码查验1查询相符,0查验不符" v-for="item in qrCheckCodeOptions"
/> :key="item.id"
:value="item.value"
:label="item.label"
>
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -560,6 +610,76 @@
<el-button @click="cancel"> </el-button> <el-button @click="cancel"> </el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 物料导入对话框 -->
<el-dialog
:title="upload.title"
:visible.sync="upload.open"
width="400px"
append-to-body
>
<el-upload
ref="upload"
:limit="1"
accept=".xlsx, .xls"
:headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport"
:disabled="upload.isUploading"
:on-progress="handleFileUploadProgress"
:on-success="handleFileSuccess"
:auto-upload="false"
drag
>
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip">
<div class="el-upload__tip" slot="tip">
<el-checkbox v-model="upload.updateSupport" />
是否更新已经存在的用户数据
</div>
<span>仅允许导入xlsxlsx格式文件</span>
<el-link
type="primary"
:underline="false"
style="font-size: 12px; vertical-align: baseline"
@click="importTemplate"
>下载模板</el-link
>
</div>
</el-upload>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitFileForm"> </el-button>
<el-button @click="upload.open = false"> </el-button>
</div>
</el-dialog>
<!-- 密码输入框-->
<el-dialog
:title="title"
:visible.sync="open1"
width="800px"
append-to-body
>
<el-form
ref="queryForm"
:model="queryParams"
:rules="rules"
label-width="140px"
>
<el-row>
<el-col :span="14">
<el-form-item label="密码" prop="inputPassword">
<el-input
v-model="queryParams.inputPassword"
placeholder="请输入密码"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm1"> </el-button>
<el-button @click="cancel1"> </el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
@ -571,6 +691,8 @@ import {
getInvoices, getInvoices,
getInvoicesPage, getInvoicesPage,
exportInvoicesExcel, exportInvoicesExcel,
outTemplate,
downloadXml,
} from "@/api/accounting/invoices"; } from "@/api/accounting/invoices";
import { listData } from "@/api/system/dict/data"; import { listData } from "@/api/system/dict/data";
import { getAccessToken } from "@/utils/auth"; import { getAccessToken } from "@/utils/auth";
@ -584,6 +706,7 @@ export default {
loading: true, loading: true,
// //
exportLoading: false, exportLoading: false,
downloadLoading: false,
// //
showSearch: true, showSearch: true,
// //
@ -592,8 +715,11 @@ export default {
list: [], list: [],
// //
title: "", title: "",
//
ids: [],
// //
open: false, open: false,
open1: false,
accountingType: "in", accountingType: "in",
fileList: [], fileList: [],
// //
@ -659,6 +785,7 @@ export default {
userId: null, userId: null,
remark: null, remark: null,
fileUrl: null, fileUrl: null,
inputPassword: null,
}, },
// //
form: {}, form: {},
@ -675,12 +802,33 @@ export default {
invoiceNum: [ invoiceNum: [
{ required: true, message: "发票号码不能为空", trigger: "blur" }, { required: true, message: "发票号码不能为空", trigger: "blur" },
], ],
inputPassword: [
{ required: true, message: "密码不能为空", trigger: "blur" },
],
},
//
upload: {
//
open: false,
//
title: "",
//
isUploading: false,
//
updateSupport: 0,
//
headers: { Authorization: "Bearer " + getAccessToken() },
//
url:
process.env.VUE_APP_BASE_API +
"/admin-api/accounting/invoices/inTemplate",
}, },
invoicesCheckOptions: [], // invoicesCheckOptions: [], //
invoicesDuplicateOptions: [], // invoicesDuplicateOptions: [], //
invoiceTypeOptions: [], // invoiceTypeOptions: [], //
invoiceStateOptions: [], // invoiceStateOptions: [], //
inOrOutOptions: [], // inOrOutOptions: [], //
qrCheckCodeOptions: [], //
}; };
}, },
created() { created() {
@ -695,6 +843,9 @@ export default {
this.reset(); this.reset();
}, },
handleScan(form) { handleScan(form) {
if (form.duplicateMark == 1) {
this.$message.error("该发票重复");
}
const num = form.duplicateMark.toString(); const num = form.duplicateMark.toString();
this.form = form; this.form = form;
this.form.duplicateMark = num; this.form.duplicateMark = num;
@ -770,6 +921,14 @@ export default {
}).then((res) => { }).then((res) => {
this.invoiceStateOptions = res.data.list || []; this.invoiceStateOptions = res.data.list || [];
}); });
//
listData({
pageNo: 1,
pageSize: 100,
dictType: "accounting_invoices_code_status",
}).then((res) => {
this.qrCheckCodeOptions = res.data.list || [];
});
}, },
// //
handleSuccess(res) { handleSuccess(res) {
@ -782,6 +941,10 @@ export default {
this.open = false; this.open = false;
this.reset(); this.reset();
}, },
/** 取消按钮 */
cancel1() {
this.open1 = false;
},
/** 表单重置 */ /** 表单重置 */
reset() { reset() {
this.form = { this.form = {
@ -857,6 +1020,11 @@ export default {
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();
}, },
//
handleSelectionChange(selection) {
this.ids = selection.map((item) => item.id);
this.multiple = !selection.length;
},
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();
@ -869,15 +1037,23 @@ export default {
this.reset(); this.reset();
const id = row.id; const id = row.id;
getInvoices(id).then((response) => { getInvoices(id).then((response) => {
const num1 = response.data.invoiceState.toString();
const num2 = response.data.inoutMark.toString();
const num3 = response.data.duplicateMark.toString();
const num4 = response.data.checkTrue.toString();
this.form = response.data; this.form = response.data;
this.form.invoiceState = num1; if (response.data.invoiceState != null) {
this.form.inoutMark = num2; const num1 = response.data.invoiceState.toString();
this.form.duplicateMark = num3; this.form.invoiceState = num1;
this.form.checkTrue = num4; }
if (response.data.inoutMark != null) {
const num2 = response.data.inoutMark.toString();
this.form.inoutMark = num2;
}
if (response.data.duplicateMark != null) {
const num3 = response.data.duplicateMark.toString();
this.form.duplicateMark = num3;
}
if (response.data.qrCheckCode != null) {
const num4 = response.data.qrCheckCode.toString();
this.form.qrCheckCode = num4;
}
this.open = true; this.open = true;
this.title = "修改发票"; this.title = "修改发票";
}); });
@ -937,6 +1113,52 @@ export default {
}) })
.catch(() => {}); .catch(() => {});
}, },
/** 导入按钮操作 */
handleImport() {
this.upload.title = "发票导入";
this.upload.open = true;
},
/** 下载模板操作 */
importTemplate() {
outTemplate().then((response) => {
this.$download.excel(response, "发票模板.zip");
});
},
//
handleFileUploadProgress(event, file, fileList) {
this.upload.isUploading = true;
},
//
handleFileSuccess(response, file, fileList) {
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
response.msg +
"</div>",
"导入结果",
{ dangerouslyUseHTMLString: true }
);
this.getList();
},
//
submitFileForm() {
this.$refs.upload.submit();
},
handleDownloadData() {
this.open1 = true;
this.queryParams.inputPassword = null;
},
submitForm1() {
//
let params = { ...this.queryParams };
downloadXml(params)
.then((response) => {
this.$download.excel(response, "元数据.xml");
})
.catch(() => {});
},
}, },
}; };
</script> </script>

@ -1,33 +1,85 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<el-form :model="queryParams" stripe border ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form
:model="queryParams"
stripe
border
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<div class="filter-box-new"> <div class="filter-box-new">
<div class="filter-lf"> <div class="filter-lf">
<el-form-item label="协议编号" prop="contractNo"> <el-form-item label="协议编号" prop="contractNo">
<el-input v-model="queryParams.contractNo" placeholder="请输入协议编号" clearable @keyup.enter.native="handleQuery" /> <el-input
v-model="queryParams.contractNo"
placeholder="请输入协议编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="协议名称" prop="contractName"> <el-form-item label="协议名称" prop="contractName">
<el-input v-model="queryParams.contractName" placeholder="请输入协议名称" clearable @keyup.enter.native="handleQuery" /> <el-input
v-model="queryParams.contractName"
placeholder="请输入协议名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="协议价格" prop="agreementAmt"> <el-form-item label="协议价格" prop="agreementAmt">
<el-input v-model="queryParams.agreementAmt" placeholder="请输入协议价格" clearable @keyup.enter.native="handleQuery" /> <el-input
v-model="queryParams.agreementAmt"
placeholder="请输入协议价格"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="甲方编码" prop="orgNo"> <el-form-item label="甲方编码" prop="orgNo">
<el-input v-model="queryParams.orgNo" placeholder="请输入甲方编码" clearable @keyup.enter.native="handleQuery" /> <el-input
v-model="queryParams.orgNo"
placeholder="请输入甲方编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="甲方名称" prop="orgName"> <el-form-item label="甲方名称" prop="orgName">
<el-input v-model="queryParams.orgName" placeholder="请输入甲方名称" clearable @keyup.enter.native="handleQuery" /> <el-input
v-model="queryParams.orgName"
placeholder="请输入甲方名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="乙方编码" prop="supplyNo"> <el-form-item label="乙方编码" prop="supplyNo">
<el-input v-model="queryParams.supplyNo" placeholder="请输入乙方编码" clearable @keyup.enter.native="handleQuery" /> <el-input
v-model="queryParams.supplyNo"
placeholder="请输入乙方编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="乙方名称" prop="supplyName"> <el-form-item label="乙方名称" prop="supplyName">
<el-input v-model="queryParams.supplyName" placeholder="请输入乙方名称" clearable @keyup.enter.native="handleQuery" /> <el-input
v-model="queryParams.supplyName"
placeholder="请输入乙方名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </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
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></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
>
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
@ -36,66 +88,217 @@
<!-- 操作工具栏 --> <!-- 操作工具栏 -->
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['ct:agreement:add']"></el-button> <el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['ct:agreement:add']"
>新增</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['ct:agreement:edit']"></el-button> <el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['ct:agreement:edit']"
>修改</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['ct:agreement:remove']"></el-button> <el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['ct:agreement:remove']"
>删除</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['ct:agreement:export']"></el-button> <el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['ct:agreement:export']"
>导出</el-button
>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" stripe border :data="agreementList" @selection-change="handleSelectionChange"> <el-table
v-loading="loading"
stripe
border
:data="agreementList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="协议编号" align="center" prop="contractNo" /> <el-table-column label="协议编号" align="center" prop="contractNo" />
<el-table-column label="协议名称" align="center" prop="contractName" /> <el-table-column label="协议名称" align="center" prop="contractName" />
<el-table-column label="应付款" align="center" prop="needCharge" /> <el-table-column label="应付款" align="center" prop="needCharge" />
<el-table-column label="预付款" align="center" prop="advanceCharge" /> <el-table-column label="预付款" align="center" prop="advanceCharge" />
<el-table-column label="协议价格" align="center" prop="agreementAmt" /> <el-table-column label="协议价格" align="center" prop="agreementAmt" />
<el-table-column label="定价基准" align="center" prop="pricingBenchmark" /> <el-table-column
label="定价基准"
align="center"
prop="pricingBenchmark"
/>
<el-table-column label="甲方名称" align="center" prop="orgName" /> <el-table-column label="甲方名称" align="center" prop="orgName" />
<el-table-column label="甲方法人" align="center" prop="orgFr" /> <el-table-column label="甲方法人" align="center" prop="orgFr" />
<el-table-column label="乙方名称" align="center" prop="supplyName" /> <el-table-column label="乙方名称" align="center" prop="supplyName" />
<el-table-column label="截至时间" align="center" prop="byTime"> <el-table-column label="截至时间" align="center" prop="byTime">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.byTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.byTime, "{y}-{m}-{d}") }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="告警" align="center" prop="ifNotice"> <el-table-column label="告警" align="center" prop="ifNotice">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-show="scope.row.ifNotice>0" style="color: red"></span> <span v-show="scope.row.ifNotice > 0" style="color: red"
<span v-show="scope.row.ifNotice==0" style="color: #f8ac59"></span> >已超期</span
<span v-show="scope.row.ifNotice<0" style="color: green"></span> >
<span v-show="scope.row.ifNotice == 0" style="color: #f8ac59"
>将要超期</span
>
<span v-show="scope.row.ifNotice < 0" style="color: green"
>未超期</span
>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单据状态" align="center" prop="status" width="180"> <el-table-column
label="单据状态"
align="center"
prop="status"
width="180"
>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.oa_flow_billstatus" :value="scope.row.status" /> <dict-tag
:options="dict.type.oa_flow_billstatus"
:value="scope.row.status"
/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300"> <el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
width="300"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" v-show="scope.row.status=='0' || scope.row.status=='3'" icon="el-icon-edit" @click="bindTpl(scope.row)" v-hasPermi="['ct:agreementTpl:edit']"></el-button> <el-button
<el-button size="mini" type="text" icon="el-icon-edit" @click="preview(scope.row)" v-hasPermi="['ct:agreementTpl:edit']"></el-button> size="mini"
<el-button size="mini" type="text" icon="el-icon-edit" @click="doBuildFile(scope.row)" v-hasPermi="['ct:agreementTpl:edit']">word</el-button> type="text"
<el-button size="mini" type="text" icon="el-icon-edit" @click="dlAgreement(scope.row)" v-hasPermi="['ct:agreementTpl:edit']"></el-button> v-show="scope.row.status == '0' || scope.row.status == '3'"
<el-button size="mini" type="text" v-show="scope.row.status=='0' || scope.row.status=='3'" icon="el-icon-edit" @click="doSubmitFlow(scope.row)" v-hasPermi="['ct:agreementTpl:edit']"></el-button> icon="el-icon-edit"
<el-button size="mini" type="text" v-show="scope.row.status=='0' || scope.row.status=='3'" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['ct:agreement:edit']"></el-button> @click="bindTpl(scope.row)"
<el-button size="mini" type="text" v-show="scope.row.status=='0' || scope.row.status=='3'" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['ct:agreement:remove']"></el-button> v-hasPermi="['ct:agreementTpl:edit']"
<el-button size="mini" type="text" v-show="scope.row.status=='1'" icon="el-icon-edit" @click="doCancleFlow(scope.row)" v-hasPermi="['ct:agreementTpl:edit']" style="color: #ff6666"></el-button> >绑定模版</el-button
<el-button size="mini" type="text" v-show="scope.row.status=='1'||scope.row.status=='2'||scope.row.status=='3'" icon="el-icon-edit" @click="flowDetail(scope.row)" v-hasPermi="['ct:agreementTpl:edit']"></el-button> >
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="preview(scope.row)"
v-hasPermi="['ct:agreementTpl:edit']"
>预览</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="doBuildFile(scope.row)"
v-hasPermi="['ct:agreementTpl:edit']"
>生成word</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="dlAgreement(scope.row)"
v-hasPermi="['ct:agreementTpl:edit']"
>下载文件</el-button
>
<el-button
size="mini"
type="text"
v-show="scope.row.status == '0' || scope.row.status == '3'"
icon="el-icon-edit"
@click="doSubmitFlow(scope.row)"
v-hasPermi="['ct:agreementTpl:edit']"
>提交审批</el-button
>
<el-button
size="mini"
type="text"
v-show="scope.row.status == '0' || scope.row.status == '3'"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['ct:agreement:edit']"
>修改</el-button
>
<el-button
size="mini"
type="text"
v-show="scope.row.status == '0' || scope.row.status == '3'"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['ct:agreement:remove']"
>删除</el-button
>
<el-button
size="mini"
type="text"
v-show="scope.row.status == '1'"
icon="el-icon-edit"
@click="doCancleFlow(scope.row)"
v-hasPermi="['ct:agreementTpl:edit']"
style="color: #ff6666"
>撤销申请</el-button
>
<el-button
size="mini"
type="text"
v-show="
scope.row.status == '1' ||
scope.row.status == '2' ||
scope.row.status == '3'
"
icon="el-icon-edit"
@click="flowDetail(scope.row)"
v-hasPermi="['ct:agreementTpl:edit']"
>流程信息</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-card>
<pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" /> <pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改补充协议对话框 --> <!-- 添加或修改补充协议对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body> <el-dialog
:title="title"
:visible.sync="open"
width="1200px"
append-to-body
>
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="协议编号" prop="contractNo"> <el-form-item label="协议编号" prop="contractNo">
<el-input v-model="form.contractNo" placeholder="请输入协议编号" /> <el-input v-model="form.contractNo" placeholder="请输入协议编号" />
@ -125,7 +328,10 @@
<el-input v-model="form.referencePrice" placeholder="请输入参考价" /> <el-input v-model="form.referencePrice" placeholder="请输入参考价" />
</el-form-item> </el-form-item>
<el-form-item label="定价基准" prop="pricingBenchmark"> <el-form-item label="定价基准" prop="pricingBenchmark">
<el-input v-model="form.pricingBenchmark" placeholder="请输入定价基准" /> <el-input
v-model="form.pricingBenchmark"
placeholder="请输入定价基准"
/>
</el-form-item> </el-form-item>
<el-form-item label="甲方编码" prop="orgNo"> <el-form-item label="甲方编码" prop="orgNo">
<el-input v-model="form.orgNo" placeholder="请输入甲方编码" /> <el-input v-model="form.orgNo" placeholder="请输入甲方编码" />
@ -170,10 +376,21 @@
<!-- <el-input v-model="form.spOkDt" placeholder="请输入乙方签证"/>--> <!-- <el-input v-model="form.spOkDt" placeholder="请输入乙方签证"/>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="补充" prop="other"> <el-form-item label="补充" prop="other">
<el-input v-model="form.other" type="textarea" :rows="5" placeholder="请输入内容" /> <el-input
v-model="form.other"
type="textarea"
:rows="5"
placeholder="请输入内容"
/>
</el-form-item> </el-form-item>
<el-form-item label="截止时间" prop="other"> <el-form-item label="截止时间" prop="other">
<el-date-picker clearable v-model="form.byTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择截止时间"></el-date-picker> <el-date-picker
clearable
v-model="form.byTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择截止时间"
></el-date-picker>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -182,36 +399,55 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog title="绑定模版" :visible.sync="showBindTpl" width="1000px" append-to-body> <el-dialog
<SelectAgreementTpl @selectedAgreementTpl="selectedAgreementTpl"></SelectAgreementTpl> title="绑定模版"
:visible.sync="showBindTpl"
width="1000px"
append-to-body
>
<SelectAgreementTpl
@selectedAgreementTpl="selectedAgreementTpl"
></SelectAgreementTpl>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="showBindTpl = false"> </el-button> <el-button @click="showBindTpl = false"> </el-button>
<el-button type="primary" @click="doBindTplUpdate"> </el-button> <el-button type="primary" @click="doBindTplUpdate"> </el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog title="预览协议" :visible.sync="showAgreemwnt" width="1200px" append-to-body> <el-dialog
title="预览协议"
:visible.sync="showAgreemwnt"
width="1200px"
append-to-body
>
<div v-html="previewContent"></div> <div v-html="previewContent"></div>
</el-dialog> </el-dialog>
<!-- <el-dialog title="流程信息" :visible.sync="showFlowInfo" width="1200px" append-to-body> <!-- <el-dialog title="流程信息" :visible.sync="showFlowInfo" width="1200px" append-to-body>
<FlowInfo :businessId="businessId" billType="agreement" v-if="showFlowInfo"></FlowInfo> <FlowInfo :businessId="businessId" billType="agreement" v-if="showFlowInfo"></FlowInfo>
</el-dialog> --> </el-dialog> -->
</div> </div>
</template> </template>
<script> <script>
import { addAgreement, buildFile, delAgreement, getAgreement, listAgreement, previewAgreemwnt, updateAgreement } from "@/api/ct/agreement"; import {
addAgreement,
buildFile,
delAgreement,
getAgreement,
listAgreement,
previewAgreemwnt,
updateAgreement,
} from "@/api/ct/agreement";
// import {submitFlow,cancleFlow} from "@/api/oa/processInstance"; // import {submitFlow,cancleFlow} from "@/api/oa/processInstance";
import SelectAgreementTpl from "@/views/ct/agreementTpl/selectAgreementTpl"; import SelectAgreementTpl from "@/views/ct/agreementTpl/selectAgreementTpl";
// import FlowInfo from "@/views/oa/flow/flowInfo"; // import FlowInfo from "@/views/oa/flow/flowInfo";
export default { export default {
name: "Agreement", name: "Agreement",
dicts: ['oa_customform_category', 'oa_flow_billstatus'], dicts: ["oa_customform_category", "oa_flow_billstatus"],
components: { components: {
SelectAgreementTpl SelectAgreementTpl,
}, },
data() { data() {
return { return {
@ -277,7 +513,7 @@ export default {
previewContent: "", previewContent: "",
showFlowInfo: false, showFlowInfo: false,
insId: "", insId: "",
businessId: "" businessId: "",
}; };
}, },
created() { created() {
@ -287,7 +523,7 @@ export default {
/** 查询补充协议列表 */ /** 查询补充协议列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listAgreement(this.queryParams).then(response => { listAgreement(this.queryParams).then((response) => {
this.agreementList = response.rows; this.agreementList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -335,7 +571,7 @@ export default {
updateTime: null, updateTime: null,
bindAgreementId: null, bindAgreementId: null,
selectedTplId: null, selectedTplId: null,
selectedTplName: "" selectedTplName: "",
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -351,9 +587,9 @@ export default {
}, },
// //
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id) this.ids = selection.map((item) => item.id);
this.single = selection.length !== 1 this.single = selection.length !== 1;
this.multiple = !selection.length this.multiple = !selection.length;
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
@ -364,8 +600,8 @@ export default {
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const id = row.id || this.ids const id = row.id || this.ids;
getAgreement(id).then(response => { getAgreement(id).then((response) => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改补充协议"; this.title = "修改补充协议";
@ -373,16 +609,16 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {
updateAgreement(this.form).then(response => { updateAgreement(this.form).then((response) => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addAgreement(this.form).then(response => { addAgreement(this.form).then((response) => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
@ -394,20 +630,27 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除补充协议编号为"' + ids + '"的数据项?').then(function () { this.$modal
return delAgreement(ids); .confirm('是否确认删除补充协议编号为"' + ids + '"的数据项?')
}).then(() => { .then(function () {
this.getList(); return delAgreement(ids);
this.$modal.msgSuccess("删除成功"); })
}).catch(() => { .then(() => {
}); this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('ct/agreement/export', { this.download(
...this.queryParams "ct/agreement/export",
}, `agreement_${new Date().getTime()}.xlsx`) {
...this.queryParams,
},
`agreement_${new Date().getTime()}.xlsx`
);
}, },
/** 绑定模版 ***/ /** 绑定模版 ***/
bindTpl(row) { bindTpl(row) {
@ -420,11 +663,11 @@ export default {
this.selectedTplName = sel.name; this.selectedTplName = sel.name;
}, },
doBindTplUpdate() { doBindTplUpdate() {
let form = {} let form = {};
form.id = this.bindAgreementId; form.id = this.bindAgreementId;
form.tplId = this.selectedTplId; form.tplId = this.selectedTplId;
form.tplName = this.selectedTplName; form.tplName = this.selectedTplName;
updateAgreement(form).then(response => { updateAgreement(form).then((response) => {
this.$modal.msgSuccess("绑定成功"); this.$modal.msgSuccess("绑定成功");
this.open = false; this.open = false;
this.getList(); this.getList();
@ -437,23 +680,23 @@ export default {
this.$modal.msgError("未绑定协议模板,请先绑定协议模板!!"); this.$modal.msgError("未绑定协议模板,请先绑定协议模板!!");
return; return;
} }
previewAgreemwnt(row.id).then(res => { previewAgreemwnt(row.id).then((res) => {
if (200 == res.code) { if (200 == res.code) {
this.previewContent = res.data; this.previewContent = res.data;
this.showAgreemwnt = true; this.showAgreemwnt = true;
} }
}) });
}, },
/** 生成文件 **/ /** 生成文件 **/
doBuildFile(row) { doBuildFile(row) {
buildFile(row.id).then(res => { buildFile(row.id).then((res) => {
if (200 == res.code) { if (200 == res.code) {
this.$modal.msgSuccess("生成成功"); this.$modal.msgSuccess("生成成功");
this.getList(); this.getList();
} else { } else {
this.$modal.msgError("生成失败"); this.$modal.msgError("生成失败");
} }
}) });
}, },
/** 下载协议 ***/ /** 下载协议 ***/
dlAgreement(row) { dlAgreement(row) {
@ -467,30 +710,33 @@ export default {
} }
let data = { let data = {
businessId: row.id, businessId: row.id,
billType: row.billType billType: row.billType,
} };
this.$modal.confirm('确认要提交该协议进行审批吗?').then(function () { this.$modal
return submitFlow(data); .confirm("确认要提交该协议进行审批吗?")
}).then(() => { .then(function () {
this.getList(); return submitFlow(data);
this.$modal.msgSuccess("提交成功"); })
}).catch(() => { .then(() => {
}); this.getList();
this.$modal.msgSuccess("提交成功");
})
.catch(() => {});
}, },
/** 取回审批 ***/ /** 取回审批 ***/
doCancleFlow(row) { doCancleFlow(row) {
let data = { let data = {
businessId: row.id, businessId: row.id,
billType: row.billType billType: row.billType,
} };
this.$modal.confirm('确认要取回该协议审批吗?').then(() => { this.$modal.confirm("确认要取回该协议审批吗?").then(() => {
cancleFlow(data).then(res => { cancleFlow(data).then((res) => {
if (200 == res.code) { if (200 == res.code) {
this.getList(); this.getList();
this.$modal.msgSuccess("取回成功"); this.$modal.msgSuccess("取回成功");
} }
}); });
}) });
}, },
/** 流程信息 ***/ /** 流程信息 ***/
flowDetail(row) { flowDetail(row) {
@ -498,11 +744,11 @@ export default {
// this.billType = row.billType; // this.billType = row.billType;
this.showFlowInfo = true; this.showFlowInfo = true;
}, },
} },
}; };
</script> </script>
<style lang='scss' scoped> <style lang="scss" scoped>
@import '@/assets/styles/header/index.scss'; @import "@/assets/styles/header/index.scss";
@import '@/assets/styles/common/index.scss'; @import "@/assets/styles/common/index.scss";
</style> </style>

@ -2,99 +2,275 @@
<div class="app-container"> <div class="app-container">
<doc-alert title="用户体系" url="https://doc.iocoder.cn/user-center/" /> <doc-alert title="用户体系" url="https://doc.iocoder.cn/user-center/" />
<doc-alert title="三方登陆" url="https://doc.iocoder.cn/social-user/" /> <doc-alert title="三方登陆" url="https://doc.iocoder.cn/social-user/" />
<doc-alert title="Excel 导入导出" url="https://doc.iocoder.cn/excel-import-and-export/" /> <doc-alert
title="Excel 导入导出"
url="https://doc.iocoder.cn/excel-import-and-export/"
/>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-row :gutter="20"> <el-row :gutter="20">
<!--部门数据--> <!--部门数据-->
<el-col :span="4" :xs="24"> <el-col :span="4" :xs="24">
<div class="head-container"> <div class="head-container">
<el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search" style="margin-bottom: 20px"/> <el-input
v-model="deptName"
placeholder="请输入部门名称"
clearable
size="small"
prefix-icon="el-icon-search"
style="margin-bottom: 20px"
/>
</div> </div>
<div class="head-container"> <div class="head-container">
<el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode" <el-tree
ref="tree" default-expand-all highlight-current @node-click="handleNodeClick"/> :data="deptOptions"
:props="defaultProps"
:expand-on-click-node="false"
:filter-node-method="filterNode"
ref="tree"
default-expand-all
highlight-current
@node-click="handleNodeClick"
/>
</div> </div>
</el-col> </el-col>
<!--用户数据--> <!--用户数据-->
<el-col :span="20" :xs="24"> <el-col :span="20" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="用户名称" prop="username"> <el-form-item label="用户名称" prop="username">
<el-input v-model="queryParams.username" placeholder="请输入用户名称" clearable style="width: 240px" <el-input
@keyup.enter.native="handleQuery"/> v-model="queryParams.username"
placeholder="请输入用户名称"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="手机号码" prop="mobile"> <el-form-item label="手机号码" prop="mobile">
<el-input v-model="queryParams.mobile" placeholder="请输入手机号码" clearable style="width: 240px" <el-input
@keyup.enter.native="handleQuery"/> v-model="queryParams.mobile"
placeholder="请输入手机号码"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px"> <el-select
<el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/> v-model="queryParams.status"
placeholder="用户状态"
clearable
style="width: 240px"
>
<el-option
v-for="dict in statusDictDatas"
:key="parseInt(dict.value)"
:label="dict.label"
:value="parseInt(dict.value)"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="创建时间" prop="createTime"> <el-form-item label="创建时间" prop="createTime">
<el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange" <el-date-picker
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" /> v-model="queryParams.createTime"
style="width: 240px"
value-format="yyyy-MM-dd HH:mm:ss"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery"
<el-button icon="el-icon-refresh" @click="resetQuery"></el-button> >搜索</el-button
>
<el-button icon="el-icon-refresh" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button
v-hasPermi="['system:user:create']">新增</el-button> type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:user:create']"
>新增</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="info" icon="el-icon-upload2" size="mini" @click="handleImport" <el-button
v-hasPermi="['system:user:import']">导入</el-button> type="info"
icon="el-icon-upload2"
size="mini"
@click="handleImport"
v-hasPermi="['system:user:import']"
>导入</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" <el-button
v-hasPermi="['system:user:export']">导出</el-button> type="warning"
icon="el-icon-download"
size="mini"
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['system:user:export']"
>导出</el-button
>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar> <right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
:columns="columns"
></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="userList"> <el-table v-loading="loading" :data="userList">
<el-table-column label="用户编号" align="center" key="id" prop="id" v-if="columns[0].visible" /> <el-table-column
<el-table-column label="用户名称" align="center" key="username" prop="username" v-if="columns[1].visible" :show-overflow-tooltip="true" /> label="用户编号"
<el-table-column label="用户昵称" align="center" key="nickname" prop="nickname" v-if="columns[2].visible" :show-overflow-tooltip="true" /> align="center"
<el-table-column label="部门" align="center" key="deptName" prop="dept.name" v-if="columns[3].visible" :show-overflow-tooltip="true" /> key="id"
<el-table-column label="手机号码" align="center" key="mobile" prop="mobile" v-if="columns[4].visible" width="120" /> prop="id"
<el-table-column label="状态" key="status" v-if="columns[5].visible" align="center"> v-if="columns[0].visible"
/>
<el-table-column
label="用户名称"
align="center"
key="username"
prop="username"
v-if="columns[1].visible"
:show-overflow-tooltip="true"
/>
<el-table-column
label="用户昵称"
align="center"
key="nickname"
prop="nickname"
v-if="columns[2].visible"
:show-overflow-tooltip="true"
/>
<el-table-column
label="部门"
align="center"
key="deptName"
prop="dept.name"
v-if="columns[3].visible"
:show-overflow-tooltip="true"
/>
<el-table-column
label="手机号码"
align="center"
key="mobile"
prop="mobile"
v-if="columns[4].visible"
width="120"
/>
<el-table-column
label="状态"
key="status"
v-if="columns[5].visible"
align="center"
>
<template v-slot="scope"> <template v-slot="scope">
<el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)" /> <el-switch
v-model="scope.row.status"
:active-value="0"
:inactive-value="1"
@change="handleStatusChange(scope.row)"
/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160"> <el-table-column
label="创建时间"
align="center"
prop="createTime"
v-if="columns[6].visible"
width="160"
>
<template v-slot="scope"> <template v-slot="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width"> <el-table-column
label="操作"
align="center"
width="160"
class-name="small-padding fixed-width"
>
<template v-slot="scope"> <template v-slot="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button
v-hasPermi="['system:user:update']">修改</el-button> size="mini"
<el-dropdown @command="(command) => handleCommand(command, scope.$index, scope.row)" type="text"
v-hasPermi="['system:user:delete', 'system:user:update-password', 'system:permission:assign-user-role']"> icon="el-icon-edit"
<el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button> @click="handleUpdate(scope.row)"
v-hasPermi="['system:user:update']"
>修改</el-button
>
<el-dropdown
@command="
(command) => handleCommand(command, scope.$index, scope.row)
"
v-hasPermi="[
'system:user:delete',
'system:user:update-password',
'system:permission:assign-user-role',
]"
>
<el-button size="mini" type="text" icon="el-icon-d-arrow-right"
>更多</el-button
>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item command="handleDelete" v-if="scope.row.id !== 1" size="mini" type="text" icon="el-icon-delete" <el-dropdown-item
v-hasPermi="['system:user:delete']">删除</el-dropdown-item> command="handleDelete"
<el-dropdown-item command="handleResetPwd" size="mini" type="text" icon="el-icon-key" v-if="scope.row.id !== 1"
v-hasPermi="['system:user:update-password']">重置密码</el-dropdown-item> size="mini"
<el-dropdown-item command="handleRole" size="mini" type="text" icon="el-icon-circle-check" type="text"
v-hasPermi="['system:permission:assign-user-role']">分配角色</el-dropdown-item> icon="el-icon-delete"
v-hasPermi="['system:user:delete']"
>删除</el-dropdown-item
>
<el-dropdown-item
command="handleResetPwd"
size="mini"
type="text"
icon="el-icon-key"
v-hasPermi="['system:user:update-password']"
>重置密码</el-dropdown-item
>
<el-dropdown-item
command="handleRole"
size="mini"
type="text"
icon="el-icon-circle-check"
v-hasPermi="['system:permission:assign-user-role']"
>分配角色</el-dropdown-item
>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" <pagination
@pagination="getList"/> v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</el-col> </el-col>
</el-row> </el-row>
@ -109,32 +285,59 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="归属部门" prop="deptId"> <el-form-item label="归属部门" prop="deptId">
<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :clearable="false" <treeselect
placeholder="请选择归属部门" :normalizer="normalizer"/> v-model="form.deptId"
:options="deptOptions"
:show-count="true"
:clearable="false"
placeholder="请选择归属部门"
:normalizer="normalizer"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="手机号码" prop="mobile"> <el-form-item label="手机号码" prop="mobile">
<el-input v-model="form.mobile" placeholder="请输入手机号码" maxlength="11" /> <el-input
v-model="form.mobile"
placeholder="请输入手机号码"
maxlength="11"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="邮箱" prop="email"> <el-form-item label="邮箱" prop="email">
<el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" /> <el-input
v-model="form.email"
placeholder="请输入邮箱"
maxlength="50"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="form.id === undefined" label="用户名称" prop="username"> <el-form-item
v-if="form.id === undefined"
label="用户名称"
prop="username"
>
<el-input v-model="form.username" placeholder="请输入用户名称" /> <el-input v-model="form.username" placeholder="请输入用户名称" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="form.id === undefined" label="用户密码" prop="password"> <el-form-item
<el-input v-model="form.password" placeholder="请输入用户密码" type="password" show-password /> v-if="form.id === undefined"
label="用户密码"
prop="password"
>
<el-input
v-model="form.password"
placeholder="请输入用户密码"
type="password"
show-password
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -142,7 +345,12 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="用户性别"> <el-form-item label="用户性别">
<el-select v-model="form.sex" placeholder="请选择"> <el-select v-model="form.sex" placeholder="请选择">
<el-option v-for="dict in sexDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/> <el-option
v-for="dict in sexDictDatas"
:key="parseInt(dict.value)"
:label="dict.label"
:value="parseInt(dict.value)"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -150,10 +358,10 @@
<el-form-item label="岗位"> <el-form-item label="岗位">
<el-select v-model="form.postIds" multiple placeholder="请选择"> <el-select v-model="form.postIds" multiple placeholder="请选择">
<el-option <el-option
v-for="item in postOptions" v-for="item in postOptions"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -162,7 +370,11 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注"> <el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input> <el-input
v-model="form.remark"
type="textarea"
placeholder="请输入内容"
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -174,18 +386,39 @@
</el-dialog> </el-dialog>
<!-- 用户导入对话框 --> <!-- 用户导入对话框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body> <el-dialog
<el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :title="upload.title"
:action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" :visible.sync="upload.open"
:on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag> width="400px"
append-to-body
>
<el-upload
ref="upload"
:limit="1"
accept=".xlsx, .xls"
:headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport"
:disabled="upload.isUploading"
:on-progress="handleFileUploadProgress"
:on-success="handleFileSuccess"
:auto-upload="false"
drag
>
<i class="el-icon-upload"></i> <i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处<em>点击上传</em></div> <div class="el-upload__text">将文件拖到此处<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip"> <div class="el-upload__tip text-center" slot="tip">
<div class="el-upload__tip" slot="tip"> <div class="el-upload__tip" slot="tip">
<el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据 <el-checkbox v-model="upload.updateSupport" />
是否更新已经存在的用户数据
</div> </div>
<span>仅允许导入xlsxlsx格式文件</span> <span>仅允许导入xlsxlsx格式文件</span>
<el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate"></el-link> <el-link
type="primary"
:underline="false"
style="font-size: 12px; vertical-align: baseline"
@click="importTemplate"
>下载模板</el-link
>
</div> </div>
</el-upload> </el-upload>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -195,7 +428,12 @@
</el-dialog> </el-dialog>
<!-- 分配角色 --> <!-- 分配角色 -->
<el-dialog title="分配角色" :visible.sync="openRole" width="500px" append-to-body> <el-dialog
title="分配角色"
:visible.sync="openRole"
width="500px"
append-to-body
>
<el-form :model="form" label-width="80px"> <el-form :model="form" label-width="80px">
<el-form-item label="用户名称"> <el-form-item label="用户名称">
<el-input v-model="form.username" :disabled="true" /> <el-input v-model="form.username" :disabled="true" />
@ -206,10 +444,10 @@
<el-form-item label="角色"> <el-form-item label="角色">
<el-select v-model="form.roleIds" multiple placeholder="请选择"> <el-select v-model="form.roleIds" multiple placeholder="请选择">
<el-option <el-option
v-for="item in roleOptions" v-for="item in roleOptions"
:key="parseInt(item.id)" :key="parseInt(item.id)"
:label="item.name" :label="item.name"
:value="parseInt(item.id)" :value="parseInt(item.id)"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -219,7 +457,6 @@
<el-button @click="cancelRole"> </el-button> <el-button @click="cancelRole"> </el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -233,19 +470,19 @@ import {
importTemplate, importTemplate,
listUser, listUser,
resetUserPwd, resetUserPwd,
updateUser updateUser,
} from "@/api/system/user"; } from "@/api/system/user";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import {listSimpleDepts} from "@/api/system/dept"; import { listSimpleDepts } from "@/api/system/dept";
import {listSimplePosts} from "@/api/system/post"; import { listSimplePosts } from "@/api/system/post";
import {CommonStatusEnum} from "@/utils/constants"; import { CommonStatusEnum } from "@/utils/constants";
import {DICT_TYPE, getDictDatas} from "@/utils/dict"; import { DICT_TYPE, getDictDatas } from "@/utils/dict";
import {assignUserRole, listUserRoles} from "@/api/system/permission"; import { assignUserRole, listUserRoles } from "@/api/system/permission";
import {listSimpleRoles} from "@/api/system/role"; import { listSimpleRoles } from "@/api/system/role";
import {getBaseHeader} from "@/utils/request"; import { getBaseHeader } from "@/utils/request";
export default { export default {
name: "SystemUser", name: "SystemUser",
@ -282,7 +519,7 @@ export default {
form: {}, form: {},
defaultProps: { defaultProps: {
children: "children", children: "children",
label: "name" label: "name",
}, },
// //
upload: { upload: {
@ -297,7 +534,7 @@ export default {
// //
headers: getBaseHeader(), headers: getBaseHeader(),
// //
url: process.env.VUE_APP_BASE_API + '/admin-api/system/user/import' url: process.env.VUE_APP_BASE_API + "/admin-api/system/user/import",
}, },
// //
queryParams: { queryParams: {
@ -307,7 +544,7 @@ export default {
mobile: undefined, mobile: undefined,
status: undefined, status: undefined,
deptId: undefined, deptId: undefined,
createTime: [] createTime: [],
}, },
// //
columns: [ columns: [
@ -317,33 +554,34 @@ export default {
{ key: 3, label: `部门`, visible: true }, { key: 3, label: `部门`, visible: true },
{ key: 4, label: `手机号码`, visible: true }, { key: 4, label: `手机号码`, visible: true },
{ key: 5, label: `状态`, visible: true }, { key: 5, label: `状态`, visible: true },
{ key: 6, label: `创建时间`, visible: true } { key: 6, label: `创建时间`, visible: true },
], ],
// //
rules: { rules: {
username: [ username: [
{ required: true, message: "用户名称不能为空", trigger: "blur" } { required: true, message: "用户名称不能为空", trigger: "blur" },
], ],
nickname: [ nickname: [
{ required: true, message: "用户昵称不能为空", trigger: "blur" } { required: true, message: "用户昵称不能为空", trigger: "blur" },
], ],
password: [ password: [
{ required: true, message: "用户密码不能为空", trigger: "blur" } { required: true, message: "用户密码不能为空", trigger: "blur" },
], ],
email: [ email: [
{ {
type: "email", type: "email",
message: "'请输入正确的邮箱地址", message: "'请输入正确的邮箱地址",
trigger: ["blur", "change"] trigger: ["blur", "change"],
} },
], ],
mobile: [ mobile: [
{ {
pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/, pattern:
/^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,
message: "请输入正确的手机号码", message: "请输入正确的手机号码",
trigger: "blur" trigger: "blur",
} },
] ],
}, },
// //
openRole: false, openRole: false,
@ -359,7 +597,7 @@ export default {
// //
deptName(val) { deptName(val) {
this.$refs.tree.filter(val); this.$refs.tree.filter(val);
} },
}, },
created() { created() {
this.getList(); this.getList();
@ -372,16 +610,16 @@ export default {
// //
handleCommand(command, index, row) { handleCommand(command, index, row) {
switch (command) { switch (command) {
case 'handleUpdate': case "handleUpdate":
this.handleUpdate(row);// this.handleUpdate(row); //
break; break;
case 'handleDelete': case "handleDelete":
this.handleDelete(row);// this.handleDelete(row); //
break; break;
case 'handleResetPwd': case "handleResetPwd":
this.handleResetPwd(row); this.handleResetPwd(row);
break; break;
case 'handleRole': case "handleRole":
this.handleRole(row); this.handleRole(row);
break; break;
default: default:
@ -391,21 +629,20 @@ export default {
/** 查询用户列表 */ /** 查询用户列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listUser(this.queryParams).then(response => { listUser(this.queryParams).then((response) => {
this.userList = response.data.list; this.userList = response.data.list;
this.total = response.data.total; this.total = response.data.total;
this.loading = false; this.loading = false;
} });
);
}, },
/** 查询部门下拉树结构 + 岗位下拉 */ /** 查询部门下拉树结构 + 岗位下拉 */
getTreeselect() { getTreeselect() {
listSimpleDepts().then(response => { listSimpleDepts().then((response) => {
// deptOptions // deptOptions
this.deptOptions = []; this.deptOptions = [];
this.deptOptions.push(...this.handleTree(response.data, "id")); this.deptOptions.push(...this.handleTree(response.data, "id"));
}); });
listSimplePosts().then(response => { listSimplePosts().then((response) => {
// postOptions // postOptions
this.postOptions = []; this.postOptions = [];
this.postOptions.push(...response.data); this.postOptions.push(...response.data);
@ -424,12 +661,18 @@ export default {
// //
handleStatusChange(row) { handleStatusChange(row) {
let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用"; let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用";
this.$modal.confirm('确认要"' + text + '""' + row.username + '"用户吗?').then(function() { this.$modal
.confirm('确认要"' + text + '""' + row.username + '"用户吗?')
.then(function () {
return changeUserStatus(row.id, row.status); return changeUserStatus(row.id, row.status);
}).then(() => { })
.then(() => {
this.$modal.msgSuccess(text + "成功"); this.$modal.msgSuccess(text + "成功");
}).catch(function() { })
row.status = row.status === CommonStatusEnum.ENABLE ? CommonStatusEnum.DISABLE .catch(function () {
row.status =
row.status === CommonStatusEnum.ENABLE
? CommonStatusEnum.DISABLE
: CommonStatusEnum.ENABLE; : CommonStatusEnum.ENABLE;
}); });
}, },
@ -457,7 +700,7 @@ export default {
status: "0", status: "0",
remark: undefined, remark: undefined,
postIds: [], postIds: [],
roleIds: [] roleIds: [],
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -486,7 +729,7 @@ export default {
this.reset(); this.reset();
this.getTreeselect(); this.getTreeselect();
const id = row.id; const id = row.id;
getUser(id).then(response => { getUser(id).then((response) => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改用户"; this.title = "修改用户";
@ -497,17 +740,19 @@ export default {
handleResetPwd(row) { handleResetPwd(row) {
this.$prompt('请输入"' + row.username + '"的新密码', "提示", { this.$prompt('请输入"' + row.username + '"的新密码', "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消" cancelButtonText: "取消",
}).then(({ value }) => { })
resetUserPwd(row.id, value).then(response => { .then(({ value }) => {
resetUserPwd(row.id, value).then((response) => {
this.$modal.msgSuccess("修改成功,新密码是:" + value); this.$modal.msgSuccess("修改成功,新密码是:" + value);
}); });
}).catch(() => {}); })
.catch(() => {});
}, },
/** 分配用户角色操作 */ /** 分配用户角色操作 */
handleRole(row) { handleRole(row) {
this.reset(); this.reset();
const id = row.id const id = row.id;
// form username nickname // form username nickname
this.form.id = id; this.form.id = id;
this.form.username = row.username; this.form.username = row.username;
@ -515,29 +760,29 @@ export default {
// //
this.openRole = true; this.openRole = true;
// //
listSimpleRoles().then(response => { listSimpleRoles().then((response) => {
// roleOptions // roleOptions
this.roleOptions = []; this.roleOptions = [];
this.roleOptions.push(...response.data); this.roleOptions.push(...response.data);
}); });
// //
listUserRoles(id).then(response => { listUserRoles(id).then((response) => {
// //
this.form.roleIds = response.data; this.form.roleIds = response.data;
}) });
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function() { submitForm: function () {
this.$refs["form"].validate(valid => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.id !== undefined) { if (this.form.id !== undefined) {
updateUser(this.form).then(response => { updateUser(this.form).then((response) => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addUser(this.form).then(response => { addUser(this.form).then((response) => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
@ -547,12 +792,12 @@ export default {
}); });
}, },
/** 提交按钮(角色权限) */ /** 提交按钮(角色权限) */
submitRole: function() { submitRole: function () {
if (this.form.id !== undefined) { if (this.form.id !== undefined) {
assignUserRole({ assignUserRole({
userId: this.form.id, userId: this.form.id,
roleIds: this.form.roleIds, roleIds: this.form.roleIds,
}).then(response => { }).then((response) => {
this.$modal.msgSuccess("分配角色成功"); this.$modal.msgSuccess("分配角色成功");
this.openRole = false; this.openRole = false;
this.getList(); this.getList();
@ -562,26 +807,34 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项?').then(function() { this.$modal
.confirm('是否确认删除用户编号为"' + ids + '"的数据项?')
.then(function () {
return delUser(ids); return delUser(ids);
}).then(() => { })
.then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}).catch(() => {}); })
.catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.$modal.confirm('是否确认导出所有用户数据项?').then(() => { this.$modal
.confirm("是否确认导出所有用户数据项?")
.then(() => {
// //
let params = {...this.queryParams}; let params = { ...this.queryParams };
params.pageNo = undefined; params.pageNo = undefined;
params.pageSize = undefined; params.pageSize = undefined;
this.exportLoading = true; this.exportLoading = true;
return exportUser(params); return exportUser(params);
}).then(response => { })
this.$download.excel(response, '用户数据.xls'); .then((response) => {
this.$download.excel(response, "用户数据.xls");
this.exportLoading = false; this.exportLoading = false;
}).catch(() => {}); })
.catch(() => {});
}, },
/** 导入按钮操作 */ /** 导入按钮操作 */
handleImport() { handleImport() {
@ -590,8 +843,8 @@ export default {
}, },
/** 下载模板操作 */ /** 下载模板操作 */
importTemplate() { importTemplate() {
importTemplate().then(response => { importTemplate().then((response) => {
this.$download.excel(response, '用户导入模板.xls'); this.$download.excel(response, "用户导入模板.xls");
}); });
}, },
// //
@ -601,7 +854,7 @@ export default {
// //
handleFileSuccess(response, file, fileList) { handleFileSuccess(response, file, fileList) {
if (response.code !== 0) { if (response.code !== 0) {
this.$modal.msgError(response.msg) this.$modal.msgError(response.msg);
return; return;
} }
this.upload.open = false; this.upload.open = false;
@ -609,17 +862,22 @@ export default {
this.$refs.upload.clearFiles(); this.$refs.upload.clearFiles();
// //
let data = response.data; let data = response.data;
let text = '创建成功数量:' + data.createUsernames.length; let text = "创建成功数量:" + data.createUsernames.length;
for (const username of data.createUsernames) { for (const username of data.createUsernames) {
text += '<br />&nbsp;&nbsp;&nbsp;&nbsp;' + username; text += "<br />&nbsp;&nbsp;&nbsp;&nbsp;" + username;
} }
text += '<br />更新成功数量:' + data.updateUsernames.length; text += "<br />更新成功数量:" + data.updateUsernames.length;
for (const username of data.updateUsernames) { for (const username of data.updateUsernames) {
text += '<br />&nbsp;&nbsp;&nbsp;&nbsp;' + username; text += "<br />&nbsp;&nbsp;&nbsp;&nbsp;" + username;
} }
text += '<br />更新失败数量:' + Object.keys(data.failureUsernames).length; text +=
"<br />更新失败数量:" + Object.keys(data.failureUsernames).length;
for (const username in data.failureUsernames) { for (const username in data.failureUsernames) {
text += '<br />&nbsp;&nbsp;&nbsp;&nbsp;' + username + '' + data.failureUsernames[username]; text +=
"<br />&nbsp;&nbsp;&nbsp;&nbsp;" +
username +
"" +
data.failureUsernames[username];
} }
this.$alert(text, "导入结果", { dangerouslyUseHTMLString: true }); this.$alert(text, "导入结果", { dangerouslyUseHTMLString: true });
this.getList(); this.getList();
@ -633,9 +891,9 @@ export default {
return { return {
id: node.id, id: node.id,
label: node.name, label: node.name,
children: node.children children: node.children,
} };
} },
} },
}; };
</script> </script>

Loading…
Cancel
Save