外包支付

src/api/modules/expense/outsourcing.js

@@ -0,0 +1,52 @@
+import {httpApi} from "../../request/httpApi";
+
+export default {
+    //分页查询
+    async page(form, msg = false) {
+        return httpApi({
+            url: '/api/blade-control/expense/outsourcing/page',
+            method: 'post',
+            data: form
+        }, msg);
+    },
+    //草稿箱列表
+    async draft(form = {}, msg = false) {
+        return httpApi({
+            url: '/api/blade-control/expense/outsourcing/draft/list',
+            method: 'get',
+            params: form
+        }, msg);
+    },
+    //数据详情
+    async detail(form, msg = false) {
+        return httpApi({
+            url: '/api/blade-control/expense/outsourcing/detail',
+            method: 'get',
+            params: form
+        }, msg);
+    },
+    //提交申请
+    async submit(form, msg = false) {
+        return httpApi({
+            url: '/api/blade-control/expense/outsourcing/submit',
+            method: 'post',
+            data: form
+        }, msg);
+    },
+    //记录物理删除
+    async remove(form, msg = false) {
+        return httpApi({
+            url: '/api/blade-control/expense/outsourcing/remove',
+            method: 'post',
+            params: form
+        }, msg);
+    },
+    //记录撤销
+    async cancel(form, msg = false) {
+        return httpApi({
+            url: '/api/blade-control/expense/outsourcing/cancel',
+            method: 'post',
+            params: form
+        }, msg);
+    },
+}

src/views/expense/invoice/index.vue

@@ -137,7 +137,7 @@ const tableColumn = [
     {key: 'invoiceUserName', name: '开票人', width: '160', align: 'center'},
     {key: 'approvalResultName', name: '审批结果', width: '160', align: 'center'},
     {key: 'approvalStatusName', name: '审批状态', width: '140', align: 'center'},
-    {key: 'createUser', name: '创建人', width: '140', align: 'center'},
+    {key: 'createName', name: '创建人', width: '140', align: 'center'},
     {key: 'createTime', name: '创建时间', width: '160', align: 'center'},
     {key: 'action', name: '操作', width: '220', align: 'center', fixed: 'right'},
 ]

src/views/expense/loanRequest/index.vue

@@ -115,7 +115,7 @@ const tableColumn = [
     {key: 'remarks', name: '备注', minWidth: '200', align: 'center'},
     {key: 'approvalResultName', name: '审批结果', width: '160', align: 'center'},
     {key: 'approvalStatusName', name: '审批状态', width: '140', align: 'center'},
-    {key: 'createUser', name: '创建人', width: '140', align: 'center'},
+    {key: 'createName', name: '创建人', width: '140', align: 'center'},
     {key: 'createTime', name: '创建时间', width: '160', align: 'center'},
     {key: 'action', name: '操作', width: '90', align: 'center', fixed: 'right'},
 ]

src/views/expense/outsourcing/index.vue

@@ -3,14 +3,26 @@
         <template #header>
             <div class="w-72">
                 <el-select v-model="searchForm.projectType" block clearable placeholder="项目名称" size="large">
-                    <el-option v-for="item in projectType" :label="item.name" :value="item.key"/>
+                    <el-option v-for="item in projectType" :label="item.projectName" :value="item.projectId"/>
                 </el-select>
             </div>
+            <div class="ml-4">
+                <el-button type="primary" @click="searchClick" size="large">
+                    <HcIcon name="search-2"/>
+                    <span>搜索</span>
+                </el-button>
+            </div>
+            <div class="ml-2">
+                <el-button size="large" @click="resetClick">
+                    <HcIcon name="close-circle"/>
+                    <span>重置</span>
+                </el-button>
+            </div>
         </template>
         <template #extra>
             <el-button size="large" type="warning" hc-btn @click="draftsClick">
                 <HcIcon name="draft"/>
-                <span>草稿箱(1)</span>
+                <span>草稿箱{{draftNum > 0 ? `(${draftNum})` : ''}}</span>
             </el-button>
             <el-button size="large" type="primary" hc-btn @click="addRowClick">
                 <HcIcon name="add"/>
@@ -19,11 +31,15 @@
         </template>
 
         <HcTable :column="tableColumn" :datas="tableData" :loading="tableLoading">
-            <template #key="{row}">
-                <span class="text-blue" @click="rowNameTap(row)">{{row.key}}</span>
-            </template>
             <template #action="{row,index}">
-                <el-button size="small" type="primary">撤销</el-button>
+                <el-popconfirm title="是否确认撤销?" hide-icon @confirm="rowCancel(row)">
+                    <template #reference>
+                        <el-button size="small" type="primary"
+                                   :disabled="row.status !== 1"
+                                   :loading="row.isCancelLoading"
+                        >撤销</el-button>
+                    </template>
+                </el-popconfirm>
             </template>
         </HcTable>
 
@@ -32,13 +48,15 @@
         </template>
 
         <!--草稿箱-->
-        <HcDialog bgColor="#ffffff" isToBody isTable :footer="false" :show="draftsModal" title="草稿箱(1)" widths="62rem" @close="draftsCloseClick">
+        <HcDialog isToBody isTable bgColor="#ffffff" widths="62rem" :footer="false" :show="draftsModal"
+                  :title="draftNum > 0 ? `草稿箱(${draftNum})` : '草稿箱'" @close="draftsCloseClick"
+        >
             <el-alert title="3个月内未更新的草稿将被自动删除" type="warning" show-icon />
             <div style="position: relative;height: calc(100% - 44px);">
                 <HcTable :isIndex="false" :column="tableDraftsColumn" :datas="tableDraftsData">
                     <template #action="{row,index}">
-                        <el-button size="small" type="primary">继续编辑</el-button>
-                        <el-button size="small" type="danger">删除</el-button>
+                        <el-button size="small" type="primary" @click="editDraftClick(row)">继续编辑</el-button>
+                        <el-button size="small" type="danger" @click="delDraftClick(row)">删除</el-button>
                     </template>
                 </HcTable>
             </div>
@@ -47,24 +65,39 @@
 </template>
 
 <script setup>
-import {ref} from "vue";
+import {onActivated, ref} from "vue";
 import {useRouter} from 'vue-router'
+import mainApi from "~api/expense/outsourcing"
+import {getProjectList} from "~api/other"
+import {getArrValue} from "js-fast-way";
+import {delMessage} from "~uti/tools";
 
 const router = useRouter()
 
+onActivated(() => {
+    getApi()
+})
+
+const getApi = () => {
+    getProjectData()
+    getTableData()
+    getDraftNum()
+}
+
 //项目类型
-const projectType = ref([
-    {name: '二级路', key: '二级路'},
-    {name: '国道', key: '国道'},
-    {name: '水利水电', key: '水利水电'},
-    {name: '市政', key: '市政'},
-])
+const projectType = ref([])
+const getProjectData = async () => {
+    const {error, code, data} = await getProjectList()
+    //判断状态
+    if (!error && code === 200) {
+        projectType.value = getArrValue(data)
+    } else {
+        projectType.value = []
+    }
+}
 
 //搜索表单
-const searchForm = ref({
-    projectType: null, user: null, project: null,
-    current: 1, size: 20, total: 0
-})
+const searchForm = ref({projectId: null, current: 1, size: 20, total: 0})
 
 //搜索
 const searchClick = () => {
@@ -87,33 +120,30 @@ const pageChange = ({current, size}) => {
 //获取数据
 const tableLoading = ref(false)
 const tableColumn = [
-    {key: 'key1', name: '外包类型', width: '140'},
-    {key: 'key2', name: '关联项目', minWidth: '200'},
-    {key: 'key3', name: '支付金额', width: '160', align: 'center'},
-    {key: 'key4', name: '支付对方', width: '140', align: 'center'},
-    {key: 'key5', name: '审批结果', width: '140', align: 'center'},
-    {key: 'key6', name: '审批状态', width: '140', align: 'center'},
-    {key: 'key7', name: '申请支付时间', width: '180', align: 'center'},
-    {key: 'key8', name: '创建人', width: '140', align: 'center'},
-    {key: 'key9', name: '创建时间', width: '160', align: 'center'},
+    {key: 'outsourcingTypeName', name: '外包类型', width: '140'},
+    {key: 'projectName', name: '关联项目', minWidth: '200'},
+    {key: 'payMoney', name: '支付金额', width: '160', align: 'center'},
+    {key: 'toUnit', name: '支付对方', width: '140', align: 'center'},
+    {key: 'approvalResultName', name: '审批结果', width: '140', align: 'center'},
+    {key: 'approvalStatusName', name: '审批状态', width: '140', align: 'center'},
+    {key: 'payDate', name: '申请支付时间', width: '180', align: 'center'},
+    {key: 'createName', name: '创建人', width: '140', align: 'center'},
+    {key: 'createTime', name: '创建时间', width: '160', align: 'center'},
     {key: 'action', name: '操作', width: '90', align: 'center', fixed: 'right'},
 ]
-const tableData = ref([
-    {id: 1, key: 'YS-01', key1: 'xxxx', key2: 'xxxx', key3: '65632', key4: '35654', key5: '12312', key6: 'xxxx'},
-    {id: 2, key: 'YS-01', key1: 'xxxx', key2: 'xxxx', key3: '65632', key4: '35654', key5: '12312', key6: 'xxxx'},
-    {id: 3, key: 'YS-01', key1: 'xxxx', key2: 'xxxx', key3: '65632', key4: '35654', key5: '12312', key6: 'xxxx'},
-    {id: 4, key: 'YS-01', key1: 'xxxx', key2: 'xxxx', key3: '65632', key4: '35654', key5: '12312', key6: 'xxxx'},
-    {id: 5, key: 'YS-01', key1: 'xxxx', key2: 'xxxx', key3: '65632', key4: '35654', key5: '12312', key6: 'xxxx'},
-    {id: 6, key: 'YS-01', key1: 'xxxx', key2: 'xxxx', key3: '65632', key4: '35654', key5: '12312', key6: 'xxxx'},
-])
-
-const getTableData = () => {
-
-}
-
-//预览
-const rowNameTap = (row) => {
-
+const tableData = ref([])
+const getTableData = async () => {
+    tableLoading.value = true
+    const {error, code, data} = await mainApi.page(searchForm.value)
+    //判断状态
+    tableLoading.value = false
+    if (!error && code === 200) {
+        tableData.value = getArrValue(data['records'])
+        searchForm.value.total = data['total'] || 0
+    } else {
+        tableData.value = []
+        searchForm.value.total = 0
+    }
 }
 
 //新增预算
@@ -123,21 +153,78 @@ const addRowClick = () => {
     })
 }
 
+//撤销
+const rowCancel = async (row) => {
+    row.isCancelLoading = true
+    const {error, code, msg} = await mainApi.cancel({
+        id: row.id
+    })
+    //判断状态
+    row.isCancelLoading = false
+    if (!error && code === 200) {
+        window.$message?.success(msg)
+        getTableData().then()
+    } else {
+        window.$message?.error(msg)
+    }
+}
+
 //草稿箱
 const draftsModal = ref(false)
 const draftsClick = () => {
+    tableDraftsData.value = []
     draftsModal.value = true
+    getDraftNum()
 }
 const draftsCloseClick = () => {
     draftsModal.value = false
 }
 
 //草稿箱数据
+const draftNum = ref(0)
 const tableDraftsColumn = [
-    {key: 'key1', name: '标题'},
-    {key: 'key2', name: '更新时间', width: '200'},
+    {key: 'title', name: '标题'},
+    {key: 'updateTime', name: '更新时间', width: '200'},
     {key: 'action', name: '操作', width: '170', align: 'center'},
 ]
-const tableDraftsData = ref([{id: 1, key1: 'xxxx', key2: 'xxxx'}, {id: 2, key1: 'xxxx', key2: 'xxxx'}, {id: 3, key1: 'xxxx', key2: 'xxxx'}])
+const tableDraftsData = ref([])
+
+//获取草稿数量
+const getDraftNum = async () => {
+    const {error, code, data} = await mainApi.draft()
+    //判断状态
+    if (!error && code === 200) {
+        const res = getArrValue(data)
+        tableDraftsData.value = res
+        draftNum.value = res.length
+    } else {
+        tableDraftsData.value = []
+        draftNum.value = 0
+    }
+}
 
+//继续编辑
+const editDraftClick = ({id}) => {
+    draftsModal.value = false
+    router.push({
+        name: 'expense-outsourcing-record',
+        query: {id: id}
+    })
+}
+
+//删除草稿
+const delDraftClick = ({id}) => {
+    delMessage(async () => {
+        const {error, code, msg} = await mainApi.remove({
+            id: id
+        })
+        //判断状态
+        if (!error && code === 200) {
+            window.$message?.success(msg)
+            getDraftNum().then()
+        } else {
+            window.$message?.error(msg)
+        }
+    })
+}
 </script>

src/views/expense/outsourcing/record.vue

@@ -1,36 +1,36 @@
 <template>
     <HcCard>
         <template #header>
-            <div class="hc-expense-total-title">支付总额(元)：1520</div>
+            <div class="hc-expense-total-title">支付总额(元)：{{formModel.payMoney ?? 0}}</div>
         </template>
         <div class="hac-expense-record-body">
             <div class="record-form-box">
                 <el-scrollbar>
                     <el-form ref="formRef" :model="formModel" :rules="formRules" label-position="left" label-width="auto" size="large">
                         <div class="hc-form-item">
-                            <el-form-item label="关联项目：" prop="key2">
-                                <el-select block v-model="formModel.key4">
-                                    <el-option label="选项1" value="选项1"/>
-                                    <el-option label="选项2" value="选项2"/>
+                            <el-form-item label="关联项目：">
+                                <el-select block v-model="formModel.projectId">
+                                    <el-option v-for="item in projectType" :label="item.projectName" :value="item.projectId"/>
                                 </el-select>
                             </el-form-item>
-                            <el-form-item label="非项目请输入：" prop="key3">
-                                <el-input v-model="formModel.key2"/>
+                            <el-form-item label="非项目请输入：">
+                                <el-input v-model="formModel.noProjectDesc"/>
                             </el-form-item>
                         </div>
-                        <el-form-item label="对方单位：" prop="key3">
-                            <el-input v-model="formModel.key2"/>
+                        <el-form-item label="对方单位：">
+                            <el-input v-model="formModel.toUnit"/>
                         </el-form-item>
                         <el-form-item label="支付金额：" prop="key3">
-                            <el-input v-model="formModel.key2"/>
+                            <el-input v-model="formModel.payMoney">
+                                <template #append>元</template>
+                            </el-input>
                         </el-form-item>
-                        <el-form-item label="申请支付时间：" prop="key3">
-                            <el-date-picker type="date" class="block" v-model="formModel.key3" format="YYYY-MM-DD" value-format="YYYY-MM-DD"/>
+                        <el-form-item label="申请支付时间：">
+                            <el-date-picker type="date" class="block" v-model="formModel.payDate" format="YYYY-MM-DD" value-format="YYYY-MM-DD"/>
                         </el-form-item>
-                        <el-form-item label="外包类型：" prop="key2">
-                            <el-select block v-model="formModel.key4">
-                                <el-option label="选项1" value="选项1"/>
-                                <el-option label="选项2" value="选项2"/>
+                        <el-form-item label="外包类型：">
+                            <el-select block v-model="formModel.outsourcingType">
+                                <el-option v-for="item in outsourcingTypeData" :label="item.dictName" :value="item.dictValue"/>
                             </el-select>
                         </el-form-item>
                     </el-form>
@@ -49,13 +49,13 @@
                     </el-scrollbar>
                 </div>
                 <div class="action">
-                    <el-button type="warning" hc-btn>
+                    <el-button type="warning" hc-btn :loading="tempLoading" @click="tempDraftData">
                         <HcIcon name="draft"/>
                         <span>暂存草稿</span>
                     </el-button>
-                    <el-button type="primary" hc-btn>
+                    <el-button type="primary" hc-btn :loading="submitLoading" @click="submitFormData">
                         <HcIcon name="check-double"/>
-                        <span>提交报销申请</span>
+                        <span>提交申请</span>
                     </el-button>
                 </div>
             </div>
@@ -64,17 +64,80 @@
 </template>
 
 <script setup>
-import {ref} from "vue";
-import {useRouter} from 'vue-router'
+import {onActivated, ref} from "vue";
+import {useRouter, useRoute} from 'vue-router'
+import mainApi from "~api/expense/outsourcing"
+import {getProjectList} from "~api/other"
+import {getDictInfo} from "~api/system/parameter";
+import {deepClone, formValidate, getArrValue, getObjValue} from "js-fast-way";
+
+//初始变量
 const router = useRouter()
+const useRoutes = useRoute()
 
-//明细表单
-const formRef = ref(null)
-const formModel = ref({
-    key1: '', key2: '', key3: '', key4: '', key5: '',
+//路由参数
+const dataId = ref(useRoutes?.query?.id ?? '')
+
+onActivated(() => {
+    dataId.value = useRoutes?.query?.id ?? ''
+    getApi()
 })
+
+const getApi = () => {
+    getOutsourcingType()
+    getProjectData()
+    //获取数据详情
+    if (dataId.value > 0) {
+        getDetailsData()
+    } else {
+        formModel.value = {}
+    }
+}
+
+//项目类型
+const projectType = ref([])
+const getProjectData = async () => {
+    const {error, code, data} = await getProjectList()
+    //判断状态
+    if (!error && code === 200) {
+        projectType.value = getArrValue(data)
+    } else {
+        projectType.value = []
+    }
+}
+
+//发票类型字典
+const outsourcingTypeData = ref([])
+const getOutsourcingType = async () => {
+    const {error, code, data} = await getDictInfo('outsourcing_type')
+    //判断状态
+    if (!error && code === 200) {
+        outsourcingTypeData.value = getArrValue(data)
+    } else {
+        outsourcingTypeData.value = []
+    }
+}
+
+
+//表单
+const formRef = ref(null)
+const formModel = ref({})
 const formRules = {}
 
+//草稿数据详情
+const getDetailsData = async () => {
+    const {error, code, data} = await mainApi.detail({
+        id: dataId.value
+    })
+    //判断状态
+    if (!error && code === 200) {
+        formModel.value = getObjValue(data)
+    } else {
+        formModel.value = {}
+    }
+}
+
+//流程数据
 const timeLineData = ref([
     {title: '审批人', section: '部门负责人'},
     {title: '财务审核', section: '财务'},
@@ -82,6 +145,61 @@ const timeLineData = ref([
     {title: '出纳付款', section: '出纳'},
     {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 form = getFormData(1)
+    const {error, code, msg} = await mainApi.submit(form)
+    //判断状态
+    tempLoading.value = false
+    if (!error && code === 200) {
+        window.$message?.success('暂存成功')
+    } else {
+        window.$message?.error(msg)
+    }
+}
+
+//提交申请
+const submitLoading = ref(false)
+const submitFormData = async () => {
+    const res = await formValidate(formRef.value)
+    if (res) {
+        submitLoading.value = true
+        //发起请求
+        const form = getFormData(2)
+        const {error, code, msg} = await mainApi.submit(form)
+        //判断状态
+        submitLoading.value = false
+        if (!error && code === 200) {
+            window.$message?.success('提交成功')
+        } else {
+            window.$message?.error(msg)
+        }
+    }
+}
 </script>
 
 <style scoped lang="scss">

src/views/expense/purchaseRequest/index.vue

@@ -133,7 +133,7 @@ const tableColumn = [
     {key: 'purPrice', name: '总采购资金', width: '160', align: 'center'},
     {key: 'approvalResultName', name: '审批结果', width: '140', align: 'center'},
     {key: 'approvalStatusName', name: '审批状态', width: '160', align: 'center'},
-    {key: 'createUser', name: '创建人', width: '140', align: 'center'},
+    {key: 'createName', name: '创建人', width: '140', align: 'center'},
     {key: 'createTime', name: '创建时间', width: '160', align: 'center'},
     {key: 'action', name: '操作', width: '90', align: 'center', fixed: 'right'},
 ]