|
@@ -23,10 +23,15 @@
|
|
|
},
|
|
|
]"
|
|
|
@moreSearch="moreSearch"
|
|
|
- @get-list="getList">
|
|
|
+ @get-list="getList"
|
|
|
+ >
|
|
|
<template #amount="{ item }">
|
|
|
- <div :style="'color: ' + (item.status === '10' ? '#04cb04;' : 'red;')">
|
|
|
- <span style="padding-right: 4px" v-if="item.currency">{{ item.currency }}</span>
|
|
|
+ <div
|
|
|
+ :style="'color: ' + (item.status === '10' ? '#04cb04;' : 'red;')"
|
|
|
+ >
|
|
|
+ <span style="padding-right: 4px" v-if="item.currency">{{
|
|
|
+ item.currency
|
|
|
+ }}</span>
|
|
|
<span style="padding-right: 4px" v-else>
|
|
|
{{ accountCurrency[0].value }}
|
|
|
</span>
|
|
@@ -37,8 +42,15 @@
|
|
|
<template #contractCodes="{ item }">
|
|
|
<div style="width: 100%">
|
|
|
<div v-if="item.contractCodes">
|
|
|
- <div v-for="(contract, index) in item.contractCodes.split(',')" :key="index">
|
|
|
- <a style="color: #409eff; cursor: pointer; word-break: break-all" @click="openDetails(contract)">{{ contract }}</a>
|
|
|
+ <div
|
|
|
+ v-for="(contract, index) in item.contractCodes.split(',')"
|
|
|
+ :key="index"
|
|
|
+ >
|
|
|
+ <a
|
|
|
+ style="color: #409eff; cursor: pointer; word-break: break-all"
|
|
|
+ @click="openDetails(contract)"
|
|
|
+ >{{ contract }}</a
|
|
|
+ >
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -46,11 +58,28 @@
|
|
|
</byTable>
|
|
|
</div>
|
|
|
|
|
|
- <el-dialog :title="modalType == 'add' ? '添加流水' : '编辑流水'" v-if="dialogVisible" v-model="dialogVisible" width="600" v-loading="loadingDialog">
|
|
|
- <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="submit">
|
|
|
+ <el-dialog
|
|
|
+ :title="modalType == 'add' ? '添加流水' : '编辑流水'"
|
|
|
+ v-if="dialogVisible"
|
|
|
+ v-model="dialogVisible"
|
|
|
+ width="600"
|
|
|
+ v-loading="loadingDialog"
|
|
|
+ >
|
|
|
+ <byForm
|
|
|
+ :formConfig="formConfig"
|
|
|
+ :formOption="formOption"
|
|
|
+ v-model="formData.data"
|
|
|
+ :rules="rules"
|
|
|
+ ref="submit"
|
|
|
+ >
|
|
|
<template #transactionTime>
|
|
|
<div>
|
|
|
- <el-date-picker v-model="formData.data.transactionTime" type="datetime" placeholder="请选择交易时间" value-format="YYYY-MM-DD HH:mm:ss" />
|
|
|
+ <el-date-picker
|
|
|
+ v-model="formData.data.transactionTime"
|
|
|
+ type="datetime"
|
|
|
+ placeholder="请选择交易时间"
|
|
|
+ value-format="YYYY-MM-DD HH:mm:ss"
|
|
|
+ />
|
|
|
</div>
|
|
|
</template>
|
|
|
<template #money>
|
|
@@ -58,15 +87,34 @@
|
|
|
<el-row :gutter="10">
|
|
|
<el-col :span="6">
|
|
|
<el-form-item prop="status">
|
|
|
- <el-select v-model="formData.data.status" placeholder="请选择" style="width: 100%" @change="changeStatus()">
|
|
|
- <el-option v-for="item in status" :key="item.value" :label="item.label" :value="item.value" />
|
|
|
+ <el-select
|
|
|
+ v-model="formData.data.status"
|
|
|
+ placeholder="请选择"
|
|
|
+ style="width: 100%"
|
|
|
+ @change="changeStatus()"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in status"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value"
|
|
|
+ />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item prop="currency">
|
|
|
- <el-select v-model="formData.data.currency" placeholder="请选择" style="width: 100%">
|
|
|
- <el-option v-for="item in accountCurrency" :key="item.value" :label="item.label" :value="item.value" />
|
|
|
+ <el-select
|
|
|
+ v-model="formData.data.currency"
|
|
|
+ placeholder="请选择"
|
|
|
+ style="width: 100%"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in accountCurrency"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value"
|
|
|
+ />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
@@ -79,7 +127,8 @@
|
|
|
style="width: 100%"
|
|
|
:precision="2"
|
|
|
:controls="false"
|
|
|
- :min="0" />
|
|
|
+ :min="0"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
@@ -89,7 +138,13 @@
|
|
|
<div>
|
|
|
<el-form-item prop="received">
|
|
|
<el-radio-group v-model="formData.data.received">
|
|
|
- <el-radio v-for="item in received" :key="item.value" :label="item.value" border>{{ item.label }}</el-radio>
|
|
|
+ <el-radio
|
|
|
+ v-for="item in received"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.value"
|
|
|
+ border
|
|
|
+ >{{ item.label }}</el-radio
|
|
|
+ >
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
@@ -97,19 +152,47 @@
|
|
|
</byForm>
|
|
|
<template #footer>
|
|
|
<el-button @click="dialogVisible = false" size="large">取 消</el-button>
|
|
|
- <el-button type="primary" @click="submitForm()" size="large">确 定</el-button>
|
|
|
+ <el-button type="primary" @click="submitForm()" size="large"
|
|
|
+ >确 定</el-button
|
|
|
+ >
|
|
|
</template>
|
|
|
</el-dialog>
|
|
|
- <el-dialog title="内部转账" v-if="transferMoneyModal" v-model="transferMoneyModal" width="600" v-loading="loadingDialog">
|
|
|
- <byForm :formConfig="transferMoneyConfig" :formOption="formOption" v-model="formData2.data" :rules="rules2" ref="transferMoneySubmit">
|
|
|
+ <el-dialog
|
|
|
+ title="内部转账"
|
|
|
+ v-if="transferMoneyModal"
|
|
|
+ v-model="transferMoneyModal"
|
|
|
+ width="600"
|
|
|
+ v-loading="loadingDialog"
|
|
|
+ >
|
|
|
+ <byForm
|
|
|
+ :formConfig="transferMoneyConfig"
|
|
|
+ :formOption="formOption"
|
|
|
+ v-model="formData2.data"
|
|
|
+ :rules="rules2"
|
|
|
+ ref="transferMoneySubmit"
|
|
|
+ >
|
|
|
</byForm>
|
|
|
<template #footer>
|
|
|
- <el-button @click="transferMoneyModal = false" size="large">取 消</el-button>
|
|
|
- <el-button type="primary" @click="submitForm2()" size="large">确 定</el-button>
|
|
|
+ <el-button @click="transferMoneyModal = false" size="large"
|
|
|
+ >取 消</el-button
|
|
|
+ >
|
|
|
+ <el-button type="primary" @click="submitForm2()" size="large"
|
|
|
+ >确 定</el-button
|
|
|
+ >
|
|
|
</template>
|
|
|
</el-dialog>
|
|
|
- <el-dialog title="高级检索" v-if="openSearch" v-model="openSearch" width="600" :before-close="cancelSearch">
|
|
|
- <byForm :formConfig="formSearchConfig" :formOption="formOption" v-model="sourceList.pagination">
|
|
|
+ <el-dialog
|
|
|
+ title="高级检索"
|
|
|
+ v-if="openSearch"
|
|
|
+ v-model="openSearch"
|
|
|
+ width="600"
|
|
|
+ :before-close="cancelSearch"
|
|
|
+ >
|
|
|
+ <byForm
|
|
|
+ :formConfig="formSearchConfig"
|
|
|
+ :formOption="formOption"
|
|
|
+ v-model="sourceList.pagination"
|
|
|
+ >
|
|
|
<template #money>
|
|
|
<div style="width: 100%">
|
|
|
<el-row :gutter="10">
|
|
@@ -121,7 +204,8 @@
|
|
|
style="width: 100%"
|
|
|
:precision="2"
|
|
|
:controls="false"
|
|
|
- :min="0" />
|
|
|
+ :min="0"
|
|
|
+ />
|
|
|
</el-col>
|
|
|
<el-col :span="2" style="text-align: center">到</el-col>
|
|
|
<el-col :span="11">
|
|
@@ -132,7 +216,8 @@
|
|
|
style="width: 100%"
|
|
|
:precision="2"
|
|
|
:controls="false"
|
|
|
- :min="0" />
|
|
|
+ :min="0"
|
|
|
+ />
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</div>
|
|
@@ -146,7 +231,8 @@
|
|
|
type="datetime"
|
|
|
placeholder="请选择"
|
|
|
style="width: 100%"
|
|
|
- value-format="YYYY-MM-DD HH:mm:ss" />
|
|
|
+ value-format="YYYY-MM-DD HH:mm:ss"
|
|
|
+ />
|
|
|
</el-col>
|
|
|
<el-col :span="2" style="text-align: center">到</el-col>
|
|
|
<el-col :span="11">
|
|
@@ -155,7 +241,8 @@
|
|
|
type="datetime"
|
|
|
placeholder="请选择"
|
|
|
style="width: 100%"
|
|
|
- value-format="YYYY-MM-DD HH:mm:ss" />
|
|
|
+ value-format="YYYY-MM-DD HH:mm:ss"
|
|
|
+ />
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</div>
|
|
@@ -163,7 +250,9 @@
|
|
|
</byForm>
|
|
|
<template #footer>
|
|
|
<el-button @click="cancelSearch()" size="large">取 消</el-button>
|
|
|
- <el-button type="primary" @click="submitSearch()" size="large">确 定</el-button>
|
|
|
+ <el-button type="primary" @click="submitSearch()" size="large"
|
|
|
+ >确 定</el-button
|
|
|
+ >
|
|
|
</template>
|
|
|
</el-dialog>
|
|
|
|
|
@@ -172,7 +261,9 @@
|
|
|
<template #footer>
|
|
|
<el-button @click="openPrint = false" size="large">取消</el-button>
|
|
|
<el-button v-print="printObj" size="large">打印</el-button>
|
|
|
- <el-button type="primary" @click="clickDownload()" size="large">下载PDF</el-button>
|
|
|
+ <el-button type="primary" @click="clickDownload()" size="large"
|
|
|
+ >下载PDF</el-button
|
|
|
+ >
|
|
|
</template>
|
|
|
</el-dialog>
|
|
|
</div>
|
|
@@ -339,11 +430,15 @@ const config = computed(() => {
|
|
|
},
|
|
|
el: "button",
|
|
|
click() {
|
|
|
- ElMessageBox.confirm("此操作将永久删除该数据, 是否继续?", "提示", {
|
|
|
- confirmButtonText: "确定",
|
|
|
- cancelButtonText: "取消",
|
|
|
- type: "warning",
|
|
|
- }).then(() => {
|
|
|
+ ElMessageBox.confirm(
|
|
|
+ "此操作将永久删除该数据, 是否继续?",
|
|
|
+ "提示",
|
|
|
+ {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning",
|
|
|
+ }
|
|
|
+ ).then(() => {
|
|
|
proxy
|
|
|
.post("/accountRunningWater/delete", {
|
|
|
id: row.id,
|
|
@@ -381,27 +476,31 @@ const getDict = () => {
|
|
|
});
|
|
|
}
|
|
|
});
|
|
|
- proxy.post("/accountManagement/page", { pageNum: 1, pageSize: 999 }).then((res) => {
|
|
|
- if (res.rows && res.rows.length > 0) {
|
|
|
- accountList.value = res.rows.map((item) => {
|
|
|
- return {
|
|
|
- label: item.alias,
|
|
|
- value: item.id,
|
|
|
- };
|
|
|
- });
|
|
|
- }
|
|
|
- });
|
|
|
+ proxy
|
|
|
+ .post("/accountManagement/page", { pageNum: 1, pageSize: 999 })
|
|
|
+ .then((res) => {
|
|
|
+ if (res.rows && res.rows.length > 0) {
|
|
|
+ accountList.value = res.rows.map((item) => {
|
|
|
+ return {
|
|
|
+ label: item.alias,
|
|
|
+ value: item.id,
|
|
|
+ };
|
|
|
+ });
|
|
|
+ }
|
|
|
+ });
|
|
|
};
|
|
|
const getList = async (req) => {
|
|
|
sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
|
|
|
loading.value = true;
|
|
|
- proxy.post("/accountRunningWater/page", sourceList.value.pagination).then((res) => {
|
|
|
- sourceList.value.data = res.rows;
|
|
|
- sourceList.value.pagination.total = res.total;
|
|
|
- setTimeout(() => {
|
|
|
- loading.value = false;
|
|
|
- }, 200);
|
|
|
- });
|
|
|
+ proxy
|
|
|
+ .post("/accountRunningWater/page", sourceList.value.pagination)
|
|
|
+ .then((res) => {
|
|
|
+ sourceList.value.data = res.rows;
|
|
|
+ sourceList.value.pagination.total = res.total;
|
|
|
+ setTimeout(() => {
|
|
|
+ loading.value = false;
|
|
|
+ }, 200);
|
|
|
+ });
|
|
|
};
|
|
|
getDict();
|
|
|
getList();
|
|
@@ -409,7 +508,7 @@ let transferMoneyModal = ref(false);
|
|
|
const openTransferMoney = () => {
|
|
|
formData2.data = {
|
|
|
transactionTime: moment().format("yyyy-MM-DD HH:mm:ss"),
|
|
|
- isTransaction: '0'
|
|
|
+ isTransaction: "0",
|
|
|
};
|
|
|
transferMoneyModal.value = true;
|
|
|
};
|
|
@@ -425,7 +524,7 @@ const formOption = reactive({
|
|
|
});
|
|
|
const formData = reactive({
|
|
|
data: {
|
|
|
- isTransaction:'1',
|
|
|
+ isTransaction: "1",
|
|
|
},
|
|
|
});
|
|
|
const formData2 = reactive({
|
|
@@ -443,40 +542,39 @@ const transferMoneyConfig = computed(() => {
|
|
|
data: accountList.value,
|
|
|
},
|
|
|
{
|
|
|
- type: 'selectInput',
|
|
|
- label: '转出金额',
|
|
|
+ type: "selectInput",
|
|
|
+ label: "转出金额",
|
|
|
prop: "amount",
|
|
|
- itemWidth: 60,
|
|
|
- data: accountCurrency.value,
|
|
|
- placeholder: '请输入',
|
|
|
- selectPlaceholder: '币种',
|
|
|
- selectProp: 'currency',
|
|
|
+ itemWidth: 60,
|
|
|
+ data: accountCurrency.value,
|
|
|
+ placeholder: "请输入",
|
|
|
+ selectPlaceholder: "币种",
|
|
|
+ selectProp: "currency",
|
|
|
fn: (value) => {
|
|
|
//判断value的类型
|
|
|
- if(isNaN(value)){
|
|
|
-
|
|
|
- formData2.data.inCurrency = formData2.data.currency
|
|
|
- formData2.data.commissionCurrency = formData2.data.currency
|
|
|
- }else{
|
|
|
- if (value != '') {
|
|
|
- if (value.indexOf('.') > -1) {
|
|
|
- formData2.data.amount = value.slice(0, value.indexOf('.') + 3)
|
|
|
- } else {
|
|
|
- formData2.data.amount = value
|
|
|
+ if (isNaN(value)) {
|
|
|
+ formData2.data.inCurrency = formData2.data.currency;
|
|
|
+ formData2.data.commissionCurrency = formData2.data.currency;
|
|
|
+ } else {
|
|
|
+ if (value != "") {
|
|
|
+ if (value.indexOf(".") > -1) {
|
|
|
+ formData2.data.amount = value.slice(0, value.indexOf(".") + 3);
|
|
|
+ } else {
|
|
|
+ formData2.data.amount = value;
|
|
|
}
|
|
|
}
|
|
|
- formData2.data.inAmount = formData2.data.amount
|
|
|
+ formData2.data.inAmount = formData2.data.amount;
|
|
|
}
|
|
|
},
|
|
|
- },
|
|
|
-
|
|
|
- {
|
|
|
+ },
|
|
|
+
|
|
|
+ {
|
|
|
type: "date",
|
|
|
prop: "transactionTime",
|
|
|
label: "转出时间",
|
|
|
itemType: "datetime",
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
{
|
|
|
label: "转入信息",
|
|
|
},
|
|
@@ -487,15 +585,15 @@ const transferMoneyConfig = computed(() => {
|
|
|
data: accountList.value,
|
|
|
},
|
|
|
{
|
|
|
- type: 'selectInput',
|
|
|
- label: '转入金额',
|
|
|
+ type: "selectInput",
|
|
|
+ label: "转入金额",
|
|
|
prop: "inAmount",
|
|
|
- itemWidth: 60,
|
|
|
- data: accountCurrency.value,
|
|
|
- placeholder: '请输入',
|
|
|
- selectPlaceholder: '币种',
|
|
|
- selectProp: 'inCurrency',
|
|
|
- },
|
|
|
+ itemWidth: 60,
|
|
|
+ data: accountCurrency.value,
|
|
|
+ placeholder: "请输入",
|
|
|
+ selectPlaceholder: "币种",
|
|
|
+ selectProp: "inCurrency",
|
|
|
+ },
|
|
|
{
|
|
|
label: "其他信息",
|
|
|
},
|
|
@@ -503,28 +601,29 @@ const transferMoneyConfig = computed(() => {
|
|
|
type: "radio",
|
|
|
prop: "isTransaction",
|
|
|
label: "是否往来",
|
|
|
+ border: true,
|
|
|
data: [
|
|
|
{
|
|
|
label: "是",
|
|
|
- value: '1',
|
|
|
+ value: "1",
|
|
|
},
|
|
|
{
|
|
|
label: "否",
|
|
|
- value: '0',
|
|
|
+ value: "0",
|
|
|
},
|
|
|
],
|
|
|
},
|
|
|
{
|
|
|
- type: 'selectInput',
|
|
|
- label: '手续费',
|
|
|
+ type: "selectInput",
|
|
|
+ label: "手续费",
|
|
|
prop: "commissionAmount",
|
|
|
- itemWidth: 60,
|
|
|
- data: accountCurrency.value,
|
|
|
- placeholder: '请输入',
|
|
|
- selectPlaceholder: '币种',
|
|
|
- selectProp: 'commissionCurrency',
|
|
|
- },
|
|
|
-
|
|
|
+ itemWidth: 60,
|
|
|
+ data: accountCurrency.value,
|
|
|
+ placeholder: "请输入",
|
|
|
+ selectPlaceholder: "币种",
|
|
|
+ selectProp: "commissionCurrency",
|
|
|
+ },
|
|
|
+
|
|
|
{
|
|
|
type: "input",
|
|
|
prop: "remarks",
|
|
@@ -567,12 +666,13 @@ const formConfig = computed(() => {
|
|
|
label: "合同到账",
|
|
|
}
|
|
|
: {},
|
|
|
- // sysUserMenu/list
|
|
|
+ // sysUserMenu/list
|
|
|
//单选框
|
|
|
{
|
|
|
type: "radio",
|
|
|
prop: "isTransaction",
|
|
|
label: "是否往来",
|
|
|
+ border: true,
|
|
|
data: [
|
|
|
{
|
|
|
label: "是",
|
|
@@ -584,9 +684,9 @@ const formConfig = computed(() => {
|
|
|
},
|
|
|
],
|
|
|
fn: (val) => {
|
|
|
- formData.data.transactionDeptId = ''
|
|
|
+ formData.data.transactionDeptId = "";
|
|
|
formData.data.deptType = "";
|
|
|
- formConfig.value[7].data = transactionDepartmentData.value
|
|
|
+ formConfig.value[7].data = transactionDepartmentData.value;
|
|
|
},
|
|
|
},
|
|
|
{
|
|
@@ -596,11 +696,10 @@ const formConfig = computed(() => {
|
|
|
data: [],
|
|
|
isShow: formData.data.isTransaction == 1,
|
|
|
fn: (val) => {
|
|
|
-
|
|
|
if (val) {
|
|
|
console.log(transactionDepartmentData.value);
|
|
|
let list = transactionDepartmentData.value.filter((item) => {
|
|
|
- if(item.value == val) return item
|
|
|
+ if (item.value == val) return item;
|
|
|
});
|
|
|
console.log(list);
|
|
|
if (list && list.length > 0) {
|
|
@@ -634,7 +733,7 @@ const formConfig = computed(() => {
|
|
|
{
|
|
|
label: "对方信息",
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
{
|
|
|
type: "select",
|
|
|
prop: "otherId",
|
|
@@ -699,32 +798,65 @@ const validatePass2 = (rule, value, callback) => {
|
|
|
}
|
|
|
};
|
|
|
const rules = ref({
|
|
|
- accountManagementId: [{ required: true, message: "请选择账户", trigger: "change" }],
|
|
|
- transactionTime: [{ required: true, message: "请选择交易时间", trigger: "change" }],
|
|
|
+ accountManagementId: [
|
|
|
+ { required: true, message: "请选择账户", trigger: "change" },
|
|
|
+ ],
|
|
|
+ transactionTime: [
|
|
|
+ { required: true, message: "请选择交易时间", trigger: "change" },
|
|
|
+ ],
|
|
|
status: [{ required: true, message: "请选择收支类型", trigger: "change" }],
|
|
|
currency: [{ required: true, message: "请选择币种", trigger: "change" }],
|
|
|
- received: [{ required: true, message: "请选择合同是否到账", trigger: "change" }],
|
|
|
- inAccountManagementId: [{ required: true, message: "请选择账户", trigger: "change" }],
|
|
|
- inAmount: [{ required: true, message: "请输入金额和选择币种", trigger: "blur" }, { required: true, validator: validatePass2, trigger: "blur" }],
|
|
|
- isTransaction: [{ required: true, message: "请选择是否往来", trigger: "change" }],
|
|
|
- transactionDeptId: [{ required: true, message: "请选择往来单位", trigger: "change" }],
|
|
|
+ received: [
|
|
|
+ { required: true, message: "请选择合同是否到账", trigger: "change" },
|
|
|
+ ],
|
|
|
+ inAccountManagementId: [
|
|
|
+ { required: true, message: "请选择账户", trigger: "change" },
|
|
|
+ ],
|
|
|
+ inAmount: [
|
|
|
+ { required: true, message: "请输入金额和选择币种", trigger: "blur" },
|
|
|
+ { required: true, validator: validatePass2, trigger: "blur" },
|
|
|
+ ],
|
|
|
+ isTransaction: [
|
|
|
+ { required: true, message: "请选择是否往来", trigger: "change" },
|
|
|
+ ],
|
|
|
+ transactionDeptId: [
|
|
|
+ { required: true, message: "请选择往来单位", trigger: "change" },
|
|
|
+ ],
|
|
|
amount: [{ required: true, message: "请输入金额", trigger: "blur" }],
|
|
|
});
|
|
|
const rules2 = ref({
|
|
|
- accountManagementId: [{ required: true, message: "请选择账户", trigger: "change" }],
|
|
|
- transactionTime: [{ required: true, message: "请选择交易时间", trigger: "change" }],
|
|
|
+ accountManagementId: [
|
|
|
+ { required: true, message: "请选择账户", trigger: "change" },
|
|
|
+ ],
|
|
|
+ transactionTime: [
|
|
|
+ { required: true, message: "请选择交易时间", trigger: "change" },
|
|
|
+ ],
|
|
|
status: [{ required: true, message: "请选择收支类型", trigger: "change" }],
|
|
|
currency: [{ required: true, message: "请选择币种", trigger: "change" }],
|
|
|
- received: [{ required: true, message: "请选择合同是否到账", trigger: "change" }],
|
|
|
- inAccountManagementId: [{ required: true, message: "请选择账户", trigger: "change" }],
|
|
|
- inAmount: [{ required: true, message: "请输入金额和选择币种", trigger: "blur" }, { required: true, validator: validatePass2, trigger: "blur" }],
|
|
|
- isTransaction: [{ required: true, message: "请选择是否往来", trigger: "change" }],
|
|
|
- transactionDeptId: [{ required: true, message: "请选择往来单位", trigger: "change" }],
|
|
|
- amount: [{ required: true, message: "请输入金额和选择币种", trigger: "blur" }, { required: true, validator: validatePass, trigger: "blur" }]
|
|
|
+ received: [
|
|
|
+ { required: true, message: "请选择合同是否到账", trigger: "change" },
|
|
|
+ ],
|
|
|
+ inAccountManagementId: [
|
|
|
+ { required: true, message: "请选择账户", trigger: "change" },
|
|
|
+ ],
|
|
|
+ inAmount: [
|
|
|
+ { required: true, message: "请输入金额和选择币种", trigger: "blur" },
|
|
|
+ { required: true, validator: validatePass2, trigger: "blur" },
|
|
|
+ ],
|
|
|
+ isTransaction: [
|
|
|
+ { required: true, message: "请选择是否往来", trigger: "change" },
|
|
|
+ ],
|
|
|
+ transactionDeptId: [
|
|
|
+ { required: true, message: "请选择往来单位", trigger: "change" },
|
|
|
+ ],
|
|
|
+ amount: [
|
|
|
+ { required: true, message: "请输入金额和选择币种", trigger: "blur" },
|
|
|
+ { required: true, validator: validatePass, trigger: "blur" },
|
|
|
+ ],
|
|
|
});
|
|
|
const openModal = (val) => {
|
|
|
modalType.value = val;
|
|
|
-
|
|
|
+
|
|
|
formData.data = {
|
|
|
transactionTime: moment().format("yyyy-MM-DD HH:mm:ss"),
|
|
|
};
|
|
@@ -732,7 +864,7 @@ const openModal = (val) => {
|
|
|
loadingDialog.value = false;
|
|
|
dialogVisible.value = true;
|
|
|
};
|
|
|
-const transactionDepartmentData = ref([])
|
|
|
+const transactionDepartmentData = ref([]);
|
|
|
const getTransactionDepartment = () => {
|
|
|
return proxy
|
|
|
.get("transactionDepartment/list?pageNum=1&pageSize=999", {})
|
|
@@ -744,33 +876,35 @@ const getTransactionDepartment = () => {
|
|
|
deptType: item.deptType,
|
|
|
};
|
|
|
});
|
|
|
- formConfig.value[7].data = transactionDepartmentData.value
|
|
|
- formConfig.value = {...formConfig.value}
|
|
|
+ formConfig.value[7].data = transactionDepartmentData.value;
|
|
|
+ formConfig.value = { ...formConfig.value };
|
|
|
});
|
|
|
};
|
|
|
-getTransactionDepartment()
|
|
|
+getTransactionDepartment();
|
|
|
const changeStatus = () => {
|
|
|
formData.data.received = "";
|
|
|
};
|
|
|
const transferMoneySubmit = ref(null);
|
|
|
const submitForm2 = () => {
|
|
|
transferMoneySubmit.value.handleSubmit(() => {
|
|
|
- console.log(formData2.data)
|
|
|
+ console.log(formData2.data);
|
|
|
loadingDialog.value = true;
|
|
|
- proxy.post("/accountRunningWater/internalTransfer", {...formData2.data}).then(
|
|
|
- () => {
|
|
|
- ElMessage({
|
|
|
- message: modalType.value == "add" ? "转账成功" : "转账成功",
|
|
|
- type: "success",
|
|
|
- });
|
|
|
- transferMoneyModal.value = false;
|
|
|
- getList();
|
|
|
- },
|
|
|
- (err) => {
|
|
|
- console.log(err);
|
|
|
- loadingDialog.value = false;
|
|
|
- }
|
|
|
- );
|
|
|
+ proxy
|
|
|
+ .post("/accountRunningWater/internalTransfer", { ...formData2.data })
|
|
|
+ .then(
|
|
|
+ () => {
|
|
|
+ ElMessage({
|
|
|
+ message: modalType.value == "add" ? "转账成功" : "转账成功",
|
|
|
+ type: "success",
|
|
|
+ });
|
|
|
+ transferMoneyModal.value = false;
|
|
|
+ getList();
|
|
|
+ },
|
|
|
+ (err) => {
|
|
|
+ console.log(err);
|
|
|
+ loadingDialog.value = false;
|
|
|
+ }
|
|
|
+ );
|
|
|
});
|
|
|
};
|
|
|
const submitForm = () => {
|
|
@@ -801,9 +935,9 @@ const update = (row) => {
|
|
|
proxy.post("/accountRunningWater/detail", { id: row.id }).then((res) => {
|
|
|
formData.data = res;
|
|
|
loadingDialog.value = false;
|
|
|
- getTransactionDepartment()
|
|
|
+ getTransactionDepartment();
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
dialogVisible.value = true;
|
|
|
};
|
|
|
const deriveExcel = () => {
|
|
@@ -896,7 +1030,8 @@ const submitSearch = () => {
|
|
|
if (
|
|
|
sourceList.value.pagination.beginAmount &&
|
|
|
sourceList.value.pagination.endAmount &&
|
|
|
- Number(sourceList.value.pagination.beginAmount) > Number(sourceList.value.pagination.endAmount)
|
|
|
+ Number(sourceList.value.pagination.beginAmount) >
|
|
|
+ Number(sourceList.value.pagination.endAmount)
|
|
|
) {
|
|
|
return ElMessage("交易金额输入错误");
|
|
|
}
|
|
@@ -908,7 +1043,7 @@ const submitSearch = () => {
|
|
|
return ElMessage("开始时间不能大于结束时间");
|
|
|
}
|
|
|
openSearch.value = false;
|
|
|
- sourceList.value.pagination.keyword = '';
|
|
|
+ sourceList.value.pagination.keyword = "";
|
|
|
sourceList.value.pagination.pageNum = 1;
|
|
|
getList();
|
|
|
};
|
|
@@ -923,7 +1058,8 @@ const openDetails = (val) => {
|
|
|
const printObj = ref({
|
|
|
id: "printMe",
|
|
|
popTitle: "",
|
|
|
- extraCss: "https://cdn.bootcdn.net/ajax/libs/animate.css/4.1.1/animate.compat.css, https://cdn.bootcdn.net/ajax/libs/hover.css/2.3.1/css/hover-min.css",
|
|
|
+ extraCss:
|
|
|
+ "https://cdn.bootcdn.net/ajax/libs/animate.css/4.1.1/animate.compat.css, https://cdn.bootcdn.net/ajax/libs/hover.css/2.3.1/css/hover-min.css",
|
|
|
extraHead: '<meta http-equiv="Content-Language"content="zh-cn"/>',
|
|
|
});
|
|
|
const clickDownload = () => {
|