Skip to content

J
jiedao-app-operator-master
Commit c901bd59 authored by lanbaoming's avatar lanbaoming
Browse files
Options

2024-06-07提交

parent fd420d94
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1714 additions and 186 deletions
src/router/index.js
View file @ c901bd59
......@@ -159,6 +159,13 @@ export const constantRoutes = [
component: (resolve) => require(['@/views/bpm/processInstance/detail'], resolve),
name: 'Flow details',
meta: {title: '流程详情',titleEn:'Flow details', activeMenu: '/bpm/task/my'}
},
{
//lanbm 2024-06-07 add
path: 'process-instance/detail2',
component: (resolve) => require(['@/views/bpm/processInstance/detail2'], resolve),
name: 'Flow details2',
meta: {title: '流程详情',titleEn:'Flow details', activeMenu: '/bpm/task/my'}
}
]
},
......
src/views/bpm/processInstance/detail.vue
View file @ c901bd59
......@@ -88,6 +88,7 @@
</div>
</el-col>
</el-card>
<!-- 申请信息 -->
<el-card class="box-card mt-10" v-loading="processInstanceLoading">
<div slot="header" class="clearfix">
......
src/views/bpm/processInstance/detail2.vue 0 → 100644
View file @ c901bd59
This diff is collapsed.
src/views/bpm/task/done.vue
View file @ c901bd59
<template>
<div class="app-container">
<!-- 搜索工作栏 -->
<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="$t('流程编号')" prop="processInstanceId">
<el-input v-model="queryParams.processInstanceId" :placeholder="$t('流程编号')" clearable
@keyup.enter.native="handleQuery"/>
<el-input
v-model="queryParams.processInstanceId"
:placeholder="$t('流程编号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('流程名称')" prop="name">
<el-input v-model="queryParams.name" :placeholder="$t('流程名称')" clearable @keyup.enter.native="handleQuery"/>
<el-input
v-model="queryParams.name"
:placeholder="$t('流程名称')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('流程分类')" prop="category">
<el-select v-model="queryParams.category" :placeholder="$t('请选择流程分类')" clearable>
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_MODEL_CATEGORY)"
:key="dict.value" :label="$l(dict, 'label')" :value="dict.value"/>
<el-select
v-model="queryParams.category"
:placeholder="$t('请选择流程分类')"
clearable
>
<el-option
v-for="dict in this.getDictDatas(DICT_TYPE.BPM_MODEL_CATEGORY)"
:key="dict.value"
:label="$l(dict, 'label')"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('提交时间')">
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" :start-placeholder="$t('开始日期')"
:end-placeholder="$t('结束日期')"/>
<el-date-picker
v-model="dateRangeCreateTime"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
:start-placeholder="$t('开始日期')"
:end-placeholder="$t('结束日期')"
/>
</el-form-item>
<el-form-item :label="$t('业务编号')" prop="businessNo">
<el-input v-model="queryParams.businessNo" :placeholder="$t('请输入业务编号')" clearable
@keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('业务编号')" prop="businessNo">
<el-input
v-model="queryParams.businessNo"
:placeholder="$t('请输入业务编号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('搜索') }}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('重置') }}</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{
$t("搜索")
}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{
$t("重置")
}}</el-button>
</el-form-item>
</el-form>
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column :label="$t('流程编号')" align="center" prop="processInstance.id" width="320" fixed/>
<el-table-column :label="$t('流程名称')" align="center" prop="processInstance.name" width="200"/>
<el-table-column :label="$t('业务编号')" align="center" prop="businessNo"/>
<el-table-column :label="$t('流程分类')" align="center" prop="category" width="200">
<el-table-column
:label="$t('流程编号')"
align="center"
prop="processInstance.id"
width="320"
fixed
/>
<el-table-column
:label="$t('流程名称')"
align="center"
prop="processInstance.name"
width="200"
/>
<el-table-column
:label="$t('业务编号')"
align="center"
prop="businessNo"
/>
<el-table-column
:label="$t('流程分类')"
align="center"
prop="category"
width="200"
>
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="scope.row.category"/>
<dict-tag
:type="DICT_TYPE.BPM_MODEL_CATEGORY"
:value="scope.row.category"
/>
</template>
</el-table-column>
<el-table-column :label="$t('当前审批节点')" align="center" prop="name" width="200"/>
<el-table-column
:label="$t('当前审批节点')"
align="center"
prop="name"
width="200"
/>
<!-- <el-table-column :label="$t('状态')" align="center" prop="" width="200" >{{ $t('缺少字段') }}</el-table-column> -->
<!-- <el-table-column :label="$t('流程发起人')" align="center" prop="processInstance.startUserNickname" width="120"/>-->
<el-table-column :label="$t('结果')" align="center" prop="result">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result"/>
<dict-tag
:type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT"
:value="scope.row.result"
/>
</template>
</el-table-column>
<el-table-column :label="$t('提交时间')" align="center" prop="createTime" width="180">
<el-table-column
:label="$t('提交时间')"
align="center"
prop="createTime"
width="180"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('结束时间')" align="center" prop="endTime" width="180">
<el-table-column
:label="$t('结束时间')"
align="center"
prop="endTime"
width="180"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.endTime) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('操作')" align="center" fixed="right" class-name="small-padding fixed-width">
<el-table-column
:label="$t('操作')"
align="center"
fixed="right"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleAudit(scope.row)"
v-hasPermi="['bpm:task:query']">{{ $t('详情') }}
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleAudit(scope.row)"
v-hasPermi="['bpm:task:query']"
>{{ $t("详情") }}
</el-button>
</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"
/>
</div>
</template>
<script>
import {getDoneTaskPage} from '@/api/bpm/task'
import {getDate} from "@/utils/dateUtils";
import { getDoneTaskPage } from "@/api/bpm/task";
import { getDate } from "@/utils/dateUtils";
export default {
//lanbm 2024-05-08 添加查询条件不清空优化
......@@ -118,9 +210,9 @@ export default {
getList() {
this.loading = true;
// 处理查询参数
let params = {...this.queryParams};
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
getDoneTaskPage(params).then(response => {
let params = { ...this.queryParams };
this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime");
getDoneTaskPage(params).then((response) => {
this.list = response.data.list;
this.total = response.data.total;
this.loading = false;
......@@ -142,8 +234,11 @@ export default {
},
/** 处理审批按钮 */
handleAudit(row) {
this.$router.push({path: "/bpm/process-instance/detail", query: {id: row.processInstance.id}});
this.$router.push({
path: "/bpm/process-instance/detail",
query: { id: row.processInstance.id },
});
},
}
},
};
</script>
src/views/bpm/task/todo.vue
View file @ c901bd59
......@@ -290,7 +290,7 @@ export default {
return;
}
}
this.form.comment="";
this.form.comment = "";
this.title = "批量通过";
this.titleType = 1;
this.open = true;
......@@ -309,11 +309,10 @@ export default {
return;
}
}
this.form.comment="";
this.form.comment = "";
this.title = "批量不通过";
this.titleType = 2;
this.open = true;
},
submitForm() {
this.$refs["form"].validate((valid) => {
......@@ -380,10 +379,19 @@ export default {
},
/** 处理审批按钮 */
handleAudit(row) {
this.$router.push({
path: "/bpm/process-instance/detail",
query: { id: row.processInstance.id },
});
//lanbm 2024-06-07 添加根据不同的业务打开不同的展示页面
let name1 = row.processInstance.name;
if (name1.includes("银行实收明细核销审核")) {
this.$router.push({
path: "/bpm/process-instance/detail2",
query: { id: row.processInstance.id },
});
} else {
this.$router.push({
path: "/bpm/process-instance/detail",
query: { id: row.processInstance.id },
});
}
},
handleCancel(row) {
const id = row.id;
......
src/views/ecw/financial/voucher.vue
View file @ c901bd59
......@@ -115,11 +115,16 @@
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column
:label="$t('收款单号')"
align="center"
prop="receiptNo"
/>
<!--lanbm 2024-06-06 添加链接-->
<el-table-column :label="$t('收款单号')" align="center" prop="receiptNo">
<template slot-scope="scope">
<span
style="color: #1890ff"
@click="verificationCancelClick(scope.row)"
>{{ scope.row.receiptNo }}</span
>
</template>
</el-table-column>
<!--订单号，提单号，lanbm 2024-05-29 add-->
<el-table-column :label="$t('订单号')" align="center" prop="orderNo">
<template slot-scope="scope">
......@@ -171,6 +176,20 @@
></span>
</template>
</el-table-column>
<el-table-column
:label="$t('应收')"
align="center"
prop="ysShow"
>
</el-table-column>
<el-table-column :label="$t('实收')" align="center" prop="ssShow">
</el-table-column>
<el-table-column
:label="$t('核销比例')"
align="center"
prop="hxBiLi"
>
</el-table-column>
<el-table-column :label="$t('是否开票')" align="center">
<template slot-scope="scope">
{{ scope.row.openInvoice === 0 ? $t("否") : $t("是") }}
......@@ -414,7 +433,6 @@
<el-button @click="cancelShow = false">{{ $t("取消") }}</el-button>
</span>
</el-dialog>
<!--收款单批量反审核 对话框，一个逻辑一个对话框，
避免做过多的逻辑判断 lanbm 2024-05-29 add-->
<el-dialog :title="dialogTitle2" :visible.sync="dialogVisible2" width="30%">
......@@ -460,6 +478,7 @@
import { listSimpleUsers } from "@/api/system/user";
import { DICT_TYPE } from "@/utils/dict";
import CustomerSelector from "@/components/CustomerSelector";
import { getCurrencyPage } from "@/api/ecw/currency";
import {
getReceiptList,
// receiptVerification,
......@@ -544,14 +563,21 @@ export default {
dialogTitle2: "收款单批量反审核",
dialogVisible3: false, //批量反核销对话框
dialogTitle3: "收款单批量反核销",
currencyList: [],
};
},
activated() {
this.getList();
},
created() {
//获取汇率 lanbm 2024-06-06 add
getCurrencyPage(this.params).then(
(res) => (this.currencyList = res.data.list)
);
let that = this;
listSimpleUsers().then((res) => (that.creatorData = res.data));
this.getList();
},
methods: {
......@@ -606,6 +632,14 @@ export default {
// })
// .catch(() => {});
},
getCurrencyLabel(id) {
let label = this.currencyList.filter((item) => item.id == id);
if (label.length > 0)
return this.$i18n.locale == "zh_CN"
? label[0].titleZh
: label[0].titleEn;
return "";
},
//显示取消审核弹窗
cancelClick(index, type) {
this.selectIndex = index;
......@@ -809,7 +843,7 @@ export default {
);
return;
}
let obj = {
receiptId: this.ids[i].id,
receiptNo: this.ids[i].receiptNo,
......
src/views/infra/fileConfig/index.vue
View file @ c901bd59
This diff is collapsed.
src/views/report/BankReceiptDetails/index.vue
View file @ c901bd59
......@@ -90,6 +90,24 @@
placeholder="请输截止月"
/>
</el-form-item>
<el-form-item label="实收日期" prop="ssDate">
<el-date-picker
v-model="queryParams.sDate4"
type="date"
style="width: 150px"
value-format="yyyy-MM-dd"
clearable
placeholder="请输起始月"
/>
<el-date-picker
v-model="queryParams.eDate4"
type="date"
style="width: 150px"
value-format="yyyy-MM-dd"
clearable
placeholder="请输截止月"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery"
>搜索</el-button
......@@ -169,8 +187,8 @@
</el-table-column>
<el-table-column :label="$t('水单号')" align="center" prop="billNo" />
<el-table-column :label="$t('水单附件')" align="center" prop="attr">
<template slot-scope="scope" v-if="scope.row.attr">
<div v-for="(v, i) in scope.row.attr" :key="i">
<template slot-scope="scope" v-if="scope.row.attrList">
<div v-for="(v, i) in scope.row.attrList" :key="i">
<el-link :href="v.url" type="primary" target="_blank">{{
v.name
}}</el-link>
......@@ -185,6 +203,22 @@
/>
</template>
</el-table-column>
<el-table-column :label="$t('创建人')" align="center" prop="creator" />
<el-table-column
:label="$t('创建时间')"
align="center"
prop="createTime"
/>
<el-table-column
:label="$t('提交审批时间')"
align="center"
prop="createTimeBpm"
/>
<el-table-column
:label="$t('审批通过时间')"
align="center"
prop="updateTimeBpm"
/>
<el-table-column :label="$t('操作')" align="center" width="200">
<template slot-scope="scope">
<el-button
......@@ -222,14 +256,14 @@
v-hasPermi="['ecw:payment:detail:cancelWriteOff']"
>{{ $t("反核销") }}</el-button
>
<!--
<el-button
v-if="scope.row.status == 0"
type="text"
@click="editClick(scope.row)"
v-hasPermi="['ecw:payment:detail:bankEdit']"
>{{ $t("编辑") }}</el-button
>-->
>
<el-button
v-if="scope.row.status == 2"
type="text"
......@@ -312,27 +346,40 @@
<div style="padding: 0 24px">
<el-form ref="addForm" label-width="250px">
<el-form-item :label="$t('收款单号')">
<el-input disabled v-model="form.receipt_no" style="width: 220px"></el-input>
<el-input
:disabled="isEdit"
v-model="form.receipt_no"
style="width: 220px"
></el-input>
</el-form-item>
<!--
<el-form-item :label="$t('剩余应收金额')">
<template v-if="surplusData.length == 0"> 0 </template>
<div v-else>
<div v-for="(amount, currency) in surplusData" :key="currency">
<span v-if="amount">
{{ amount }}{{ getCurrencyLabel(currency) }}</span
>
</div>
</div>
</el-form-item>-->
<span v-if="amount">
{{ amount }}{{ getCurrencyLabel(currency) }}</span
>
</el-form-item>
<el-form-item :label="$t('收款账户')" prop="accountNo">
<el-input disabled
v-model="form.accountBankName"
<el-select
:disabled="isEdit"
filterable
clear
v-model="form.accountId"
:placeholder="$t('请选择收款账户')"
style="width: 220px"
></el-input>
@change="accountChange"
v-el-select-loadmore="loadmore"
>
<el-option
v-for="item in bankData"
:key="item.id"
:label="item.baAccountName + '(' + item.baAccountNum + ')'"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('实收日期')" prop="amountDate">
<el-date-picker disabled
<el-date-picker
:disabled="isEdit"
v-model="form.amountDate"
type="date"
style="width: 150px"
......@@ -341,15 +388,24 @@
</el-form-item>
<div style="display: flex">
<el-form-item :label="$t('实收')" prop="amount">
<el-input v-model="form.amount" disabled style="width: 100px"></el-input>
<el-input
v-model="form.amount"
:disabled="isEdit"
style="width: 100px"
></el-input>
{{ form.currencyName }}
</el-form-item>
</div>
<el-form-item prop="rate" :label="$t('兑核销基准币种汇率')">
<el-input v-model="form.rate" disabled style="width: 220px"></el-input>
<el-input
v-model="form.rate"
:disabled="isEdit"
style="width: 220px"
></el-input>
</el-form-item>
<el-form-item :label="$t('兑核销基准币种金额')">
<el-input disabled
<el-input
:disabled="isEdit"
v-model="form.writeOffAmount"
style="width: 220px"
></el-input>
......@@ -364,10 +420,14 @@
</div>
</el-form-item>
<el-form-item :label="$t('水单号')" prop="billNo">
<el-input v-model="form.billNo" disabled style="width: 220px"></el-input>
<el-input
v-model="form.billNo"
:disabled="isEdit"
style="width: 220px"
></el-input>
</el-form-item>
</el-form>
<div slot="footer" v-show="false">
<div slot="footer">
<el-button type="primary" @click="saveFrom">{{
saveBtnText
}}</el-button>
......@@ -383,6 +443,7 @@ import { getPageList, test } from "@/api/report/bankReceiptDetail";
import { getReceivableItem2 } from "@/api/ecw/financial";
import Treeselect from "@riophae/vue-treeselect";
import "@/assets/styles/vue-treeselect.css";
import { getBankAccountPage } from "@/api/ecw/bankAccount";
import { getCurrencyPage } from "@/api/ecw/currency";
import {
deleteReceiptItem, //删除收款单明细
......@@ -445,6 +506,8 @@ export default {
eDate2: undefined, //提交审批日期
sDate3: undefined,
eDate3: undefined, //审批通过日期
sDate4: undefined,
eDate4: undefined, //实收日期
creator: undefined, //创建人
},
currencyList: [],
......@@ -456,9 +519,21 @@ export default {
ids: [],
// 表单参数
form: {},
isEdit: false, //是否编辑
bankData: [],
codePage: {
pageNo: 1,
pageSize: 20,
},
pages: 1,
};
},
async created() {
getBankAccountPage(this.codePage).then((res) => {
this.bankData = res.data.list;
this.pages = res.data.total / this.codePage.pageSize + 1;
});
// 获取汇率
await getCurrencyPage(this.params).then(
(res) => (this.currencyList = res.data.list)
......@@ -488,6 +563,15 @@ export default {
},
},
methods: {
// 懒加载
loadmore() {
this.codePage.pageNo++;
// 大于页码不请求了
if (this.codePage.pageNo > this.pages) {
return;
}
this.getCodeList();
},
/** 查询列表 */
getList() {
this.loading = true;
......@@ -778,7 +862,9 @@ export default {
});
},
detailClick(row) {
//查看详情
let id = row.id;
this.isEdit = true;
getReceivableItem2(id).then((response) => {
this.form = response.data;
//收款单号
......@@ -793,20 +879,21 @@ export default {
});
},
editClick(row) {
//this.getsurplusData();
this.openAddDialog = true;
this.dialogTitle = this.$t("编辑银行实收明细");
this.saveBtnText = this.$t("提交");
this.isView = false;
/*
setTimeout(() => {
this.addForm = { ...row };
let bank = this.bankData.find(
(v) => v.baAccountNum == this.addForm.accountNo
);
if (bank) this.addForm.accountId = bank.id;
this.setWriteOffAmount();
}, 0);*/
let id = row.id;
this.isEdit = false;
getReceivableItem2(id).then((response) => {
this.form = response.data;
//收款单号
this.form.receipt_no = row.receiptNo;
//实收币种
this.form.currencyName = this.getCurrencyLabel(row.currencyId);
//水单附件
this.form.attr = row.attr;
this.openAddDialog = true;
this.dialogTitle = this.$t("编辑银行实收明细");
this.saveBtnText = this.$t("提交");
this.isView = false;
});
},
deleteClick(row) {
const id = row.id;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment