页面修改

main
mo 1 year ago
parent 166c42ef80
commit 6b1c5cdd8c

@ -52,3 +52,23 @@ export function exportInvoicesExcel(query) {
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 { getDicts } from "@/api/system/dict/data";
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 RightToolbar from "@/components/RightToolbar"
// 代码高亮插件
@ -29,6 +30,7 @@ import { DICT_TYPE, getDictDataLabel, getDictDatas, getDictDatas2 } from "@/util
Vue.prototype.getDicts = getDicts
Vue.prototype.getConfigKey = getConfigKey
Vue.prototype.parseTime = parseTime
Vue.prototype.parseTime2 = parseTime2
Vue.prototype.resetForm = resetForm
Vue.prototype.getDictDatas = getDictDatas
Vue.prototype.getDictDatas2 = getDictDatas2
@ -38,6 +40,7 @@ Vue.prototype.handleTree = handleTree
Vue.prototype.addBeginAndEndTime = addBeginAndEndTime
Vue.prototype.divide = divide
// 全局组件挂载
Vue.component('DictTag', DictTag)
Vue.component('DocAlert', DocAlert)

@ -48,6 +48,46 @@ export function parseTime(time, pattern) {
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) {
if (this.$refs[refName]) {

@ -9,6 +9,14 @@
v-show="showSearch"
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-input
v-model="queryParams.invoiceCode"
@ -17,36 +25,49 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="发票号码" prop="invoiceNum">
<el-form-item label="销方名称" prop="sellerName">
<el-input
v-model="queryParams.invoiceNum"
placeholder="请输入发票号码"
v-model="queryParams.sellerName"
placeholder="请输入销方名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="发票种类" prop="invoiceType">
<el-form-item label="销方税号" prop="sellerRegisterNum">
<el-input
v-model="queryParams.invoiceType"
placeholder="请输入发票种类"
v-model="queryParams.sellerRegisterNum"
placeholder="请输入销方税号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="发票状态" prop="invoiceState">
<el-select
v-model="queryParams.invoiceState"
placeholder="请选择发票状态"
>
<el-option
v-for="item in invoiceStateOptions"
:key="item.id"
:value="item.value"
:label="item.label"
>
</el-option>
</el-select>
<el-form-item label="购方名称" prop="purchaserName">
<el-input
v-model="queryParams.purchaserName"
placeholder="请输入购方名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="购方税号" prop="purchaserRegisterNum">
<el-input
v-model="queryParams.purchaserRegisterNum"
placeholder="请输入购方税号"
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-button type="primary" icon="el-icon-search" @click="handleQuery"
@ -55,7 +76,6 @@
<el-button icon="el-icon-refresh" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
<!-- 操作工具栏 -->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
@ -81,19 +101,46 @@
>导出</el-button
>
</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
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<!-- tab栏列表切换 -->
<el-tabs v-model="accountingType" @tab-click="handleClick" type="card">
<el-tab-pane label="进项" name="in"></el-tab-pane>
<el-tab-pane label="销项" name="out"></el-tab-pane>
</el-tabs>
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="查看" align="center" prop="fileUrl">
<el-table
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">
<el-button type="text" @click="openLink(scope.row.fileUrl)">
{{ scope.row.fileUrl }}
@ -114,14 +161,9 @@
align="center"
prop="amountinFiguers"
/>
<el-table-column label="开票人" align="center" prop="foteDrawer" />
<el-table-column
label="销方地址电话"
align="center"
prop="sellerAddress"
/>
<el-table-column label="销方名称" align="center" prop="sellerName" />
<el-table-column
label="销方识别号"
label="销方税号"
align="center"
prop="sellerRegisterNum"
/>
@ -130,17 +172,12 @@
align="center"
prop="sellerBank"
/>
<el-table-column label="校验码" align="center" prop="checkCode" />
<el-table-column
label="开票日期"
label="销方地址电话"
align="center"
prop="invoiceDate"
width="180"
>
<template v-slot="scope">
<span>{{ parseTime(scope.row.invoiceDate) }}</span>
</template>
</el-table-column>
prop="sellerAddress"
/>
<el-table-column label="购方名称" align="center" prop="purchaserName" />
<el-table-column
label="购方税号"
align="center"
@ -151,17 +188,17 @@
align="center"
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
label="购方地址电话"
align="center"
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="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">
<template v-slot="scope">
<dict-tag
@ -170,14 +207,24 @@
/>
</template>
</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
label="作废日期"
align="center"
prop="printNum"
width="180"
width="100"
>
<template v-slot="scope">
<span>{{ parseTime(scope.row.printNum) }}</span>
<span>{{ parseTime2(scope.row.printNum) }}</span>
</template>
</el-table-column>
<el-table-column label="进销项" align="center" prop="inoutMark">
@ -248,7 +295,6 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 对话框(添加 / 修改) -->
<el-dialog
:title="title"
@ -273,7 +319,6 @@
只能上传图片PDFOFD文件
</div>
</el-upload> -->
<el-form ref="form" :model="form" :rules="rules" label-width="140px">
<el-row>
<el-col :span="8">
@ -472,10 +517,15 @@
<el-row>
<el-col :span="8">
<el-form-item label="二维码查验" prop="qrCheckCode">
<el-input
v-model="form.qrCheckCode"
placeholder="请输入二维码查验1查询相符,0查验不符"
/>
<el-select v-model="form.qrCheckCode" placeholder="请选择">
<el-option
v-for="item in qrCheckCodeOptions"
:key="item.id"
:value="item.value"
:label="item.label"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
@ -560,6 +610,76 @@
<el-button @click="cancel"> </el-button>
</div>
</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>
</template>
@ -571,6 +691,8 @@ import {
getInvoices,
getInvoicesPage,
exportInvoicesExcel,
outTemplate,
downloadXml,
} from "@/api/accounting/invoices";
import { listData } from "@/api/system/dict/data";
import { getAccessToken } from "@/utils/auth";
@ -584,6 +706,7 @@ export default {
loading: true,
//
exportLoading: false,
downloadLoading: false,
//
showSearch: true,
//
@ -592,8 +715,11 @@ export default {
list: [],
//
title: "",
//
ids: [],
//
open: false,
open1: false,
accountingType: "in",
fileList: [],
//
@ -659,6 +785,7 @@ export default {
userId: null,
remark: null,
fileUrl: null,
inputPassword: null,
},
//
form: {},
@ -675,12 +802,33 @@ export default {
invoiceNum: [
{ 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: [], //
invoicesDuplicateOptions: [], //
invoiceTypeOptions: [], //
invoiceStateOptions: [], //
inOrOutOptions: [], //
qrCheckCodeOptions: [], //
};
},
created() {
@ -695,6 +843,9 @@ export default {
this.reset();
},
handleScan(form) {
if (form.duplicateMark == 1) {
this.$message.error("该发票重复");
}
const num = form.duplicateMark.toString();
this.form = form;
this.form.duplicateMark = num;
@ -770,6 +921,14 @@ export default {
}).then((res) => {
this.invoiceStateOptions = res.data.list || [];
});
//
listData({
pageNo: 1,
pageSize: 100,
dictType: "accounting_invoices_code_status",
}).then((res) => {
this.qrCheckCodeOptions = res.data.list || [];
});
},
//
handleSuccess(res) {
@ -782,6 +941,10 @@ export default {
this.open = false;
this.reset();
},
/** 取消按钮 */
cancel1() {
this.open1 = false;
},
/** 表单重置 */
reset() {
this.form = {
@ -857,6 +1020,11 @@ export default {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map((item) => item.id);
this.multiple = !selection.length;
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
@ -869,15 +1037,23 @@ export default {
this.reset();
const id = row.id;
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.invoiceState = num1;
this.form.inoutMark = num2;
this.form.duplicateMark = num3;
this.form.checkTrue = num4;
if (response.data.invoiceState != null) {
const num1 = response.data.invoiceState.toString();
this.form.invoiceState = num1;
}
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.title = "修改发票";
});
@ -937,6 +1113,52 @@ export default {
})
.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>

@ -1,33 +1,85 @@
<template>
<div class="app-container">
<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-lf">
<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 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 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 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 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 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 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-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-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>
</div>
</div>
@ -36,66 +88,217 @@
<!-- 操作工具栏 -->
<el-row :gutter="10" class="mb8">
<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 :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 :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 :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>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</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 label="协议编号" align="center" prop="contractNo" />
<el-table-column label="协议名称" align="center" prop="contractName" />
<el-table-column label="应付款" align="center" prop="needCharge" />
<el-table-column label="预付款" align="center" prop="advanceCharge" />
<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="orgFr" />
<el-table-column label="乙方名称" align="center" prop="supplyName" />
<el-table-column label="截至时间" align="center" prop="byTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.byTime, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.byTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column label="告警" align="center" prop="ifNotice">
<template slot-scope="scope">
<span v-show="scope.row.ifNotice>0" style="color: red"></span>
<span v-show="scope.row.ifNotice==0" style="color: #f8ac59"></span>
<span v-show="scope.row.ifNotice<0" style="color: green"></span>
<span v-show="scope.row.ifNotice > 0" style="color: red"
>已超期</span
>
<span v-show="scope.row.ifNotice == 0" style="color: #f8ac59"
>将要超期</span
>
<span v-show="scope.row.ifNotice < 0" style="color: green"
>未超期</span
>
</template>
</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">
<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>
</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">
<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 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>
<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
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>
</el-table-column>
</el-table>
</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-item label="协议编号" prop="contractNo">
<el-input v-model="form.contractNo" placeholder="请输入协议编号" />
@ -125,7 +328,10 @@
<el-input v-model="form.referencePrice" placeholder="请输入参考价" />
</el-form-item>
<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 label="甲方编码" prop="orgNo">
<el-input v-model="form.orgNo" placeholder="请输入甲方编码" />
@ -170,10 +376,21 @@
<!-- <el-input v-model="form.spOkDt" placeholder="请输入乙方签证"/>-->
<!-- </el-form-item>-->
<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 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>
<div slot="footer" class="dialog-footer">
@ -182,36 +399,55 @@
</div>
</el-dialog>
<el-dialog title="绑定模版" :visible.sync="showBindTpl" width="1000px" append-to-body>
<SelectAgreementTpl @selectedAgreementTpl="selectedAgreementTpl"></SelectAgreementTpl>
<el-dialog
title="绑定模版"
:visible.sync="showBindTpl"
width="1000px"
append-to-body
>
<SelectAgreementTpl
@selectedAgreementTpl="selectedAgreementTpl"
></SelectAgreementTpl>
<span slot="footer" class="dialog-footer">
<el-button @click="showBindTpl = false"> </el-button>
<el-button type="primary" @click="doBindTplUpdate"> </el-button>
</span>
</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>
</el-dialog>
<!-- <el-dialog title="流程信息" :visible.sync="showFlowInfo" width="1200px" append-to-body>
<FlowInfo :businessId="businessId" billType="agreement" v-if="showFlowInfo"></FlowInfo>
</el-dialog> -->
</div>
</template>
<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 SelectAgreementTpl from "@/views/ct/agreementTpl/selectAgreementTpl";
// import FlowInfo from "@/views/oa/flow/flowInfo";
export default {
name: "Agreement",
dicts: ['oa_customform_category', 'oa_flow_billstatus'],
dicts: ["oa_customform_category", "oa_flow_billstatus"],
components: {
SelectAgreementTpl
SelectAgreementTpl,
},
data() {
return {
@ -277,7 +513,7 @@ export default {
previewContent: "",
showFlowInfo: false,
insId: "",
businessId: ""
businessId: "",
};
},
created() {
@ -287,7 +523,7 @@ export default {
/** 查询补充协议列表 */
getList() {
this.loading = true;
listAgreement(this.queryParams).then(response => {
listAgreement(this.queryParams).then((response) => {
this.agreementList = response.rows;
this.total = response.total;
this.loading = false;
@ -335,7 +571,7 @@ export default {
updateTime: null,
bindAgreementId: null,
selectedTplId: null,
selectedTplName: ""
selectedTplName: "",
};
this.resetForm("form");
},
@ -351,9 +587,9 @@ export default {
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
this.ids = selection.map((item) => item.id);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
/** 新增按钮操作 */
handleAdd() {
@ -364,8 +600,8 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getAgreement(id).then(response => {
const id = row.id || this.ids;
getAgreement(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = "修改补充协议";
@ -373,16 +609,16 @@ export default {
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id != null) {
updateAgreement(this.form).then(response => {
updateAgreement(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addAgreement(this.form).then(response => {
addAgreement(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
@ -394,20 +630,27 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除补充协议编号为"' + ids + '"的数据项?').then(function () {
return delAgreement(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {
});
this.$modal
.confirm('是否确认删除补充协议编号为"' + ids + '"的数据项?')
.then(function () {
return delAgreement(ids);
})
.then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('ct/agreement/export', {
...this.queryParams
}, `agreement_${new Date().getTime()}.xlsx`)
this.download(
"ct/agreement/export",
{
...this.queryParams,
},
`agreement_${new Date().getTime()}.xlsx`
);
},
/** 绑定模版 ***/
bindTpl(row) {
@ -420,11 +663,11 @@ export default {
this.selectedTplName = sel.name;
},
doBindTplUpdate() {
let form = {}
let form = {};
form.id = this.bindAgreementId;
form.tplId = this.selectedTplId;
form.tplName = this.selectedTplName;
updateAgreement(form).then(response => {
updateAgreement(form).then((response) => {
this.$modal.msgSuccess("绑定成功");
this.open = false;
this.getList();
@ -437,23 +680,23 @@ export default {
this.$modal.msgError("未绑定协议模板,请先绑定协议模板!!");
return;
}
previewAgreemwnt(row.id).then(res => {
previewAgreemwnt(row.id).then((res) => {
if (200 == res.code) {
this.previewContent = res.data;
this.showAgreemwnt = true;
}
})
});
},
/** 生成文件 **/
doBuildFile(row) {
buildFile(row.id).then(res => {
buildFile(row.id).then((res) => {
if (200 == res.code) {
this.$modal.msgSuccess("生成成功");
this.getList();
} else {
this.$modal.msgError("生成失败");
}
})
});
},
/** 下载协议 ***/
dlAgreement(row) {
@ -467,30 +710,33 @@ export default {
}
let data = {
businessId: row.id,
billType: row.billType
}
this.$modal.confirm('确认要提交该协议进行审批吗?').then(function () {
return submitFlow(data);
}).then(() => {
this.getList();
this.$modal.msgSuccess("提交成功");
}).catch(() => {
});
billType: row.billType,
};
this.$modal
.confirm("确认要提交该协议进行审批吗?")
.then(function () {
return submitFlow(data);
})
.then(() => {
this.getList();
this.$modal.msgSuccess("提交成功");
})
.catch(() => {});
},
/** 取回审批 ***/
doCancleFlow(row) {
let data = {
businessId: row.id,
billType: row.billType
}
this.$modal.confirm('确认要取回该协议审批吗?').then(() => {
cancleFlow(data).then(res => {
billType: row.billType,
};
this.$modal.confirm("确认要取回该协议审批吗?").then(() => {
cancleFlow(data).then((res) => {
if (200 == res.code) {
this.getList();
this.$modal.msgSuccess("取回成功");
}
});
})
});
},
/** 流程信息 ***/
flowDetail(row) {
@ -498,11 +744,11 @@ export default {
// this.billType = row.billType;
this.showFlowInfo = true;
},
}
},
};
</script>
<style lang='scss' scoped>
@import '@/assets/styles/header/index.scss';
@import '@/assets/styles/common/index.scss';
<style lang="scss" scoped>
@import "@/assets/styles/header/index.scss";
@import "@/assets/styles/common/index.scss";
</style>

@ -2,99 +2,275 @@
<div class="app-container">
<doc-alert title="用户体系" url="https://doc.iocoder.cn/user-center/" />
<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-col :span="4" :xs="24">
<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 class="head-container">
<el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode"
ref="tree" default-expand-all highlight-current @node-click="handleNodeClick"/>
<el-tree
:data="deptOptions"
:props="defaultProps"
:expand-on-click-node="false"
:filter-node-method="filterNode"
ref="tree"
default-expand-all
highlight-current
@node-click="handleNodeClick"
/>
</div>
</el-col>
<!--用户数据-->
<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-input v-model="queryParams.username" placeholder="请输入用户名称" clearable style="width: 240px"
@keyup.enter.native="handleQuery"/>
<el-input
v-model="queryParams.username"
placeholder="请输入用户名称"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="手机号码" prop="mobile">
<el-input v-model="queryParams.mobile" placeholder="请输入手机号码" clearable style="width: 240px"
@keyup.enter.native="handleQuery"/>
<el-input
v-model="queryParams.mobile"
placeholder="请输入手机号码"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select 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
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-form-item>
<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"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
<el-date-picker
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-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" @click="resetQuery"></el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" @click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:user:create']">新增</el-button>
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:user:create']"
>新增</el-button
>
</el-col>
<el-col :span="1.5">
<el-button type="info" icon="el-icon-upload2" size="mini" @click="handleImport"
v-hasPermi="['system:user:import']">导入</el-button>
<el-button
type="info"
icon="el-icon-upload2"
size="mini"
@click="handleImport"
v-hasPermi="['system:user:import']"
>导入</el-button
>
</el-col>
<el-col :span="1.5">
<el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
v-hasPermi="['system:user:export']">导出</el-button>
<el-button
type="warning"
icon="el-icon-download"
size="mini"
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['system:user:export']"
>导出</el-button
>
</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-table v-loading="loading" :data="userList">
<el-table-column label="用户编号" align="center" key="id" prop="id" 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">
<el-table-column
label="用户编号"
align="center"
key="id"
prop="id"
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">
<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>
</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">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</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">
<el-button size="mini" type="text" icon="el-icon-edit" @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-button
size="mini"
type="text"
icon="el-icon-edit"
@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-item command="handleDelete" v-if="scope.row.id !== 1" size="mini" type="text" 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-item
command="handleDelete"
v-if="scope.row.id !== 1"
size="mini"
type="text"
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>
</template>
</el-table-column>
</el-table>
<pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
@pagination="getList"/>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</el-col>
</el-row>
@ -109,32 +285,59 @@
</el-col>
<el-col :span="12">
<el-form-item label="归属部门" prop="deptId">
<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :clearable="false"
placeholder="请选择归属部门" :normalizer="normalizer"/>
<treeselect
v-model="form.deptId"
:options="deptOptions"
:show-count="true"
:clearable="false"
placeholder="请选择归属部门"
:normalizer="normalizer"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<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-col>
<el-col :span="12">
<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-col>
</el-row>
<el-row>
<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-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="form.id === undefined" label="用户密码" prop="password">
<el-input v-model="form.password" placeholder="请输入用户密码" type="password" show-password />
<el-form-item
v-if="form.id === undefined"
label="用户密码"
prop="password"
>
<el-input
v-model="form.password"
placeholder="请输入用户密码"
type="password"
show-password
/>
</el-form-item>
</el-col>
</el-row>
@ -142,7 +345,12 @@
<el-col :span="12">
<el-form-item label="用户性别">
<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-form-item>
</el-col>
@ -150,10 +358,10 @@
<el-form-item label="岗位">
<el-select v-model="form.postIds" multiple placeholder="请选择">
<el-option
v-for="item in postOptions"
:key="item.id"
:label="item.name"
:value="item.id"
v-for="item in postOptions"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
@ -162,7 +370,11 @@
<el-row>
<el-col :span="24">
<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-col>
</el-row>
@ -174,18 +386,39 @@
</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>
<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" /> 是否更新已经存在的用户数据
<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>
<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">
@ -195,7 +428,12 @@
</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-item label="用户名称">
<el-input v-model="form.username" :disabled="true" />
@ -206,10 +444,10 @@
<el-form-item label="角色">
<el-select v-model="form.roleIds" multiple placeholder="请选择">
<el-option
v-for="item in roleOptions"
:key="parseInt(item.id)"
:label="item.name"
:value="parseInt(item.id)"
v-for="item in roleOptions"
:key="parseInt(item.id)"
:label="item.name"
:value="parseInt(item.id)"
></el-option>
</el-select>
</el-form-item>
@ -219,7 +457,6 @@
<el-button @click="cancelRole"> </el-button>
</div>
</el-dialog>
</div>
</template>
@ -233,19 +470,19 @@ import {
importTemplate,
listUser,
resetUserPwd,
updateUser
updateUser,
} from "@/api/system/user";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import {listSimpleDepts} from "@/api/system/dept";
import {listSimplePosts} from "@/api/system/post";
import { listSimpleDepts } from "@/api/system/dept";
import { listSimplePosts } from "@/api/system/post";
import {CommonStatusEnum} from "@/utils/constants";
import {DICT_TYPE, getDictDatas} from "@/utils/dict";
import {assignUserRole, listUserRoles} from "@/api/system/permission";
import {listSimpleRoles} from "@/api/system/role";
import {getBaseHeader} from "@/utils/request";
import { CommonStatusEnum } from "@/utils/constants";
import { DICT_TYPE, getDictDatas } from "@/utils/dict";
import { assignUserRole, listUserRoles } from "@/api/system/permission";
import { listSimpleRoles } from "@/api/system/role";
import { getBaseHeader } from "@/utils/request";
export default {
name: "SystemUser",
@ -282,7 +519,7 @@ export default {
form: {},
defaultProps: {
children: "children",
label: "name"
label: "name",
},
//
upload: {
@ -297,7 +534,7 @@ export default {
//
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: {
@ -307,7 +544,7 @@ export default {
mobile: undefined,
status: undefined,
deptId: undefined,
createTime: []
createTime: [],
},
//
columns: [
@ -317,33 +554,34 @@ export default {
{ key: 3, label: `部门`, visible: true },
{ key: 4, label: `手机号码`, visible: true },
{ key: 5, label: `状态`, visible: true },
{ key: 6, label: `创建时间`, visible: true }
{ key: 6, label: `创建时间`, visible: true },
],
//
rules: {
username: [
{ required: true, message: "用户名称不能为空", trigger: "blur" }
{ required: true, message: "用户名称不能为空", trigger: "blur" },
],
nickname: [
{ required: true, message: "用户昵称不能为空", trigger: "blur" }
{ required: true, message: "用户昵称不能为空", trigger: "blur" },
],
password: [
{ required: true, message: "用户密码不能为空", trigger: "blur" }
{ required: true, message: "用户密码不能为空", trigger: "blur" },
],
email: [
{
type: "email",
message: "'请输入正确的邮箱地址",
trigger: ["blur", "change"]
}
trigger: ["blur", "change"],
},
],
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: "请输入正确的手机号码",
trigger: "blur"
}
]
trigger: "blur",
},
],
},
//
openRole: false,
@ -359,7 +597,7 @@ export default {
//
deptName(val) {
this.$refs.tree.filter(val);
}
},
},
created() {
this.getList();
@ -372,16 +610,16 @@ export default {
//
handleCommand(command, index, row) {
switch (command) {
case 'handleUpdate':
this.handleUpdate(row);//
case "handleUpdate":
this.handleUpdate(row); //
break;
case 'handleDelete':
this.handleDelete(row);//
case "handleDelete":
this.handleDelete(row); //
break;
case 'handleResetPwd':
case "handleResetPwd":
this.handleResetPwd(row);
break;
case 'handleRole':
case "handleRole":
this.handleRole(row);
break;
default:
@ -391,21 +629,20 @@ export default {
/** 查询用户列表 */
getList() {
this.loading = true;
listUser(this.queryParams).then(response => {
this.userList = response.data.list;
this.total = response.data.total;
this.loading = false;
}
);
listUser(this.queryParams).then((response) => {
this.userList = response.data.list;
this.total = response.data.total;
this.loading = false;
});
},
/** 查询部门下拉树结构 + 岗位下拉 */
getTreeselect() {
listSimpleDepts().then(response => {
listSimpleDepts().then((response) => {
// deptOptions
this.deptOptions = [];
this.deptOptions.push(...this.handleTree(response.data, "id"));
});
listSimplePosts().then(response => {
listSimplePosts().then((response) => {
// postOptions
this.postOptions = [];
this.postOptions.push(...response.data);
@ -424,12 +661,18 @@ export default {
//
handleStatusChange(row) {
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);
}).then(() => {
})
.then(() => {
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;
});
},
@ -457,7 +700,7 @@ export default {
status: "0",
remark: undefined,
postIds: [],
roleIds: []
roleIds: [],
};
this.resetForm("form");
},
@ -486,7 +729,7 @@ export default {
this.reset();
this.getTreeselect();
const id = row.id;
getUser(id).then(response => {
getUser(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = "修改用户";
@ -497,17 +740,19 @@ export default {
handleResetPwd(row) {
this.$prompt('请输入"' + row.username + '"的新密码', "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消"
}).then(({ value }) => {
resetUserPwd(row.id, value).then(response => {
cancelButtonText: "取消",
})
.then(({ value }) => {
resetUserPwd(row.id, value).then((response) => {
this.$modal.msgSuccess("修改成功,新密码是:" + value);
});
}).catch(() => {});
})
.catch(() => {});
},
/** 分配用户角色操作 */
handleRole(row) {
this.reset();
const id = row.id
const id = row.id;
// form username nickname
this.form.id = id;
this.form.username = row.username;
@ -515,29 +760,29 @@ export default {
//
this.openRole = true;
//
listSimpleRoles().then(response => {
listSimpleRoles().then((response) => {
// roleOptions
this.roleOptions = [];
this.roleOptions.push(...response.data);
});
//
listUserRoles(id).then(response => {
listUserRoles(id).then((response) => {
//
this.form.roleIds = response.data;
})
});
},
/** 提交按钮 */
submitForm: function() {
this.$refs["form"].validate(valid => {
submitForm: function () {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id !== undefined) {
updateUser(this.form).then(response => {
updateUser(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addUser(this.form).then(response => {
addUser(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
@ -547,12 +792,12 @@ export default {
});
},
/** 提交按钮(角色权限) */
submitRole: function() {
submitRole: function () {
if (this.form.id !== undefined) {
assignUserRole({
userId: this.form.id,
roleIds: this.form.roleIds,
}).then(response => {
}).then((response) => {
this.$modal.msgSuccess("分配角色成功");
this.openRole = false;
this.getList();
@ -562,26 +807,34 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项?').then(function() {
this.$modal
.confirm('是否确认删除用户编号为"' + ids + '"的数据项?')
.then(function () {
return delUser(ids);
}).then(() => {
})
.then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
})
.catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.$modal.confirm('是否确认导出所有用户数据项?').then(() => {
this.$modal
.confirm("是否确认导出所有用户数据项?")
.then(() => {
//
let params = {...this.queryParams};
let params = { ...this.queryParams };
params.pageNo = undefined;
params.pageSize = undefined;
this.exportLoading = true;
return exportUser(params);
}).then(response => {
this.$download.excel(response, '用户数据.xls');
})
.then((response) => {
this.$download.excel(response, "用户数据.xls");
this.exportLoading = false;
}).catch(() => {});
})
.catch(() => {});
},
/** 导入按钮操作 */
handleImport() {
@ -590,8 +843,8 @@ export default {
},
/** 下载模板操作 */
importTemplate() {
importTemplate().then(response => {
this.$download.excel(response, '用户导入模板.xls');
importTemplate().then((response) => {
this.$download.excel(response, "用户导入模板.xls");
});
},
//
@ -601,7 +854,7 @@ export default {
//
handleFileSuccess(response, file, fileList) {
if (response.code !== 0) {
this.$modal.msgError(response.msg)
this.$modal.msgError(response.msg);
return;
}
this.upload.open = false;
@ -609,17 +862,22 @@ export default {
this.$refs.upload.clearFiles();
//
let data = response.data;
let text = '创建成功数量:' + data.createUsernames.length;
let text = "创建成功数量:" + data.createUsernames.length;
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) {
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) {
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.getList();
@ -633,9 +891,9 @@ export default {
return {
id: node.id,
label: node.name,
children: node.children
}
}
}
children: node.children,
};
},
},
};
</script>

Loading…
Cancel
Save