|
@@ -59,25 +59,11 @@
|
|
|
:disabled="disabled"
|
|
|
:rowNumber="true"
|
|
|
:rowSelection="true"
|
|
|
-
|
|
|
+ @valueChange="changeValues"
|
|
|
asyncRemove
|
|
|
>
|
|
|
- <!-- @value-change="changeValues" -->
|
|
|
- <!-- <template #approverIdSlot="props" >
|
|
|
- <ApiSelect
|
|
|
- :api="SaleManOption"
|
|
|
- showSearch
|
|
|
- v-model:value="props.row.approverId"
|
|
|
- :filterOption="true"
|
|
|
- resultField="records"
|
|
|
- labelField="realname"
|
|
|
- valueField="username"
|
|
|
- :params="{ pageSize: -1 }"
|
|
|
- optionFilterProp="label"
|
|
|
- />
|
|
|
- </template> -->
|
|
|
<template #action="props">
|
|
|
- <a-popconfirm title="确定删除吗?" @confirm="changeValues(props)">
|
|
|
+ <a-popconfirm title="确定删除吗?" @confirm="handleDelete1(props)">
|
|
|
<a>删除(delete)</a>
|
|
|
</a-popconfirm>
|
|
|
</template>
|
|
@@ -91,9 +77,9 @@
|
|
|
import { defineComponent, ref, reactive, computed, toRaw, onMounted } from 'vue';
|
|
|
import { defHttp } from '/@/utils/http/axios';
|
|
|
import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
|
|
|
- import {querySonTable,queryDataById,saveOrUpdate, queryDeliverDataById,SaleManOption} from '../approvalProcessConfigForm.api';
|
|
|
+ import {querySonTable,queryDataById,saveOrUpdate, SaleManOption} from '../approvalProcessConfigForm.api';
|
|
|
import { JVxeTable } from '/@/components/jeecg/JVxeTable';
|
|
|
- import { SonTableColumns } from '../approvalProcessConfigForm.data';
|
|
|
+ import { SonTableColumns,editPersonOption } from '../approvalProcessConfigForm.data';
|
|
|
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
|
|
|
import { JDictSelectTag, JSelectMultiple } from '/@/components/Form';
|
|
|
import { ApiSelect } from '/@/components/Form/index';
|
|
@@ -118,6 +104,7 @@
|
|
|
},
|
|
|
emits: ['success'],
|
|
|
setup(props, { emit }) {
|
|
|
+ var PersonOption = ref([]);
|
|
|
const loading = ref(false);
|
|
|
const formRef = ref();
|
|
|
const approvalProcessConfigFormTableRef = ref();
|
|
@@ -168,7 +155,8 @@
|
|
|
function add() {
|
|
|
resetFields();
|
|
|
approvalProcessConfigFormTable.dataSource = [];
|
|
|
- activeKey.value = 'approvalProcessConfigForm';
|
|
|
+ activeKey.value = 'approvalProcessConfigForm'
|
|
|
+ getPersonOption()
|
|
|
}
|
|
|
//编辑方法
|
|
|
async function edit(row) {
|
|
@@ -177,6 +165,7 @@
|
|
|
//子表数据
|
|
|
const approvalProcessConfigFormDataList = await querySonTable(row['id']);
|
|
|
approvalProcessConfigFormTable.dataSource = [...approvalProcessConfigFormDataList];
|
|
|
+ getPersonOption()
|
|
|
}
|
|
|
//获取主表
|
|
|
async function queryMainData(id) {
|
|
@@ -252,8 +241,17 @@
|
|
|
async function changeValues(prop) {
|
|
|
if (prop.col.key == 'approverId') {
|
|
|
var obj = await SaleManOption({username:prop.row.approverId })
|
|
|
+ prop.row.approverName = obj.records[0].realname
|
|
|
}
|
|
|
}
|
|
|
+ async function getPersonOption(){
|
|
|
+ var arr= await SaleManOption({pageSize:-1})
|
|
|
+ arr.records.forEach(item=>{
|
|
|
+ item.text=item.username
|
|
|
+ item.value=item.realname
|
|
|
+ })
|
|
|
+ editPersonOption(arr.records)
|
|
|
+ }
|
|
|
return {
|
|
|
approvalProcessConfigFormTableRef,
|
|
|
approvalProcessConfigFormTable,
|
|
@@ -273,7 +271,8 @@
|
|
|
formRef,
|
|
|
handleDelete1,
|
|
|
SaleManOption,
|
|
|
- changeValues
|
|
|
+ changeValues,
|
|
|
+ PersonOption
|
|
|
};
|
|
|
},
|
|
|
});
|