Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunw...

liukangdong

2025-01-10 ce166a90614211a6c8ea4ac092ed8970979594a4

Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1

 admin/src/views/finance/collectionSettings.vue

@@ -1,10 +1,59 @@
<template>
    
    <div class="box">
        <div class="content">
            <div class="content_form">
                <el-form ref="form" :model="form" label-width="120px">
                    <el-form-item label="短信模板">
                        <div style="display: flex; align-items: self-start;">
                            <el-input type="textarea" rows="5" v-model="form.desc"></el-input>
                            <el-button type="primary" style="margin-left: 10px;">保存</el-button>
                        </div>
                    </el-form-item>
                    <el-form-item label="邮箱模板">
                        <div style="display: flex; align-items: self-start;">
                            <el-input type="textarea" rows="5" v-model="form.desc"></el-input>
                            <el-button type="primary" style="margin-left: 10px;">保存</el-button>
                        </div>
                    </el-form-item>
                </el-form>
            </div>
            <el-button @click="$refs.templateKeywords.open('模板关键字')">模板关键字</el-button>
        </div>
        <templateKeywords ref="templateKeywords" />
    </div>
</template>

<script>
    import templateKeywords from './components/templateKeywords'
  export default {
    name: 'collectionSettings'
    name: 'collectionSettings',
    data() {
      return {
        form: {
          desc: ''
        }
      }
    },
    components: { templateKeywords }
  }
</script>

<style lang="scss" scoped>
    .box {
        width: 100%;
        padding: 20px;
        box-sizing: border-box;
        .content {
            width: 100%;
            padding: 20px;
            box-sizing: border-box;
            background: #ffffff;
            display: flex;
            align-items: self-start;
            justify-content: space-between;
            .content_form {
                width: 60%;
            }
        }
    }
</style>

 admin/src/views/finance/components/templateKeywords.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,72 @@
<template>
    <GlobalWindow
        :title="title"
        :visible.sync="visible"
        width="100%">
        <div class="main">
            <div class="title">账单信息</div>
            <div class="list">
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${费用名称}</el-tag>
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${计费周期}</el-tag>
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${单价}</el-tag>
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${单位}</el-tag>
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${应收日期}</el-tag>
            </div>
            <div class="title">合同信息</div>
            <div class="list">
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${费用名称}</el-tag>
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${计费周期}</el-tag>
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${单价}</el-tag>
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${单位}</el-tag>
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${应收日期}</el-tag>
            </div>
            <div class="title">其他信息</div>
            <div class="list">
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${费用名称}</el-tag>
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${计费周期}</el-tag>
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${单价}</el-tag>
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${单位}</el-tag>
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${应收日期}</el-tag>
            </div>
        </div>
    </GlobalWindow>
</template>

<script>
  import GlobalWindow from '@/components/common/GlobalWindow'
  import BaseOpera from '@/components/base/BaseOpera'
  export default {
    name: "templateKeywords",
    components: { GlobalWindow },
    extends: BaseOpera,
    data() {
      return {
      
      }
    },
    methods: {

    }
  }
</script>

<style lang="scss" scoped>
    @import '@/assets/style/variables.scss';
    .main {
        padding-top: 20px;
        box-sizing: border-box;
        .title {
            font-weight: 500;
            font-size: 18px;
            color: $primary-color;
            margin-bottom: 15px;
        }
        
        .list {
            display: flex;
            flex-wrap: wrap;
            border-radius: 2px;
            margin-bottom: 30px;
        }
    }
</style>

 admin/src/views/stock/InventoryQuery.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,92 @@
<template>
    <TableLayout :permissions="['business:ywroom:query']">
        <!-- æœç´¢è¡¨å• -->
        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="120px" inline>
            <el-form-item label="仓库" prop="buildingId">
                <el-select v-model="searchForm.buildingId" placeholder="请选择楼宇" clearable>
                    <el-option v-for="item in buildList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="资产名称/编码" prop="roomNum">
                <el-input v-model="searchForm.roomNum" placeholder="请输入房号" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="型号" prop="roomNum">
                <el-input v-model="searchForm.roomNum" placeholder="请输入房号" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <section>
                <el-button type="primary" @click="search">搜索</el-button>
                <el-button @click="reset">重置</el-button>
            </section>
        </el-form>
        <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
        <template v-slot:table-wrap>
            <ul class="toolbar" v-permissions="['business:ywroom:create', 'business:ywroom:delete']">
                <li><el-button>导出</el-button></li>
            </ul>
            <el-table v-loading="isWorking.search" :data="tableData.list" stripe>
                <el-table-column prop="projectName" label="资产编号" min-width="100px"></el-table-column>
                <el-table-column prop="buildingName" label="资产名称" min-width="70px"></el-table-column>
                <el-table-column prop="floorName" label="条码" min-width="60px"></el-table-column>
                <el-table-column prop="roomNum" label="品牌" min-width="60px"></el-table-column>
                <el-table-column prop="rentArea" label="规格型号" min-width="80px"></el-table-column>
                <el-table-column prop="feeArea" label="所在仓库" min-width="80px"></el-table-column>
                <el-table-column prop="feeArea" label="库存" min-width="80px"></el-table-column>
            </el-table>
            <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
            </pagination>
        </template>
    </TableLayout>
</template>

<script>
  import BaseTable from '@/components/base/BaseTable'
  import TableLayout from '@/layouts/TableLayout'
  import Pagination from '@/components/common/Pagination'
  export default {
    name: 'InventoryQuery',
    extends: BaseTable,
    components: { TableLayout, Pagination },
    data() {
      return {
        // æœç´¢
        searchForm: {
          id: '',
          creator: '',
          createDate: '',
          editor: '',
          editDate: '',
          isdeleted: '',
          name: '',
          remark: '',
          status: '',
          sortnum: '',
          imgurl: '',
          code: '',
          roomNum: '',
          isInvestment: '',
          area: '',
          feeArea: '',
          rentArea: '',
          floor: '',
          projectId: '',
          buildingId: ''
        },
        projectList: [],
        buildList: [],

        filters: {}
      }
    },
    created() {
      this.config({
        module: '运维房源信息表',
        api: '/project/ywRoom',
        'field.id': 'id',
        'field.main': 'id'
      })
    },
    methods: {
    
    }
  }
</script>

 admin/src/views/stock/assetManagement.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,54 @@
<template>
    <TableLayout>
        <template v-slot:table-wrap>
            <ul class="toolbar">
                <li><el-button type="primary" icon="el-icon-plus" @click="$refs.newAsset.open('新建资产分类')">新建</el-button></li>
            </ul>
            <el-table row-key="id" :tree-props="{ children: 'childCategoryList' }" v-loading="isWorking.search"
                :data="dataList" stripe>
                <el-table-column prop="name" label="资产分类" min-width="100px"></el-table-column>
                <el-table-column prop="sortnum" label="排序码" min-width="100px"></el-table-column>
                <el-table-column label="操作" min-width="120" fixed="right">
                    <template slot-scope="{row}">
                        <el-button type="text" icon="el-icon-edit">编辑</el-button>
                        <el-button type="text" icon="el-icon-delete">删除</el-button>
                    </template>
                </el-table-column>
            </el-table>
            <pagination
                @size-change="handleSizeChange"
                @current-change="handlePageChange"
                :pagination="tableData.pagination"
            ></pagination>
        </template>
        <newAsset ref="newAsset" />
    </TableLayout>
</template>

<script>
  import BaseTable from '@/components/base/BaseTable'
  import TableLayout from '@/layouts/TableLayout'
  import Pagination from '@/components/common/Pagination'
  import newAsset from './components/newAsset'
  export default {
    name: 'assetManagement',
    extends: BaseTable,
    components: { TableLayout, Pagination, newAsset },
    data() {
      return {
        dataList: []
      }
    },
    created() {
      this.config({
        module: '车辆信息表',
        api: '/business/category',
        'field.id': 'id',
        'field.main': 'id'
      })
    },
    methods: {
    
    }
  }
</script>

 admin/src/views/stock/components/inventoryDetails.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,183 @@
<template>
    <GlobalWindow
        :title="title"
        :visible.sync="visible"
        :withFooter="false"
        :confirm-working="isWorking"
        @confirm="confirm">
        <div class="main">
            <div class="title">盘点信息</div>
            <div class="list">
                <div class="item">
                    <div class="la">盘点单名称</div>
                    <div class="val">库存盘点20241212</div>
                </div>
                <div class="item">
                    <div class="la">盘点日期</div>
                    <div class="val">2024-11-17</div>
                </div>
                <div class="item">
                    <div class="la">盘点仓库</div>
                    <div class="val">仓库1</div>
                </div>
                <div class="item">
                    <div class="la">盘点员</div>
                    <div class="val">张三</div>
                </div>
                <div class="item">
                    <div class="la">盘点状态</div>
                    <div class="val">已完成</div>
                </div>
            </div>
            <div class="title">盘点结果</div>
            <div class="list">
                <div class="list_search">
                    <div class="list_search_left">
                        <el-input v-model="input" style="width: 200px; margin-right: 10px;" placeholder="请输入内容"></el-input>
                        <el-select v-model="input" style="width: 200px; margin-right: 10px;" placeholder="请选择">
                            <el-option
                                v-for="item in options"
                                :key="item.value"
                                :label="item.label"
                                :value="item.value">
                            </el-option>
                        </el-select>
                        <el-button type="primary">查询</el-button>
                        <el-button>清空</el-button>
                        <el-button>导出</el-button>
                    </div>
                    <div class="list_search_right">
                        <span>已盘:100</span>
                        <span>未盘:20</span>
                        <span>账实相符:88</span>
                        <span>盘盈:2</span>
                        <span>盘亏:20</span>
                    </div>
                </div>
                <div style="width: 100%; margin: 20px 0;">
                    <el-table :data="roomList" stripe>
                        <el-table-column prop="projectName" label="资产编码" show-overflow-tooltip />
                        <el-table-column prop="buildingName" label="资产名称" show-overflow-tooltip />
                        <el-table-column prop="buildingName" label="条码" show-overflow-tooltip />
                        <el-table-column prop="buildingName" label="品牌" show-overflow-tooltip />
                        <el-table-column prop="buildingName" label="规格型号" show-overflow-tooltip />
                        <el-table-column prop="buildingName" label="单位" show-overflow-tooltip />
                        <el-table-column prop="buildingName" label="所在仓库" show-overflow-tooltip />
                        <el-table-column prop="buildingName" label="账面数量" show-overflow-tooltip />
                        <el-table-column prop="buildingName" label="盘点数量" show-overflow-tooltip />
                        <el-table-column prop="buildingName" label="备注" show-overflow-tooltip />
                    </el-table>
                </div>
                <div class="list_pagination">
                    <el-pagination
                        @size-change="handleSizeChange"
                        @current-change="handleCurrentChange"
                        :current-page="page"
                        :page-sizes="[10, 20, 30, 40]"
                        :page-size="pageSize"
                        layout="total, sizes, prev, pager, next, jumper"
                        :total="total">
                    </el-pagination>
                </div>
            </div>
        </div>
    </GlobalWindow>
</template>

<script>
  import GlobalWindow from '@/components/common/GlobalWindow'
  import BaseOpera from '@/components/base/BaseOpera'
  export default {
    name: "inventoryDetails",
    components: {
      GlobalWindow
    },
    extends: BaseOpera,
    data() {
      return {
        info: {},
        input: '',
        options: [],
        roomList: [],

        pageSize: 10,
        total: 0,
        page: 1
      }
    },
    methods: {
      handleSizeChange(size) {
        this.pageSize = size
      },
      handleCurrentChange(page) {
        this.page = page
      },
      open (title) {
        this.title = title
        this.visible = true
      }
    }
  }
</script>

<style lang="scss" scoped>
    @import '@/assets/style/variables.scss';
    
    .main {
        .title {
            font-weight: 500;
            font-size: 18px;
            padding-top: 20px;
            box-sizing: border-box;
            color: $primary-color;
            margin-bottom: 15px;
        }
        
        .list {
            display: flex;
            flex-wrap: wrap;
            /*background: #F7F7F7;*/
            border-radius: 2px;
            /*padding: 15px 20px;*/
            margin-bottom: 20px;
            
            .list_pagination {
                width: 100%;
                text-align: right;
            }
            
            .list_search {
                width: 100%;
                display: flex;
                align-items: center;
                justify-content: space-between;
                .list_search_left {
                    display: flex;
                    align-items: center;
                }
                .list_search_right {
                    display: flex;
                    align-items: center;
                    span {
                        color: #7E7E7E;
                        font-size: 14px;
                        margin-right: 15px;
                        &:last-child {
                            margin: 0 !important;
                        }
                    }
                }
            }
            
            .item {
                width: 20%;
                margin-bottom: 16px;
                
                .la {
                    color: #7f7f7f;
                    margin-bottom: 10px;
                }
            }
        }
    }
</style>

 admin/src/views/stock/components/newAsset.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,56 @@
<template>
    <GlobalWindow
        width="50%"
        :title="title"
        :visible.sync="visible"
        :confirm-working="isWorking"
        @confirm="confirm">
        <el-form :model="form" ref="form" :rules="rules">
            <el-form-item label="分类名称" prop="name">
                <el-input v-model="form.name" placeholder="请输入分类名称" v-trim />
            </el-form-item>
            <el-form-item label="所属分类" prop="name">
                <el-select v-model="form.name" placeholder="请选择">
                    <el-option label="张三" :value="1"></el-option>
                    <el-option label="李四" :value="1"></el-option>
                    <el-option label="王二" :value="1"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="排序码(升序)" prop="name">
                <el-input v-model="form.name" placeholder="请输入排序码" v-trim />
            </el-form-item>
        </el-form>
    </GlobalWindow>
</template>

<script>
  import BaseOpera from '@/components/base/BaseOpera'
  import GlobalWindow from '@/components/common/GlobalWindow'
  export default {
    name: 'newAsset',
    extends: BaseOpera,
    components: { GlobalWindow },
    data() {
      return {
        // è¡¨å•æ•°æ®
        form: {
          id: '',
          name: '',
        },
        // éªŒè¯è§„则
        rules: {
          name: [{ required: true, message: '请输入项目名称', trigger: 'blur' }]
        },
      }
    },
    created() {
      this.config({
        api: '/project/ywProject',
        'field.id': 'id'
      })
    },
    methods: {

    }
  }
</script>

 admin/src/views/stock/components/newInventory.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,67 @@
<template>
    <GlobalWindow
        width="50%"
        :title="title"
        :visible.sync="visible"
        :confirm-working="isWorking"
        @confirm="confirm">
        <el-form :model="form" ref="form" :rules="rules">
            <el-form-item label="盘点单名称" prop="name">
                <el-input v-model="form.name" placeholder="请输入盘点单名称" v-trim />
            </el-form-item>
            <el-form-item label="盘点日期" prop="name">
                <el-date-picker
                    v-model="form.name"
                    type="date"
                    placeholder="选择日期">
                </el-date-picker>
            </el-form-item>
            <el-form-item label="盘点仓库" prop="name">
                <el-select v-model="form.name" placeholder="请选择">
                    <el-option label="张三" :value="1"></el-option>
                    <el-option label="李四" :value="1"></el-option>
                    <el-option label="王二" :value="1"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="盘点员" prop="name">
                <el-select v-model="form.name" placeholder="请选择">
                    <el-option label="张三" :value="1"></el-option>
                    <el-option label="李四" :value="1"></el-option>
                    <el-option label="王二" :value="1"></el-option>
                </el-select>
            </el-form-item>
        </el-form>
    </GlobalWindow>
</template>

<script>
  import BaseOpera from '@/components/base/BaseOpera'
  import GlobalWindow from '@/components/common/GlobalWindow'
  export default {
    name: 'newInventory',
    extends: BaseOpera,
    components: { GlobalWindow },
    data() {
      return {
        // è¡¨å•æ•°æ®
        form: {
          id: '',
          name: '',
        },
        // éªŒè¯è§„则
        rules: {
          name: [{ required: true, message: '请输入项目名称', trigger: 'blur' }]
        },
      }
    },
    created() {
      this.config({
        api: '/project/ywProject',
        'field.id': 'id'
      })
    },
    methods: {
    
    }
  }
</script>

 admin/src/views/stock/inventoryCount.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,101 @@
<template>
    <TableLayout :permissions="['business:ywroom:query']">
        <!-- æœç´¢è¡¨å• -->
        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="120px" inline>
            <el-form-item label="盘点单名称" prop="roomNum">
                <el-input v-model="searchForm.roomNum" placeholder="请输入盘点单名称" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="状态" prop="buildingId">
                <el-select v-model="searchForm.buildingId" placeholder="请选择楼宇" clearable>
                    <el-option v-for="item in buildList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                </el-select>
            </el-form-item>
            <section>
                <el-button type="primary" @click="search">搜索</el-button>
                <el-button @click="reset">重置</el-button>
            </section>
        </el-form>
        <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
        <template v-slot:table-wrap>
            <ul class="toolbar">
                <li><el-button type="primary" @click="$refs.newInventory.open('新建盘点单')">添加</el-button></li>
                <li><el-button type="primary" @click="$refs.inventoryDetails.open('盘点详细')">详情</el-button></li>
            </ul>
            <el-table v-loading="isWorking.search" :data="tableData.list" stripe>
                <el-table-column prop="projectName" label="盘点单名称" min-width="100px"></el-table-column>
                <el-table-column prop="buildingName" label="盘点仓库" min-width="70px"></el-table-column>
                <el-table-column prop="floorName" label="盘点员" min-width="60px"></el-table-column>
                <el-table-column prop="roomNum" label="盘点日期" min-width="60px"></el-table-column>
                <el-table-column prop="rentArea" label="创建人" min-width="80px"></el-table-column>
                <el-table-column prop="feeArea" label="创建时间" min-width="80px"></el-table-column>
                <el-table-column prop="feeArea" label="盘点状态" min-width="80px"></el-table-column>
                <el-table-column label="操作">
                    <template slot-scope="{row}">
                        <el-button type="text" @click="$refs.inventoryDetails.open('盘点详细')">查看详情</el-button>
                        <el-button type="text">取消</el-button>
                        <el-button type="text">删除</el-button>
                    </template>
                </el-table-column>
            </el-table>
            <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
            </pagination>
            <newInventory ref="newInventory" />
            <inventoryDetails ref="inventoryDetails" />
        </template>
    </TableLayout>
</template>

<script>
  import BaseTable from '@/components/base/BaseTable'
  import TableLayout from '@/layouts/TableLayout'
  import Pagination from '@/components/common/Pagination'
  import newInventory from './components/newInventory'
  import inventoryDetails from './components/inventoryDetails'
  export default {
    name: 'inventoryCount',
    extends: BaseTable,
    components: { TableLayout, Pagination, newInventory, inventoryDetails },
    data() {
      return {
        // æœç´¢
        searchForm: {
          id: '',
          creator: '',
          createDate: '',
          editor: '',
          editDate: '',
          isdeleted: '',
          name: '',
          remark: '',
          status: '',
          sortnum: '',
          imgurl: '',
          code: '',
          roomNum: '',
          isInvestment: '',
          area: '',
          feeArea: '',
          rentArea: '',
          floor: '',
          projectId: '',
          buildingId: ''
        },
        projectList: [],
        buildList: [],

        filters: {}
      }
    },
    created() {
      this.config({
        module: '运维房源信息表',
        api: '/project/ywRoom',
        'field.id': 'id',
        'field.main': 'id'
      })
    },
    methods: {

    }
  }
</script>