更新财务报销

package.json

@@ -13,7 +13,7 @@
         "dayjs": "^1.11.8",
         "echarts": "^5.4.2",
         "element-plus": "2.3.6",
-        "hc-vue3-ui": "^1.3.5",
+        "hc-vue3-ui": "^1.3.6",
         "js-base64": "^3.7.5",
         "js-cookie": "^3.0.5",
         "js-fast-way": "^0.1.0",

src/styles/expense/finReimburse/record.scoped.scss

@@ -0,0 +1,22 @@
+.hc-total-reimbursement {
+    color: #101010;
+    font-size: 20px;
+}
+.hac-expense-finReimburse-record-body {
+    position: relative;
+    height: 100%;
+    display: flex;
+    .record-form-box {
+        position: relative;
+        height: 100%;
+        flex: 1;
+        padding-right: 24px;
+    }
+    .record-flow-box {
+        position: relative;
+        height: 100%;
+        width: 380px;
+        padding-left: 24px;
+        border-left: 1px solid #e9e9e9;
+    }
+}

src/styles/expense/finReimburse/record.scss

@@ -0,0 +1,3 @@
+.hac-expense-finReimburse-record-body .record-form-box .hc-card-item-box.hac-bg-grey {
+    background: #f7f7f7;
+}

src/views/expense/finReimburse/index.vue

@@ -2,18 +2,15 @@
     <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-40 ml-2">
-                <el-select v-model="searchForm.projectType" block clearable placeholder="服务类型" size="large">
+            <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="w-48 ml-2">
-                <el-input v-model="searchForm.queryValue" clearable placeholder="请输入项目名称进行查询" size="large"/>
-            </div>
             <div class="ml-4">
                 <el-button type="primary" @click="searchClick" size="large">
                     <HcIcon name="search-2"/>
@@ -28,29 +25,41 @@
             </div>
         </template>
         <template #extra>
-            <el-button size="large" type="primary" hc-btn @click="updateClick">
-                <HcIcon name="refresh"/>
-                <span>合同回款更新</span>
+            <el-button size="large" type="warning" hc-btn @click="draftsClick">
+                <HcIcon name="draft"/>
+                <span>草稿箱(1)</span>
             </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">
-            <template #key1="{row}">
-                <span class="text-blue" @click="rowNameTap(row)">{{row.key1}}</span>
+            <template #key="{row}">
+                <span class="text-blue" @click="rowNameTap(row)">{{row.key}}</span>
             </template>
             <template #action="{row,index}">
-                <el-button plain size="small" type="primary" @click="editRowClick(row)">编辑</el-button>
-                <el-button plain size="small" type="danger">删除</el-button>
+                <el-button size="small" type="primary">撤销</el-button>
             </template>
         </HcTable>
 
         <template #action>
             <HcPages :pages="searchForm" @change="pageChange"/>
         </template>
+
+        <!--草稿箱-->
+        <HcDialog bgColor="#ffffff" isToBody isTable :footer="false" :show="draftsModal" title="草稿箱(1)" widths="62rem" @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>
+                    </template>
+                </HcTable>
+            </div>
+        </HcDialog>
     </HcCard>
 </template>
 
@@ -95,14 +104,17 @@ const pageChange = ({current, size}) => {
 //获取数据
 const tableLoading = ref(false)
 const tableColumn = [
-    {key: 'key', name: '合同编号', width: '120', align: 'center'},
-    {key: 'key1', name: '合同名称'},
-    {key: 'key2', name: '合同类型', width: '140', align: 'center'},
-    {key: 'key3', name: '签订时间', width: '160', align: 'center'},
-    {key: 'key4', name: '合同起止日期', width: '220', align: 'center'},
-    {key: 'key5', name: '合同已履约回款', width: '140', align: 'center'},
-    {key: 'key6', name: '合同未履约回款', width: '140', align: 'center'},
-    {key: 'action', name: '操作', width: '130', align: 'center'},
+    {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: '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'},
@@ -119,38 +131,31 @@ const getTableData = () => {
 
 //预览
 const rowNameTap = (row) => {
-    router.push({
-        name: 'project-contract-form',
-        query: {
-            id: row.id,
-            type: 'view'
-        }
-    })
+
 }
 
 //新增预算
 const addRowClick = () => {
     router.push({
-        name: 'project-contract-form',
-        query: {type: 'edit'}
+        name: 'expense-finReimburse-record'
     })
 }
 
-//编辑预算
-const editRowClick = (row) => {
-    router.push({
-        name: 'project-contract-form',
-        query: {
-            id: row.id,
-            type: 'edit'
-        }
-    })
+//草稿箱
+const draftsModal = ref(false)
+const draftsClick = () => {
+    draftsModal.value = true
 }
-
-//合同回款更新
-const updateClick = () => {
-    router.push({
-        name: 'project-contract-update'
-    })
+const draftsCloseClick = () => {
+    draftsModal.value = false
 }
+
+//草稿箱数据
+const tableDraftsColumn = [
+    {key: 'key1', name: '标题'},
+    {key: 'key2', 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'}])
+
 </script>

src/views/expense/finReimburse/record.vue

@@ -1,156 +1,106 @@
 <template>
     <HcCard>
         <template #header>
-            <div class="w-36">
-                <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-40 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="w-48 ml-2">
-                <el-input v-model="searchForm.queryValue" clearable placeholder="请输入项目名称进行查询" size="large"/>
-            </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="primary" hc-btn @click="updateClick">
-                <HcIcon name="refresh"/>
-                <span>合同回款更新</span>
-            </el-button>
-            <el-button size="large" type="primary" hc-btn @click="addRowClick">
-                <HcIcon name="add"/>
-                <span>新增项目合同信息</span>
-            </el-button>
+            <div class="hc-total-reimbursement">报销总额(元)：1520</div>
         </template>
+        <div class="hac-expense-finReimburse-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">
+                                        <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>
+                </el-scrollbar>
+            </div>
+            <div class="record-flow-box">222</div>
+        </div>
 
-        <HcTable :isIndex="false" :column="tableColumn" :datas="tableData" :loading="tableLoading">
-            <template #key1="{row}">
-                <span class="text-blue" @click="rowNameTap(row)">{{row.key1}}</span>
-            </template>
-            <template #action="{row,index}">
-                <el-button plain size="small" type="primary" @click="editRowClick(row)">编辑</el-button>
-                <el-button plain size="small" type="danger">删除</el-button>
-            </template>
-        </HcTable>
-
-        <template #action>
-            <HcPages :pages="searchForm" @change="pageChange"/>
-        </template>
+        <HcUploadFile ref="HcUploadFileRef" :options="uploadFileOptions" :echoParams="uploadEchoParams" @success="HcUploadFileSuccess"/>
     </HcCard>
 </template>
 
 <script setup>
 import {ref} from "vue";
 import {useRouter} from 'vue-router'
+import {getTokenHeader} from "~src/api/request/header";
 
 const router = useRouter()
 
-//项目类型
-const projectType = ref([
-    {name: '二级路', key: '二级路'},
-    {name: '国道', key: '国道'},
-    {name: '水利水电', key: '水利水电'},
-    {name: '市政', key: '市政'},
-])
-
-//搜索表单
-const searchForm = ref({
-    projectType: null, user: null, project: null,
-    current: 1, size: 20, total: 0
-})
-
-//搜索
-const searchClick = () => {
-    searchForm.value.current = 1;
-    getTableData()
+//上传配置
+const HcUploadFileRef = ref(null)
+const uploadEchoParams = ref({})
+const uploadFileOptions = {
+    headers: getTokenHeader(),
 }
 
-//重置搜索表单
-const resetClick = () => {
-    searchForm.value = {current: 1, size: 20, total: 0}
-}
+//明细表单
+const formRef = ref(null)
+const formModel = ref({
+    key1: '', key2: '', key3: '', key4: '', key5: '',
+})
+const formRules = {}
 
-//分页被点击
-const pageChange = ({current, size}) => {
-    searchForm.value.current = current
-    searchForm.value.size = size
-    getTableData()
+//电子发票
+const formInvoiceClick = () => {
+    HcUploadFileRef.value?.selectFile();
 }
 
-//获取数据
-const tableLoading = ref(false)
-const tableColumn = [
-    {key: 'key', name: '合同编号', width: '120', align: 'center'},
-    {key: 'key1', name: '合同名称'},
-    {key: 'key2', name: '合同类型', width: '140', align: 'center'},
-    {key: 'key3', name: '签订时间', width: '160', align: 'center'},
-    {key: 'key4', name: '合同起止日期', width: '220', align: 'center'},
-    {key: 'key5', name: '合同已履约回款', width: '140', align: 'center'},
-    {key: 'key6', name: '合同未履约回款', width: '140', align: 'center'},
-    {key: 'action', name: '操作', width: '130', align: 'center'},
-]
-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 formFileClick = () => {
+    HcUploadFileRef.value?.selectFile();
 }
 
-//预览
-const rowNameTap = (row) => {
-    router.push({
-        name: 'project-contract-form',
-        query: {
-            id: row.id,
-            type: 'view'
-        }
-    })
-}
+//上传完成
+const HcUploadFileSuccess = (res) => {
 
-//新增预算
-const addRowClick = () => {
-    router.push({
-        name: 'project-contract-form',
-        query: {type: 'edit'}
-    })
 }
+</script>
 
-//编辑预算
-const editRowClick = (row) => {
-    router.push({
-        name: 'project-contract-form',
-        query: {
-            id: row.id,
-            type: 'edit'
-        }
-    })
-}
+<style scoped lang="scss">
+@import "~src/styles/expense/finReimburse/record.scoped.scss";
+</style>
 
-//合同回款更新
-const updateClick = () => {
-    router.push({
-        name: 'project-contract-update'
-    })
-}
-</script>
+<style lang="scss">
+@import "~src/styles/expense/finReimburse/record.scss";
+</style>

yarn.lock

@@ -811,10 +811,10 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-hc-vue3-ui@^1.3.5:
-  version "1.3.5"
-  resolved "http://47.110.251.215:9000/hc-vue3-ui/-/hc-vue3-ui-1.3.5.tgz#eb6c428b1149f5971c59c75f0d255888ed669c6b"
-  integrity sha512-UB+VPb80kos0cZIsx5KDIq8B5r8/la4Zis2ZxZmK7C4zsgvjy+Ver7rCjoIN2Hcjwe6KHXk11Si/s3LVGzEaVg==
+hc-vue3-ui@^1.3.6:
+  version "1.3.6"
+  resolved "http://47.110.251.215:9000/hc-vue3-ui/-/hc-vue3-ui-1.3.6.tgz#b2d49ab4c9a4b6b3b05c75f13d30d5abf24f0b8d"
+  integrity sha512-JFbRT2dW7i0DyC2iBcUB94qq9pvach+nD9WOJuq24bjwTdsL56urLGDFwawGUrnpRdv/Eu52sn5L5lb8M9iUdQ==
   dependencies:
     axios "^1.4.0"
     dayjs "^1.11.8"