更新费用管理、财务报销/支付申请/借款申请

src/styles/expense/expense.scss

@@ -7,3 +7,6 @@
 .hac-expense-record-body .record-flow-box .el-timeline {
     padding: 5px;
 }
+.hac-expense-record-body .record-form-box .el-scrollbar .el-scrollbar__bar {
+    right: -16px;
+}

src/views/expense/loanRequest/index.vue

@@ -2,27 +2,10 @@
     <HcCard>
         <template #header>
             <div class="w-36">
-                <el-select v-model="searchForm.projectType" block clearable placeholder="归属人" size="large">
+                <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-select>
             </div>
-            <div class="w-72 ml-2">
-                <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-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">
@@ -31,11 +14,11 @@
             </el-button>
             <el-button size="large" type="primary" hc-btn @click="addRowClick">
                 <HcIcon name="add"/>
-                <span>新增报销记录</span>
+                <span>新增借款记录</span>
             </el-button>
         </template>
 
-        <HcTable :isIndex="false" :column="tableColumn" :datas="tableData" :loading="tableLoading">
+        <HcTable :column="tableColumn" :datas="tableData" :loading="tableLoading">
             <template #key="{row}">
                 <span class="text-blue" @click="rowNameTap(row)">{{row.key}}</span>
             </template>
@@ -104,16 +87,16 @@ const pageChange = ({current, size}) => {
 //获取数据
 const tableLoading = ref(false)
 const tableColumn = [
-    {key: 'key', name: '报销编号', width: '120', align: 'center'},
-    {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: '160', align: 'center'},
-    {key: 'key8', name: '创建人', width: '140', align: 'center'},
-    {key: 'key9', name: '创建时间', width: '160', align: 'center'},
+    {key: 'key1', name: '申请人', width: '140'},
+    {key: 'key2', name: '借款事由', minWidth: '200'},
+    {key: 'key3', name: '申请金额', width: '160', align: 'center'},
+    {key: 'key4', name: '使用日期-归还期', width: '160', align: 'center'},
+    {key: 'key5', name: '还款状态', width: '140', align: 'center'},
+    {key: 'key6', name: '备注', minWidth: '200', align: 'center'},
+    {key: 'key7', name: '审批结果', width: '160', align: 'center'},
+    {key: 'key8', name: '审批状态', width: '140', align: 'center'},
+    {key: 'key9', name: '创建人', width: '140', align: 'center'},
+    {key: 'key10', name: '创建时间', width: '160', align: 'center'},
     {key: 'action', name: '操作', width: '90', align: 'center', fixed: 'right'},
 ]
 const tableData = ref([
@@ -134,10 +117,10 @@ const rowNameTap = (row) => {
 
 }
 
-//新增预算
+//新增
 const addRowClick = () => {
     router.push({
-        name: 'expense-finReimburse-record'
+        name: 'expense-loanRequest-record'
     })
 }
 

src/views/expense/loanRequest/record.vue

@@ -1,90 +1,35 @@
 <template>
     <HcCard>
         <template #header>
-            <div class="hc-expense-total-title">报销总额(元)：1520</div>
+            <div class="hc-expense-total-title">借款总额(元)：1520</div>
         </template>
         <div class="hac-expense-record-body">
             <div class="record-form-box">
                 <el-scrollbar>
-                    <HcCardItem title="报销明细1" ui="hac-bg-grey">
-                        <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="key1">
-                                    <el-select block v-model="formModel.key1">
-                                        <el-option label="选项1" value="选项1"/>
-                                        <el-option label="选项2" value="选项2"/>
-                                    </el-select>
-                                </el-form-item>
-                                <div class="ml-2">
-                                    <el-button type="default" @click="budgetModalShow">
-                                        <HcIcon name="add"/>
-                                        <span>关联预算计划</span>
-                                    </el-button>
-                                </div>
-                            </div>
-                            <div class="hc-form-item">
-                                <el-form-item label="报销金额(元)：" prop="key2">
-                                    <el-input v-model="formModel.key2" placeholder="请输入报销金额" />
-                                </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>
-                                <el-form-item label="费用类型：" prop="key4">
-                                    <el-select block v-model="formModel.key4">
-                                        <el-option label="选项1" value="选项1"/>
-                                        <el-option label="选项2" value="选项2"/>
-                                    </el-select>
-                                </el-form-item>
-                            </div>
-                            <el-form-item label="费用说明：">
-                                <el-input type="textarea"
-                                          v-model="formModel.key5"
-                                          :autosize="{ minRows: 3, maxRows: 5 }"
-                                          placeholder="请输入费用说明"
-                                />
+                    <el-form ref="formRef" :model="formModel" :rules="formRules" label-position="top" size="large">
+                        <el-form-item label="申请人：" prop="key1">
+                            <el-input v-model="formModel.key1"/>
+                        </el-form-item>
+                        <el-form-item label="借款事由：">
+                            <el-input type="textarea" v-model="formModel.key8" :autosize="{ minRows: 3, maxRows: 5 }"/>
+                        </el-form-item>
+                        <el-form-item label="申请金额：" prop="key7">
+                            <el-input v-model="formModel.key7">
+                                <template #append>元</template>
+                            </el-input>
+                        </el-form-item>
+                        <div class="hc-form-item">
+                            <el-form-item label="使用日期：" prop="key2">
+                                <el-date-picker type="date" class="block" v-model="formModel.key2" format="YYYY-MM-DD" value-format="YYYY-MM-DD"/>
                             </el-form-item>
-                            <el-form-item label="电子发票：">
-                                <HcFormUpload :src="formModel.key6" @item="formInvoiceClick"/>
+                            <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>
-                            <el-form-item label="附件文件：">
-                                <HcFormUpload :src="formModel.key6" @item="formFileClick"/>
-                            </el-form-item>
-                        </el-form>
-                    </HcCardItem>
-
-                    <div class="record-form-action-box mt-16">
-                        <el-divider content-position="right" border-style="dashed">
-                            <el-button type="primary" hc-btn>
-                                <HcIcon name="add"/>
-                                <span>添加明细</span>
-                            </el-button>
-                        </el-divider>
-                        <el-form class="mt-16" inline :model="formInline" label-position="top">
-                            <el-form-item label="归属人">
-                                <el-select v-model="formInline.key1">
-                                    <el-option label="选项1" value="1" />
-                                    <el-option label="选项2" value="2" />
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="是否抵消借款金额">
-                                <el-select v-model="formInline.key2">
-                                    <el-option label="是" value="1" />
-                                    <el-option label="否" value="2" />
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="选择借款项">
-                                <el-select v-model="formInline.key3">
-                                    <el-option label="选项1" value="1" />
-                                    <el-option label="选项2" value="2" />
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="冲抵后的实际报销金额">
-                                <el-input v-model="formInline.key2" disabled>
-                                    <template #append>元</template>
-                                </el-input>
-                            </el-form-item>
-                        </el-form>
-                    </div>
+                        </div>
+                        <el-form-item label="备注：">
+                            <el-input type="textarea" v-model="formModel.key10" :autosize="{ minRows: 3, maxRows: 5 }"/>
+                        </el-form-item>
+                    </el-form>
                 </el-scrollbar>
             </div>
             <div class="record-flow-box">
@@ -111,41 +56,15 @@
                 </div>
             </div>
         </div>
-
-        <!--上传控件-->
-        <HcUploadFile ref="HcUploadFileRef" :options="uploadFileOptions" :echoParams="uploadEchoParams" @success="HcUploadFileSuccess"/>
-
-        <!--关联预算计划-->
-        <HcDialog bgColor="#ffffff" isToBody isTable
-                  title="关联预算计划" widths="80%" saveText="保存"
-                  :show="budgetModal"
-                  @close="budgetCloseClick"
-                  @save="budgetSaveClick"
-        >
-            <HcTable :column="tableBudgetColumn" :datas="tableBudgetData">
-                <template #action="{row,index}">
-                    <el-button size="small" type="danger" @click="row.relevance = false" v-if="row.relevance">取消关联</el-button>
-                    <el-button size="small" type="primary" @click="row.relevance = true" v-else>关联</el-button>
-                </template>
-            </HcTable>
-        </HcDialog>
     </HcCard>
 </template>
 
 <script setup>
 import {ref} from "vue";
 import {useRouter} from 'vue-router'
-import {getTokenHeader} from "~src/api/request/header";
 
 const router = useRouter()
 
-//上传配置
-const HcUploadFileRef = ref(null)
-const uploadEchoParams = ref({})
-const uploadFileOptions = {
-    headers: getTokenHeader(),
-}
-
 //明细表单
 const formRef = ref(null)
 const formModel = ref({
@@ -153,50 +72,6 @@ const formModel = ref({
 })
 const formRules = {}
 
-//关联预算计划
-const budgetModal = ref(false)
-const budgetModalShow = () => {
-    budgetModal.value = true
-}
-const budgetCloseClick = () => {
-    budgetModal.value = false
-}
-const budgetSaveClick = () => {
-
-}
-
-//关联预算计划表格
-const tableBudgetColumn = [
-    {key: 'key1', name: '任务所属项目'},
-    {key: 'key2', name: '状态',  width: '120', align: 'center'},
-    {key: 'key3', name: '任务描述'},
-    {key: 'key4', name: '完成指标', width: '120', align: 'center'},
-    {key: 'action', name: '操作', width: '100', align: 'center'},
-]
-const tableBudgetData = ref([
-    {id: 1, key1: 'xxxx'},
-    {id: 2, key1: 'xxxx'},
-    {id: 3, key1: 'xxxx'},
-    {id: 4, key1: 'xxxx'},
-])
-
-
-//电子发票
-const formInvoiceClick = () => {
-    HcUploadFileRef.value?.selectFile();
-}
-
-//附件
-const formFileClick = () => {
-    HcUploadFileRef.value?.selectFile();
-}
-
-//上传完成
-const HcUploadFileSuccess = (res) => {
-
-}
-
-const formInline = ref({})
 const timeLineData = ref([
     {title: '审批人', section: '部门负责人'},
     {title: '财务审核', section: '财务'},
@@ -208,9 +83,6 @@ const timeLineData = ref([
 
 <style scoped lang="scss">
 @import "~src/styles/expense/expense.scoped.scss";
-.record-form-action-box {
-    position: relative;
-}
 </style>
 
 <style lang="scss">

src/views/expense/paymentRequest/index.vue

@@ -2,7 +2,7 @@
     <HcCard>
         <template #header>
             <div class="w-36">
-                <el-select v-model="searchForm.projectType" block clearable placeholder="归属人" size="large">
+                <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-select>
             </div>
@@ -31,11 +31,11 @@
             </el-button>
             <el-button size="large" type="primary" hc-btn @click="addRowClick">
                 <HcIcon name="add"/>
-                <span>新增报销记录</span>
+                <span>新增支付记录</span>
             </el-button>
         </template>
 
-        <HcTable :isIndex="false" :column="tableColumn" :datas="tableData" :loading="tableLoading">
+        <HcTable :column="tableColumn" :datas="tableData" :loading="tableLoading">
             <template #key="{row}">
                 <span class="text-blue" @click="rowNameTap(row)">{{row.key}}</span>
             </template>
@@ -104,12 +104,11 @@ const pageChange = ({current, size}) => {
 //获取数据
 const tableLoading = ref(false)
 const tableColumn = [
-    {key: 'key', name: '报销编号', width: '120', align: 'center'},
-    {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: 'key1', name: '申请时间', minWidth: '160'},
+    {key: 'key2', name: '收款人', minWidth: '160'},
+    {key: 'key3', name: '收款金额', width: '160', align: 'center'},
+    {key: 'key4', name: '收款用途', width: '160', align: 'center'},
+    {key: 'key5', name: '审批结果', width: '160', align: 'center'},
     {key: 'key6', name: '审批状态', width: '140', align: 'center'},
     {key: 'key7', name: '报销时间', width: '160', align: 'center'},
     {key: 'key8', name: '创建人', width: '140', align: 'center'},
@@ -137,7 +136,7 @@ const rowNameTap = (row) => {
 //新增预算
 const addRowClick = () => {
     router.push({
-        name: 'expense-finReimburse-record'
+        name: 'expense-paymentRequest-record'
     })
 }
 

src/views/expense/paymentRequest/record.vue

@@ -1,90 +1,56 @@
 <template>
     <HcCard>
         <template #header>
-            <div class="hc-expense-total-title">报销总额(元)：1520</div>
+            <div class="hc-expense-total-title">请款总额(元)：1520</div>
         </template>
         <div class="hac-expense-record-body">
             <div class="record-form-box">
                 <el-scrollbar>
-                    <HcCardItem title="报销明细1" ui="hac-bg-grey">
-                        <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="key1">
-                                    <el-select block v-model="formModel.key1">
-                                        <el-option label="选项1" value="选项1"/>
-                                        <el-option label="选项2" value="选项2"/>
-                                    </el-select>
-                                </el-form-item>
-                                <div class="ml-2">
-                                    <el-button type="default" @click="budgetModalShow">
-                                        <HcIcon name="add"/>
-                                        <span>关联预算计划</span>
-                                    </el-button>
-                                </div>
-                            </div>
-                            <div class="hc-form-item">
-                                <el-form-item label="报销金额(元)：" prop="key2">
-                                    <el-input v-model="formModel.key2" placeholder="请输入报销金额" />
-                                </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>
-                                <el-form-item label="费用类型：" prop="key4">
-                                    <el-select block v-model="formModel.key4">
-                                        <el-option label="选项1" value="选项1"/>
-                                        <el-option label="选项2" value="选项2"/>
-                                    </el-select>
-                                </el-form-item>
-                            </div>
-                            <el-form-item label="费用说明：">
-                                <el-input type="textarea"
-                                          v-model="formModel.key5"
-                                          :autosize="{ minRows: 3, maxRows: 5 }"
-                                          placeholder="请输入费用说明"
-                                />
-                            </el-form-item>
-                            <el-form-item label="电子发票：">
-                                <HcFormUpload :src="formModel.key6" @item="formInvoiceClick"/>
-                            </el-form-item>
-                            <el-form-item label="附件文件：">
-                                <HcFormUpload :src="formModel.key6" @item="formFileClick"/>
-                            </el-form-item>
-                        </el-form>
-                    </HcCardItem>
-
-                    <div class="record-form-action-box mt-16">
-                        <el-divider content-position="right" border-style="dashed">
-                            <el-button type="primary" hc-btn>
-                                <HcIcon name="add"/>
-                                <span>添加明细</span>
-                            </el-button>
-                        </el-divider>
-                        <el-form class="mt-16" inline :model="formInline" label-position="top">
-                            <el-form-item label="归属人">
-                                <el-select v-model="formInline.key1">
-                                    <el-option label="选项1" value="1" />
-                                    <el-option label="选项2" value="2" />
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="是否抵消借款金额">
-                                <el-select v-model="formInline.key2">
-                                    <el-option label="是" value="1" />
-                                    <el-option label="否" value="2" />
+                    <el-form ref="formRef" :model="formModel" :rules="formRules" label-position="top" size="large">
+                        <el-form-item label="申请时间：" prop="key1">
+                            <el-date-picker type="date" class="block" v-model="formModel.key1" format="YYYY-MM-DD" value-format="YYYY-MM-DD"/>
+                        </el-form-item>
+                        <div class="hc-form-item">
+                            <el-form-item label="申请人：" prop="key2">
+                                <el-select block v-model="formModel.key2">
+                                    <el-option label="选项1" value="选项1"/>
+                                    <el-option label="选项2" value="选项2"/>
                                 </el-select>
                             </el-form-item>
-                            <el-form-item label="选择借款项">
-                                <el-select v-model="formInline.key3">
-                                    <el-option label="选项1" value="1" />
-                                    <el-option label="选项2" value="2" />
+                            <el-form-item label="是否为项目提成申请：" prop="key3">
+                                <el-select block v-model="formModel.key3">
+                                    <el-option label="选项1" value="选项1"/>
+                                    <el-option label="选项2" value="选项2"/>
                                 </el-select>
                             </el-form-item>
-                            <el-form-item label="冲抵后的实际报销金额">
-                                <el-input v-model="formInline.key2" disabled>
-                                    <template #append>元</template>
-                                </el-input>
-                            </el-form-item>
-                        </el-form>
-                    </div>
+                        </div>
+                        <el-form-item label="收款人：" prop="key4">
+                            <el-input v-model="formModel.key4"/>
+                        </el-form-item>
+                        <el-form-item label="收款人开户行：" prop="key5">
+                            <el-input v-model="formModel.key5"/>
+                        </el-form-item>
+                        <el-form-item label="收款账号：" prop="key6">
+                            <el-input v-model="formModel.key6"/>
+                        </el-form-item>
+                        <el-form-item label="收款金额：" prop="key7">
+                            <el-input v-model="formModel.key7">
+                                <template #append>元</template>
+                            </el-input>
+                        </el-form-item>
+                        <el-form-item label="请款用途：">
+                            <el-input type="textarea" v-model="formModel.key8" :autosize="{ minRows: 3, maxRows: 5 }"/>
+                        </el-form-item>
+                        <el-form-item label="关联项目：" prop="key9">
+                            <el-select block v-model="formModel.key9">
+                                <el-option label="选项1" value="选项1"/>
+                                <el-option label="选项2" value="选项2"/>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="备注：">
+                            <el-input type="textarea" v-model="formModel.key10" :autosize="{ minRows: 3, maxRows: 5 }"/>
+                        </el-form-item>
+                    </el-form>
                 </el-scrollbar>
             </div>
             <div class="record-flow-box">
@@ -111,41 +77,15 @@
                 </div>
             </div>
         </div>
-
-        <!--上传控件-->
-        <HcUploadFile ref="HcUploadFileRef" :options="uploadFileOptions" :echoParams="uploadEchoParams" @success="HcUploadFileSuccess"/>
-
-        <!--关联预算计划-->
-        <HcDialog bgColor="#ffffff" isToBody isTable
-                  title="关联预算计划" widths="80%" saveText="保存"
-                  :show="budgetModal"
-                  @close="budgetCloseClick"
-                  @save="budgetSaveClick"
-        >
-            <HcTable :column="tableBudgetColumn" :datas="tableBudgetData">
-                <template #action="{row,index}">
-                    <el-button size="small" type="danger" @click="row.relevance = false" v-if="row.relevance">取消关联</el-button>
-                    <el-button size="small" type="primary" @click="row.relevance = true" v-else>关联</el-button>
-                </template>
-            </HcTable>
-        </HcDialog>
     </HcCard>
 </template>
 
 <script setup>
 import {ref} from "vue";
 import {useRouter} from 'vue-router'
-import {getTokenHeader} from "~src/api/request/header";
 
 const router = useRouter()
 
-//上传配置
-const HcUploadFileRef = ref(null)
-const uploadEchoParams = ref({})
-const uploadFileOptions = {
-    headers: getTokenHeader(),
-}
-
 //明细表单
 const formRef = ref(null)
 const formModel = ref({
@@ -153,50 +93,6 @@ const formModel = ref({
 })
 const formRules = {}
 
-//关联预算计划
-const budgetModal = ref(false)
-const budgetModalShow = () => {
-    budgetModal.value = true
-}
-const budgetCloseClick = () => {
-    budgetModal.value = false
-}
-const budgetSaveClick = () => {
-
-}
-
-//关联预算计划表格
-const tableBudgetColumn = [
-    {key: 'key1', name: '任务所属项目'},
-    {key: 'key2', name: '状态',  width: '120', align: 'center'},
-    {key: 'key3', name: '任务描述'},
-    {key: 'key4', name: '完成指标', width: '120', align: 'center'},
-    {key: 'action', name: '操作', width: '100', align: 'center'},
-]
-const tableBudgetData = ref([
-    {id: 1, key1: 'xxxx'},
-    {id: 2, key1: 'xxxx'},
-    {id: 3, key1: 'xxxx'},
-    {id: 4, key1: 'xxxx'},
-])
-
-
-//电子发票
-const formInvoiceClick = () => {
-    HcUploadFileRef.value?.selectFile();
-}
-
-//附件
-const formFileClick = () => {
-    HcUploadFileRef.value?.selectFile();
-}
-
-//上传完成
-const HcUploadFileSuccess = (res) => {
-
-}
-
-const formInline = ref({})
 const timeLineData = ref([
     {title: '审批人', section: '部门负责人'},
     {title: '财务审核', section: '财务'},
@@ -208,9 +104,6 @@ const timeLineData = ref([
 
 <style scoped lang="scss">
 @import "~src/styles/expense/expense.scoped.scss";
-.record-form-action-box {
-    position: relative;
-}
 </style>
 
 <style lang="scss">