diff --git a/src/api/budget/actual.js b/src/api/budget/actual.js index f12f277..f61a48c 100644 --- a/src/api/budget/actual.js +++ b/src/api/budget/actual.js @@ -3,7 +3,7 @@ import request from "@/utils/request"; export function getActual(params){ return request({ method:'get', - url:'/api/ht/contract-plan-act-links/index', + url:'/api/ht/contract-plan-act-temp/index', params }) } @@ -11,7 +11,7 @@ export function getActual(params){ export function delActual(params){ return request({ method:'get', - url:'/api/ht/contract-plan-act-links/destroy', + url:'/api/ht/contract-plan-act-temp/destroy', params }) } @@ -19,7 +19,7 @@ export function delActual(params){ export function editorActual(data){ return request({ method:'post', - url:'/api/ht/contract-plan-act-links/save', + url:'/api/ht/contract-plan-act-temp/save', data }) } @@ -27,7 +27,15 @@ export function editorActual(data){ export function detailActual(params){ return request({ method:'get', - url:"/api/ht/contract-plan-act-links/show", + url:"/api/ht/contract-plan-act-temp/show", params }) } + +export function carryActual(data){ + return request({ + method:'post', + url:"/api/ht/contract-plan-act-temp/carry", + data + }) +} diff --git a/src/views/away/component/MultiExamine.vue b/src/views/away/component/MultiExamine.vue index b92baab..fe473fd 100644 --- a/src/views/away/component/MultiExamine.vue +++ b/src/views/away/component/MultiExamine.vue @@ -57,7 +57,12 @@ width: 120, align: 'left' }, - + { + prop: 'zijinlaiyuan', + label: '资金来源', + minWidth: 240, + align: 'left' + }, { prop: 'flow.title', label: '流程名称', @@ -133,24 +138,24 @@ parent: null, // 添加父级字段 isSelect: false // 添加选中状态字段 }; - const innerData = originalData[xingming_details]; - innerData.map(item=>{ - item.isSelect = false - }) + const innerData = originalData[xingming_details]; + innerData.map(item => { + item.isSelect = false + }) person.children.push(...innerData) - // const source = { - // id: Math.random(), - // name: '', - // children: innerData.map((item) => ({ - // ...item, - // name: item.xingming_detail, - // parent: source, // 指向当前父级 - // isSelect: false // 添加选中状态字段 - // })), - // parent: person, // 指向当前父级 - // isSelect: false // 添加选中状态字段 - // }; - // person.children.push(source); + // const source = { + // id: Math.random(), + // name: '', + // children: innerData.map((item) => ({ + // ...item, + // name: item.xingming_detail, + // parent: source, // 指向当前父级 + // isSelect: false // 添加选中状态字段 + // })), + // parent: person, // 指向当前父级 + // isSelect: false // 添加选中状态字段 + // }; + // person.children.push(source); result.push(person); } diff --git a/src/views/budget/actual.vue b/src/views/budget/actual.vue index 25c7f73..9d343ab 100644 --- a/src/views/budget/actual.vue +++ b/src/views/budget/actual.vue @@ -1,163 +1,166 @@ - - - - - diff --git a/src/views/budget/components/addActual.vue b/src/views/budget/components/addActual.vue index e858d42..1929ebc 100644 --- a/src/views/budget/components/addActual.vue +++ b/src/views/budget/components/addActual.vue @@ -1,240 +1,252 @@ - - - - - diff --git a/src/views/budget/components/exeActual.vue b/src/views/budget/components/exeActual.vue new file mode 100644 index 0000000..aec6fa0 --- /dev/null +++ b/src/views/budget/components/exeActual.vue @@ -0,0 +1,177 @@ + + + + +