Sfoglia il codice sorgente

1.修复资产可重复撰写产品报告的问题
2.新增页面入库统计

GouGengquan 1 anno fa
parent
commit
ddd56c9b1d

+ 4 - 0
src/api/modules/assets.js

@@ -141,5 +141,9 @@ export default {
     // 条件查询资产已终止列表
     selectTerminatedPage(params){
         return request.get(`assets/selectTerminatedPage`, { params: params })
+    },
+    // 条件查询资产已终止列表
+    selectRepertoryPage(params){
+        return request.get(`assets/selectRepertoryPage`, { params: params })
     }
 }

+ 4 - 2
src/router/urlMap.js

@@ -98,7 +98,8 @@ import _views_assets_order_detail from '@/views/assets/orderDetail'
 import _views_assets_todo_list from '@/views/assets/todoList'
 import _views_assets_archived_list from '@/views/assets/archivedList'
 import _views_assets_done_list from '@/views/assets/doneList'
-import _views_assets_terminate_list from '@/views/assets/TerminateList'
+import _views_assets_terminate_list from '@/views/assets/terminateList'
+import _views_assets_repertory_list from '@/views/assets/repertoryList'
 import _views_personal_to_save_file from '@/views/personal/saveFileTodoList'
 import _views_personal_save_file from '@/views/personal/saveFileDoneList'
 import _views_personal_readonly_detail from '@/views/personal/readonlyDetail'
@@ -198,5 +199,6 @@ export default {
   _views_assets_todo_list,
   _views_assets_archived_list,
   _views_assets_done_list,
-  _views_assets_terminate_list
+  _views_assets_terminate_list,
+  _views_assets_repertory_list
 }

+ 5 - 6
src/views/assets/orderDetail.vue

@@ -379,7 +379,9 @@
                 </el-tooltip>
               </el-col>
               <el-col :span="2"
-                v-if="(currentNode.nodeCode === 'GENERATE_STATEMENT' || currentNode.nodeCode === 'WRITE_REPORT') && couldEdit">
+                v-if="(currentNode.nodeCode === 'GENERATE_STATEMENT' || currentNode.nodeCode === 'WRITE_REPORT') 
+                && couldEdit 
+                &&(writeProductionStatementNos.length > 0 || writeProductionReportNos.length > 0)">
                 <el-tooltip class="item" effect="dark" content="请仔细确认产品内容" placement="right">
                   <el-button type="success" @click="openWriteProductionDialog(false, 'add')" round>撰写产品信息</el-button>
                 </el-tooltip>
@@ -2080,11 +2082,8 @@ export default {
       this.$api.assets.getAETargetListByAssetsId(aETargetListSelectDTO).then(res => {
         if (res.code === 200) {
           this.assetsEvaluationTarget = res.data;
-          this.writeProductionStatementNos = this.assetsEvaluationTarget.filter(obj => obj.createProductionDate == null || obj.createProductionDate == '').map(obj => obj.statementNo);
-          this.writeProductionReportNos = this.assetsEvaluationTarget.filter(obj => obj.createProductionDate == null || obj.createProductionDate == '').map(obj => obj.reportNo);
-          // for (let i = 0; i < res.data.length; i++) {
-          //   this.nodeBusinessInfo.reportNos.push(res.data[i].productionNo);
-          // }
+          this.writeProductionStatementNos = this.assetsEvaluationTarget.filter(obj => obj.statementCreateProductionDate == null || obj.statementCreateProductionDate == '').map(obj => obj.statementNo);
+          this.writeProductionReportNos = this.assetsEvaluationTarget.filter(obj => obj.reportCreateProductionDate == null || obj.reportCreateProductionDate == '').map(obj => obj.reportNo);
           this.flowDoFourthCheck();
         }
       })

+ 170 - 0
src/views/assets/repertoryList.vue

@@ -0,0 +1,170 @@
+<template>
+    <div class="app-container">
+        <div class="title-container">
+            <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
+        </div>
+        <y-page-list-layout :page-list="pageData" :page-para="listQuery" :get-page-list="selectRepertoryPage">
+            <template slot="left">
+                <el-input style="margin-left: 20px;width: 300px;float: left;" class="filter-item"
+                    v-model="listQuery.keyWord" placeholder="项目编号/报告号/项目名称/业务来源" clearable>
+                </el-input>
+                <el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary" @click="searchList"
+                    round>搜索
+                </el-button>
+                <el-button class="filter-item" style="float: left;" round type="success" @click="resetParams()">重置
+                </el-button>
+            </template>
+            <parentTable ref="table" v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;">
+                <el-table-column label="项目编号" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.orderId }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="项目名称" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.orderName }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="报告号" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.reportNo }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="评估目的" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.purposeName }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="评估方法" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.methodName }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="评估作业开始日" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.startTime }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="估价作业结束日" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.endTime }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="估价时点" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.valuationBasisDate }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="评估总值(万元)" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.evaluateAmount }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="评估单价(元)" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.evaluatePrice }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="评估部门" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.evaluateDepartment }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="市场部门" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.marketDepartment }}</span>
+                    </template>
+                </el-table-column>
+            </parentTable>
+        </y-page-list-layout>
+    </div>
+</template>
+
+<script>
+import YPageListLayout from '@/components/YPageListLayout'
+import Breadcrumb from '@/components/Breadcrumb'
+import PermissionButton from '@/components/PermissionButton/PermissionButton'
+
+export default {
+    name: 'RepertoryList',
+    components: {
+        Breadcrumb,
+        YPageListLayout,
+        PermissionButton,
+    },
+    data() {
+        return {
+            pageData: { records: [] },
+            listLoading: false,
+            listQuery: {
+                page: 1,
+                size: 10,
+                current: 1,
+                // 节点code
+                nodeCode: null,
+                // 客户经理id
+                clientManagerId: null,
+                // 项目负责人id
+                principalId: null,
+                // 业务类型
+                assetsBusinessGener: null,
+                // 关键字
+                keyWord: null
+            },
+            // 用户下拉列表
+            allUsers: [],
+            // 业务类型下拉列表
+            assetsBusinessGeners: [
+                {
+                    value: '单项资产',
+                    label: '单项资产'
+                }, {
+                    value: '整体资产',
+                    label: '整体资产'
+                }, {
+                    value: '无形资产',
+                    label: '无形资产'
+                }, {
+                    value: '债权',
+                    label: '债权'
+                }, {
+                    value: '其他',
+                    label: '其他'
+                }
+            ]
+        }
+    },
+    created() {
+        // 获取资产业务订单
+        this.selectRepertoryPage();
+    },
+    methods: {
+        // 无条件分页查询
+        selectRepertoryPage() {
+            this.$api.assets.selectRepertoryPage(this.listQuery).then(res => {
+                if (res.code === 200) {
+                    this.pageData = res.data;
+                }
+            })
+        },
+        // 条件查询
+        searchList() {
+            // 重置分页
+            this.listQuery.page = 1
+            this.listQuery.size = 10
+            this.selectRepertoryPage()
+        },
+        // 重置搜索条件
+        resetParams() {
+            this.$router.push({ query: {} });
+            this.listQuery = {
+                current: 1,
+                size: 10,
+            }
+            this.selectRepertoryPage();
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped></style>