财务

src/views/finance/financeModules/depository.vue

@@ -0,0 +1,252 @@
+<template>
+<a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+            <a-row :gutter="24">
+                <a-col :span="6">
+                    <a-form-item label="">
+                        <a-range-picker @change="timeOk">
+                            <template slot="renderExtraFooter">
+                                <!-- extra footer -->
+                            </template>
+                        </a-range-picker>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="3">
+                    <a-form-item label="">
+                        <a-select v-model="queryParam.departmentId" style="width: 100%" :allowClear="true">
+                            <a-select-option :value="'0'">全部</a-select-option>
+                            <a-select-option :value="'1'">pos</a-select-option>
+                            <a-select-option :value="'2'">住客</a-select-option>
+                        </a-select>
+                    </a-form-item>
+                </a-col>
+                <a-col :md="6" :sm="8">
+                    <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+                        <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+                        <!-- <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> -->
+                    </span>
+                </a-col>
+            </a-row>
+        </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <!-- <div class="table-operator">
+        <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+    </div> -->
+
+    <!-- table区域-begin -->
+    <div>
+        <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择
+        <a style="font-weight: 600">{{ selectedRowKeys.length }}</a
+        >项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div> -->
+
+        <a-table ref="table" size="middle" :scroll="{ x: true }" bordered rowKey="id" :columns="columns" :dataSource="dataSource" :pagination="ipagination" :loading="loading" :rowSelection="{
+          selectedRowKeys: selectedRowKeys,
+          onChange: onSelectChange,
+        }" class="j-table-force-nowrap" @change="handleTableChange">
+
+        <template slot="action" slot-scope="text, record" >
+            {{record | sum}}
+        </template>
+
+        </a-table>
+    </div>
+
+    <!-- <depository-modal ref="modalForm" @ok="modalFormOk"></depository-modal> -->
+</a-card>
+</template>
+
+<script>
+import {
+    JeecgListMixin
+} from "@/mixins/JeecgListMixin";
+import {
+    filterObj
+} from "@/utils/util";
+import {
+    getAction,
+    postAction
+} from "@/api/manage";
+// import DepositoryModal from "./outBoundModal/outBoundModal.vue";
+export default {
+    name: "memberList",
+    mixins: [JeecgListMixin],
+    components: {
+        // DepositoryModal,
+    },
+    computed: {
+        
+    },
+    filters:{
+        sum(data){
+            let arr = Object.keys(data)
+            arr = arr.filter(item => item != 'department' && item != 'hotel_name' && item != 'flag')
+            let sum = 0
+            arr.forEach(item => {
+                sum += data[item]
+            })
+            return sum
+        }
+    },
+    watch: {
+        dataSource(newVal) {
+            if (newVal[newVal.length-1].flag) {
+                return
+            }
+            let obj = Object.keys(newVal[0])
+            this.columns = [{
+                    title: "商家",
+                    align: "center",
+                    dataIndex: "hotel_name",
+                },
+                {
+                    title: "操作人员",
+                    align: "center",
+                    dataIndex: "createTime",
+                },
+                {
+                    title: "部门",
+                    align: "center",
+                    dataIndex: "department",
+                }
+            ]
+            //去除数组中某个字符串
+            obj = obj.filter(item => item != 'department' && item != 'hotel_name')
+            obj.forEach(item => {
+                console.log(item);
+                this.columns.push({
+                    title: item,
+                    align: 'center',
+                    dataIndex: item
+                })
+                let a = {}
+                a[item] = this.dataSource.reduce((a, b) => a + b[item], 0)
+                this.arr.push(a)
+                // arr.push({
+                //     item : this.dataSource.reduce((a, b) => a + b[item], 0)
+                // })
+            })
+            this.columns.push({
+                title: '合计',
+                align: 'center',
+                dataIndex: 'action',
+                scopedSlots: {
+                    customRender: 'action'
+                }
+            })
+            let obj1 = {}
+            obj1=Object.assign({}, ...this.arr, {hotel_name: '合计'},{flag:true});
+            this.dataSource.push(obj1)
+
+        }
+    },
+    mounted(){
+
+    },
+    data() {
+        return {
+            activeKey: "1",
+            queryParam: {
+                departmentId: '0',
+            },
+            arr:[],
+            dataList:[],
+            examineVisible: false,
+            // 分页参数
+            ipagination: {
+                current: 1,
+                pageSize: 10,
+                pageSizeOptions: ["10", "20", "30"],
+                showTotal: (total, range) => {
+                    return range[0] + "-" + range[1] + " 共" + total + "条";
+                },
+                showQuickJumper: true,
+                showSizeChanger: true,
+                total: 0,
+            },
+            // 表头
+            columns: [{
+                    title: "商家",
+                    align: "center",
+                    dataIndex: "hotel_name",
+                },
+                {
+                    title: "操作人员",
+                    align: "center",
+                    dataIndex: "createTime",
+                },
+                {
+                    title: "部门",
+                    align: "center",
+                    dataIndex: "department",
+                }
+            ],
+            url: {
+                list: "/finance/summary/financeSummaryPage?departmentId=0",
+                delete: "/kc/kcStock/delete",
+                deleteBatch: "/kc/kcStock/deleteBatch",
+                exportXlsUrl: "/kc/kcStock/exportXls",
+                importExcelUrl: "/kc/kcStock/importExcel",
+            },
+            dictOptions: {},
+            superFieldList: [],
+            selectedRowKeys: [],
+            isorter: {
+                column: "createTime",
+                order: "desc",
+            },
+            depositoryList: [],
+            supplierList: [],
+            storageTypeList: [],
+            examineData: {}
+        };
+    },
+    created() {
+
+    },
+    methods: {
+        tabStockTypeChange(e) {
+            this.queryParam.type = e;
+            this.loadData();
+        },
+        examine(record) {
+            console.log(record);
+            this.examineData = JSON.parse(JSON.stringify(record));
+            this.examineVisible = true;
+        },
+        handleOk() {
+            postAction("/kc/kcStock/audit", this.examineData).then((res) => {
+                if (res.success) {
+                    this.loadData();
+                    this.$message.success("审核成功");
+                    this.examineVisible = false;
+                }
+            });
+        },
+        handleCancel() {
+            this.examineVisible = false;
+        },
+        onChange(e) {
+            console.log(e.target.value);
+            this.examineData.status = e.target.value;
+        },
+        timeOk(data, dataTime) {
+            // console.log(e);
+            this.queryParam.startTime = dataTime[0];
+            this.queryParam.endTime = dataTime[1];
+            this.loadData();
+        },
+    },
+};
+</script>
+
+<style scoped>
+@import "~@assets/less/common.less";
+</style>

src/views/finance/financeModules/detailedReport.vue

@@ -0,0 +1,302 @@
+<template>
+<a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+            <a-row :gutter="24">
+                <a-col :span="6">
+                    <a-form-item label="">
+                        <a-range-picker @change="timeOk">
+                            <template slot="renderExtraFooter">
+                                <!-- extra footer -->
+                            </template>
+                        </a-range-picker>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="3">
+                    <a-form-item label="">
+                        <a-select v-model="queryParam.departmentId" style="width: 100%" :allowClear="true">
+                            <a-select-option :value="'0'">全部</a-select-option>
+                            <a-select-option :value="'1'">pos</a-select-option>
+                            <a-select-option :value="'2'">住客</a-select-option>
+                        </a-select>
+                    </a-form-item>
+                </a-col>
+                <a-col :md="6" :sm="8">
+                    <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+                        <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+                        <!-- <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> -->
+                    </span>
+                </a-col>
+            </a-row>
+        </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <!-- <div class="table-operator">
+        <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+    </div> -->
+
+    <!-- table区域-begin -->
+    <div>
+        <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择
+        <a style="font-weight: 600">{{ selectedRowKeys.length }}</a
+        >项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div> -->
+
+        <a-table ref="table" size="middle" :scroll="{ x: true }" bordered rowKey="id" :columns="columns" :dataSource="dataSource" :pagination="ipagination" :loading="loading" :rowSelection="{
+          selectedRowKeys: selectedRowKeys,
+          onChange: onSelectChange,
+        }" class="j-table-force-nowrap" @change="handleTableChange">
+
+        <template slot="action" slot-scope="text, record" >
+            {{record | sum}}
+        </template>
+
+        </a-table>
+    </div>
+
+    <!-- <depository-modal ref="modalForm" @ok="modalFormOk"></depository-modal> -->
+</a-card>
+</template>
+
+<script>
+import {
+    JeecgListMixin
+} from "@/mixins/JeecgListMixin";
+import {
+    filterObj
+} from "@/utils/util";
+import {
+    getAction,
+    postAction
+} from "@/api/manage";
+// import DepositoryModal from "./outBoundModal/outBoundModal.vue";
+export default {
+    name: "memberList",
+    mixins: [JeecgListMixin],
+    components: {
+        // DepositoryModal,
+    },
+    computed: {
+        
+    },
+    filters:{
+        sum(data){
+            let arr = Object.keys(data)
+            arr = arr.filter(item => item != 'department' && item != 'hotel_name' && item != 'flag')
+            let sum = 0
+            arr.forEach(item => {
+                sum += data[item]
+            })
+            return sum
+        }
+    },
+    watch: {
+        dataSource(newVal) {
+            if (newVal[newVal.length-1].flag) {
+                return
+            }
+            let obj = Object.keys(newVal[0])
+            // this.columns = [{
+            //         title: "商家",
+            //         align: "center",
+            //         dataIndex: "hotel_name",
+            //     },
+            //     {
+            //         title: "操作人员",
+            //         align: "center",
+            //         dataIndex: "createTime",
+            //     },
+            //     {
+            //         title: "部门",
+            //         align: "center",
+            //         dataIndex: "department",
+            //     }
+            // ]
+            //去除数组中某个字符串
+            // obj = obj.filter(item => item != 'department' && item != 'hotel_name')
+            // obj.forEach(item => {
+            //     console.log(item);
+            //     this.columns.push({
+            //         title: item,
+            //         align: 'center',
+            //         dataIndex: item
+            //     })
+            //     let a = {}
+            //     a[item] = this.dataSource.reduce((a, b) => a + b[item], 0)
+            //     this.arr.push(a)
+            //     // arr.push({
+            //     //     item : this.dataSource.reduce((a, b) => a + b[item], 0)
+            //     // })
+            // })
+            // this.columns.push({
+            //     title: '合计',
+            //     align: 'center',
+            //     dataIndex: 'action',
+            //     scopedSlots: {
+            //         customRender: 'action'
+            //     }
+            // })
+            // let obj1 = {}
+            // obj1=Object.assign({}, ...this.arr, {hotel_name: '合计'},{flag:true});
+            // this.dataSource.push(obj1)
+
+        }
+    },
+    mounted(){
+
+    },
+    data() {
+        return {
+            activeKey: "1",
+            queryParam: {
+                departmentId: '0',
+            },
+            arr:[],
+            dataList:[],
+            examineVisible: false,
+            // 分页参数
+            ipagination: {
+                current: 1,
+                pageSize: 10,
+                pageSizeOptions: ["10", "20", "30"],
+                showTotal: (total, range) => {
+                    return range[0] + "-" + range[1] + " 共" + total + "条";
+                },
+                showQuickJumper: true,
+                showSizeChanger: true,
+                total: 0,
+            },
+            // 表头
+            columns: [{
+                    title: "收退款",
+                    align: "center",
+                    dataIndex: "hotel_name",
+                },
+                {
+                    title: "部门",
+                    align: "center",
+                    dataIndex: "createTime",
+                },
+                {
+                    title: "账单类型",
+                    align: "center",
+                    dataIndex: "department",
+                },
+                {
+                    title: "付款方式",
+                    align: "center",
+                    dataIndex: "department",
+                },
+                {
+                    title: "单据号",
+                    align: "center",
+                    dataIndex: "department",
+                },
+                {
+                    title: "系统单号",
+                    align: "center",
+                    dataIndex: "department",
+                },
+                {
+                    title: "姓名",
+                    align: "center",
+                    dataIndex: "department",
+                },
+                {
+                    title: "房间号",
+                    align: "center",
+                    dataIndex: "department",
+                },
+                {
+                    title: "金额",
+                    align: "center",
+                    dataIndex: "department",
+                },
+                {
+                    title: "发生时间",
+                    align: "center",
+                    dataIndex: "department",
+                },
+                {
+                    title: "操作人员",
+                    align: "center",
+                    dataIndex: "department",
+                },
+                {
+                    title: "营业日",
+                    align: "center",
+                    dataIndex: "department",
+                },
+                {
+                    title: "备注",
+                    align: "center",
+                    dataIndex: "department",
+                }
+            ],
+            url: {
+                list: "/finance/summary/financePage?departmentId=0",
+                delete: "/kc/kcStock/delete",
+                deleteBatch: "/kc/kcStock/deleteBatch",
+                exportXlsUrl: "/kc/kcStock/exportXls",
+                importExcelUrl: "/kc/kcStock/importExcel",
+            },
+            dictOptions: {},
+            superFieldList: [],
+            selectedRowKeys: [],
+            isorter: {
+                column: "createTime",
+                order: "desc",
+            },
+            depositoryList: [],
+            supplierList: [],
+            storageTypeList: [],
+            examineData: {}
+        };
+    },
+    created() {
+
+    },
+    methods: {
+        tabStockTypeChange(e) {
+            this.queryParam.type = e;
+            this.loadData();
+        },
+        examine(record) {
+            console.log(record);
+            this.examineData = JSON.parse(JSON.stringify(record));
+            this.examineVisible = true;
+        },
+        handleOk() {
+            postAction("/kc/kcStock/audit", this.examineData).then((res) => {
+                if (res.success) {
+                    this.loadData();
+                    this.$message.success("审核成功");
+                    this.examineVisible = false;
+                }
+            });
+        },
+        handleCancel() {
+            this.examineVisible = false;
+        },
+        onChange(e) {
+            console.log(e.target.value);
+            this.examineData.status = e.target.value;
+        },
+        timeOk(data, dataTime) {
+            // console.log(e);
+            this.queryParam.startTime = dataTime[0];
+            this.queryParam.endTime = dataTime[1];
+            this.loadData();
+        },
+    },
+};
+</script>
+
+<style scoped>
+@import "~@assets/less/common.less";
+</style>

src/views/finance/index.vue

@@ -18,15 +18,15 @@
 </template>
 
 <script>
-// import depository from "./depository.vue";
-// import goods from "./goods.vue";
+import depository from "./financeModules/depository.vue";
+import goods from "./financeModules/detailedReport.vue";
 // import supplier from "./supplier.vue";
 // import stock from "./stock.vue";
 // import depositoryingoods from './depositoryingoods'
 export default {
   components: {
-    // depository,
-    // goods,
+    depository,
+    goods,
     // supplier,
     // stock,
     // depositoryingoods

src/views/stock/outBoundModal/outBoundForm.vue

@@ -227,6 +227,7 @@ export default {
         }).then((res) => {
             if (res.success) {
                 this.depositoryList = res.result.records;
+                console.log('this.depositoryList',this.depositoryList);
             }
         });
         getAction("/kc/kcSupplier/list", {
@@ -239,6 +240,7 @@ export default {
         getAction("/kc/kcStock/outBoundTypeList", {}).then((res) => {
             if (res.success) {
                 this.storageTypeList = res.result;
+                console.log('this.storageTypeList',this.storageTypeList);
             }
         });
     },

src/views/stock/outbound.vue

@@ -222,7 +222,34 @@ export default {
             },
             // 明细表头
             detailedColumns: [
-
+                {
+                    title: "商品名称",
+                    align: "center",
+                    dataIndex: "name",
+                },
+                {
+                    title: "商品规格",
+                    align: "center",
+                    dataIndex: "spec",
+                },
+                {
+                    title: "单位",
+                    align: "center",
+                    dataIndex: "goodUnit",
+                },
+                {
+                    title: "成本价",
+                    align: "center",
+                    dataIndex: "price",
+                },
+                {
+                    title: "出库数量",
+                    align: "center",
+                    // dataIndex: "spec",
+                    scopedSlots: {
+                        customRender: "num"
+                    },
+                },
             ],
             // 表头
             columns: [{
@@ -245,11 +272,11 @@ export default {
                     align: "center",
                     dataIndex: "stockTypeName",
                 },
-                {
-                    title: "供应商",
-                    align: "center",
-                    dataIndex: "supplierName",
-                },
+                // {
+                //     title: "供应商",
+                //     align: "center",
+                //     dataIndex: "supplierName",
+                // },
                 {
                     title: "出库内容",
                     align: "center",