|
@@ -123,7 +123,7 @@ import {ref, onActivated} from "vue";
|
|
|
import {useRouter, useRoute} from 'vue-router'
|
|
|
import {getProjectList} from "~api/other";
|
|
|
import mainApi from "~api/expense/paymentRequest";
|
|
|
-import {formValidate, getArrValue, getObjValue} from "js-fast-way";
|
|
|
+import {deepClone, formValidate, getArrValue, getObjValue} from "js-fast-way";
|
|
|
|
|
|
//初始变量
|
|
|
const router = useRouter()
|
|
@@ -280,15 +280,32 @@ const timeLineData = ref([
|
|
|
{title: '抄送人', section: '总经理、财务、申请人'},
|
|
|
])
|
|
|
|
|
|
+//处理表单数据
|
|
|
+const getFormData = (submitStatus = 1) => {
|
|
|
+ const res = deepClone(formModel.value)
|
|
|
+ const cashierUser = {userId: ''} //出纳人
|
|
|
+ const ccUserList = [{userId: ''}] //抄送人列表
|
|
|
+ const finalConfirmationUser = {userId: ''} //最终确认付款人
|
|
|
+ const financeUser = {userId: ''} //财务人员
|
|
|
+ const responsibleUser = {userId: ''} //部门负责人
|
|
|
+ //----处理数据----
|
|
|
+ return {
|
|
|
+ ...res,
|
|
|
+ cashierUser,
|
|
|
+ ccUserList,
|
|
|
+ finalConfirmationUser,
|
|
|
+ financeUser,
|
|
|
+ responsibleUser,
|
|
|
+ submitStatus //提交状态 1=暂存 2=提交审批
|
|
|
+ }
|
|
|
+}
|
|
|
|
|
|
//暂存数据
|
|
|
const tempLoading = ref(false)
|
|
|
const tempDraftData = async () => {
|
|
|
tempLoading.value = true
|
|
|
- const {error, code, msg} = await mainApi.submit({
|
|
|
- ...formModel.value,
|
|
|
- submitStatus: 1
|
|
|
- })
|
|
|
+ const form = getFormData(1)
|
|
|
+ const {error, code, msg} = await mainApi.submit(form)
|
|
|
//判断状态
|
|
|
tempLoading.value = false
|
|
|
if (!error && code === 200) {
|
|
@@ -305,10 +322,8 @@ const submitFormData = async () => {
|
|
|
if (res) {
|
|
|
submitLoading.value = true
|
|
|
//发起请求
|
|
|
- const {error, code, msg} = await mainApi.submit({
|
|
|
- ...formModel.value,
|
|
|
- submitStatus: 2
|
|
|
- })
|
|
|
+ const form = getFormData(2)
|
|
|
+ const {error, code, msg} = await mainApi.submit(form)
|
|
|
//判断状态
|
|
|
submitLoading.value = false
|
|
|
if (!error && code === 200) {
|