|
@@ -129,10 +129,12 @@
|
|
|
:key="index"
|
|
|
:timestamp="activity.payUserName"
|
|
|
>
|
|
|
- <!-- <template default>
|
|
|
- <div>aa</div>
|
|
|
- </template> -->
|
|
|
- <div>付款金额:{{ moneyFormat(activity.amount, 2) }}</div>
|
|
|
+ <div>
|
|
|
+ 付款账号: {{ dictValueLabel(activity.payAccount, accountData) }}
|
|
|
+ </div>
|
|
|
+ <div style="margin-top: 5px">
|
|
|
+ 付款金额:{{ moneyFormat(activity.amount, 2) }}
|
|
|
+ </div>
|
|
|
<div style="margin-top: 5px">付款时间: {{ activity.payDate }}</div>
|
|
|
</el-timeline-item>
|
|
|
</el-timeline>
|
|
@@ -168,6 +170,9 @@ let modalType = ref("add");
|
|
|
let rules = ref({
|
|
|
amount: [{ required: true, message: "请输入付款金额", trigger: "blur" }],
|
|
|
payDate: [{ required: true, message: "请选择付款时间", trigger: "change" }],
|
|
|
+ payAccount: [
|
|
|
+ { required: true, message: "请选择付款账号", trigger: "change" },
|
|
|
+ ],
|
|
|
});
|
|
|
const { proxy } = getCurrentInstance();
|
|
|
const arrivalStatus = ref([
|
|
@@ -325,6 +330,14 @@ let formConfig = computed(() => [
|
|
|
prop: "payDate",
|
|
|
label: "付款时间",
|
|
|
format: "YYYY-MM-DD HH:mm:ss",
|
|
|
+ itemWidth: 35,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ type: "select",
|
|
|
+ prop: "payAccount",
|
|
|
+ label: "付款账号",
|
|
|
+ data: accountData.value,
|
|
|
+ itemWidth: 50,
|
|
|
},
|
|
|
{
|
|
|
type: "number",
|
|
@@ -503,8 +516,17 @@ const handleClear = (row) => {
|
|
|
});
|
|
|
});
|
|
|
};
|
|
|
-
|
|
|
+const accountData = ref([]);
|
|
|
+const getDict = () => {
|
|
|
+ proxy.getDictOne(["purchase_payment_account"]).then((res) => {
|
|
|
+ accountData.value = res["purchase_payment_account"].map((x) => ({
|
|
|
+ label: x.dictValue,
|
|
|
+ value: x.dictKey,
|
|
|
+ }));
|
|
|
+ });
|
|
|
+};
|
|
|
getList();
|
|
|
+getDict();
|
|
|
</script>
|
|
|
|
|
|
<style lang="scss" scoped>
|