|
@@ -8,76 +8,34 @@
|
|
|
highlight-current-row
|
|
|
:selectConfig="selectConfig"
|
|
|
:action-list="[]"
|
|
|
- @get-list="getList"
|
|
|
- >
|
|
|
- <template #money="{ item }">
|
|
|
- {{ item.currency }} {{ moneyFormat(item.amount) }}
|
|
|
- </template>
|
|
|
+ @get-list="getList">
|
|
|
+ <template #money="{ item }"> {{ item.currency }} {{ moneyFormat(item.amount) }} </template>
|
|
|
<template #isClaim="{ item }">
|
|
|
<div style="width: 100%">
|
|
|
<span v-if="item.isClaim == 0">未认领</span>
|
|
|
- <a
|
|
|
- style="color: #409eff; cursor: pointer"
|
|
|
- @click="clickRecord(item)"
|
|
|
- v-else-if="item.isClaim == 1"
|
|
|
- >已认领</a
|
|
|
- >
|
|
|
- <a
|
|
|
- style="color: #409eff; cursor: pointer"
|
|
|
- @click="clickRecord(item)"
|
|
|
- v-else
|
|
|
- >部分认领</a
|
|
|
- >
|
|
|
+ <a style="color: #409eff; cursor: pointer" @click="clickRecord(item)" v-else-if="item.isClaim == 1">已认领</a>
|
|
|
+ <a style="color: #409eff; cursor: pointer" @click="clickRecord(item)" v-else>部分认领</a>
|
|
|
</div>
|
|
|
</template>
|
|
|
</byTable>
|
|
|
|
|
|
- <el-dialog
|
|
|
- title="认领"
|
|
|
- v-if="dialogVisible"
|
|
|
- v-model="dialogVisible"
|
|
|
- width="500"
|
|
|
- v-loading="loading"
|
|
|
- >
|
|
|
- <byForm
|
|
|
- :formConfig="formConfig"
|
|
|
- :formOption="formOption"
|
|
|
- v-model="formData.data"
|
|
|
- :rules="rules"
|
|
|
- ref="byform"
|
|
|
- >
|
|
|
+ <el-dialog title="认领" v-if="dialogVisible" v-model="dialogVisible" width="500" v-loading="loading">
|
|
|
+ <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="byform">
|
|
|
<template #detail>
|
|
|
<div style="width: 100%">
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- style="margin-bottom: 10px"
|
|
|
- @click="dialogVisibleOne = true"
|
|
|
- >选择合同</el-button
|
|
|
- >
|
|
|
+ <el-button type="primary" style="margin-bottom: 10px" @click="dialogVisibleOne = true">选择合同</el-button>
|
|
|
<el-table :data="formData.data.claimContractList">
|
|
|
<el-table-column prop="contractCode" label="合同编码" />
|
|
|
<el-table-column prop="money" label="关联金额" min-width="150">
|
|
|
<template #default="{ row, $index }">
|
|
|
- <el-form-item
|
|
|
- :prop="'claimContractList.' + $index + '.money'"
|
|
|
- :rules="rules.money"
|
|
|
- :inline-message="true"
|
|
|
- >
|
|
|
- <el-input-number
|
|
|
- v-model="row.money"
|
|
|
- :precision="4"
|
|
|
- :controls="false"
|
|
|
- :min="0"
|
|
|
- onmousewheel="return false;"
|
|
|
- />
|
|
|
+ <el-form-item :prop="'claimContractList.' + $index + '.money'" :rules="rules.money" :inline-message="true">
|
|
|
+ <el-input-number v-model="row.money" :precision="4" :controls="false" :min="0" onmousewheel="return false;" />
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="zip" label="操作" width="100">
|
|
|
<template #default="{ $index }">
|
|
|
- <el-button type="primary" link @click="handleRemove($index)"
|
|
|
- >删除</el-button
|
|
|
- >
|
|
|
+ <el-button type="primary" link @click="handleRemove($index)">删除</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
@@ -94,8 +52,7 @@
|
|
|
:on-preview="handlePreview"
|
|
|
:on-remove="handleRemove"
|
|
|
:on-success="handleSuccess"
|
|
|
- :before-upload="handleBeforeUpload"
|
|
|
- >
|
|
|
+ :before-upload="handleBeforeUpload">
|
|
|
<el-button type="primary">选择</el-button>
|
|
|
</el-upload>
|
|
|
<div>
|
|
@@ -107,8 +64,7 @@
|
|
|
v-for="(item, index) in fileListCopy"
|
|
|
:key="index"
|
|
|
closable
|
|
|
- @close="handleClose(index)"
|
|
|
- >
|
|
|
+ @close="handleClose(index)">
|
|
|
{{ item.fileName }}
|
|
|
</el-tag>
|
|
|
</div>
|
|
@@ -118,53 +74,28 @@
|
|
|
</byForm>
|
|
|
<template #footer>
|
|
|
<el-button @click="dialogVisible = false" size="large">取 消</el-button>
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- @click="submitForm('byform')"
|
|
|
- size="large"
|
|
|
- :loading="submitLoading"
|
|
|
- >
|
|
|
- 确 定
|
|
|
- </el-button>
|
|
|
+ <el-button type="primary" @click="submitForm('byform')" size="large" :loading="submitLoading"> 确 定 </el-button>
|
|
|
</template>
|
|
|
</el-dialog>
|
|
|
|
|
|
- <el-dialog
|
|
|
- title="合同选择"
|
|
|
- v-if="dialogVisibleOne"
|
|
|
- v-model="dialogVisibleOne"
|
|
|
- width="80%"
|
|
|
- v-loading="loading"
|
|
|
- destroy-on-close
|
|
|
- >
|
|
|
- <ContractSelect
|
|
|
- @handleSelectContrct="handleSelectContrct"
|
|
|
- ></ContractSelect>
|
|
|
+ <el-dialog title="合同选择" v-if="dialogVisibleOne" v-model="dialogVisibleOne" width="80%" v-loading="loading" destroy-on-close>
|
|
|
+ <ContractSelect @handleSelectContrct="handleSelectContrct"></ContractSelect>
|
|
|
</el-dialog>
|
|
|
|
|
|
- <el-dialog
|
|
|
- title="认领记录"
|
|
|
- v-if="openRecord"
|
|
|
- v-model="openRecord"
|
|
|
- width="500"
|
|
|
- >
|
|
|
- <byForm
|
|
|
- :formConfig="formRecordConfig"
|
|
|
- :formOption="formOption"
|
|
|
- v-model="rowData.data"
|
|
|
- >
|
|
|
+ <el-dialog title="认领记录" v-if="openRecord" v-model="openRecord" width="500">
|
|
|
+ <byForm :formConfig="formRecordConfig" :formOption="formOption" v-model="rowData.data">
|
|
|
<template #recordList>
|
|
|
- <div
|
|
|
- style="width: 100%"
|
|
|
- v-if="rowData.data.recordList && rowData.data.recordList.length > 0"
|
|
|
- >
|
|
|
- <div v-for="(item, index) in rowData.data.recordList" :key="index">
|
|
|
- <div style="color: #ccc">{{ item.createTime }}</div>
|
|
|
- <div>认领人: {{ item.claimUserName }}</div>
|
|
|
- <div>合同编号: {{ item.contractCode }}</div>
|
|
|
- <div>认领金额: {{ item.currency }}{{ item.money }}</div>
|
|
|
- <br />
|
|
|
+ <div>
|
|
|
+ <div style="width: 100%" v-if="rowData.data.recordList && rowData.data.recordList.length > 0">
|
|
|
+ <div v-for="(item, index) in rowData.data.recordList" :key="index">
|
|
|
+ <div style="color: #ccc">{{ item.createTime }}</div>
|
|
|
+ <div>认领人: {{ item.claimUserName }}</div>
|
|
|
+ <div>合同编号: {{ item.contractCode }}</div>
|
|
|
+ <div>认领金额: {{ item.currency }}{{ item.money }}</div>
|
|
|
+ <br />
|
|
|
+ </div>
|
|
|
</div>
|
|
|
+ <div v-else>无</div>
|
|
|
</div>
|
|
|
</template>
|
|
|
</byForm>
|
|
@@ -419,15 +350,13 @@ const formConfig = reactive([
|
|
|
const getList = async (req) => {
|
|
|
sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
|
|
|
loading.value = true;
|
|
|
- proxy
|
|
|
- .post("/accountRunningWater/page", sourceList.value.pagination)
|
|
|
- .then((message) => {
|
|
|
- sourceList.value.data = message.rows;
|
|
|
- sourceList.value.pagination.total = message.total;
|
|
|
- setTimeout(() => {
|
|
|
- loading.value = false;
|
|
|
- }, 200);
|
|
|
- });
|
|
|
+ proxy.post("/accountRunningWater/page", sourceList.value.pagination).then((message) => {
|
|
|
+ sourceList.value.data = message.rows;
|
|
|
+ sourceList.value.pagination.total = message.total;
|
|
|
+ setTimeout(() => {
|
|
|
+ loading.value = false;
|
|
|
+ }, 200);
|
|
|
+ });
|
|
|
};
|
|
|
const submitForm = () => {
|
|
|
byform.value.handleSubmit((valid) => {
|
|
@@ -541,9 +470,7 @@ const handleRemove = (index) => {
|
|
|
});
|
|
|
};
|
|
|
const handleSelectContrct = (row) => {
|
|
|
- const flag = formData.data.claimContractList.some(
|
|
|
- (x) => x.contractId === row.id
|
|
|
- );
|
|
|
+ const flag = formData.data.claimContractList.some((x) => x.contractId === row.id);
|
|
|
if (flag)
|
|
|
return ElMessage({
|
|
|
message: "该合同已选择",
|