|
|
@@ -5,14 +5,17 @@
|
|
|
</div>
|
|
|
<y-page-list-layout :page-list="pageData" :page-para="listQuery" :get-page-list="getList">
|
|
|
<template slot="left">
|
|
|
- <PermissionButton menu-code="_views_major_order" class-name="filter-item" type="danger"
|
|
|
- icon="el-icon-circle-plus-outline" :page-jump="true" round style="position: absolute;left:1100px;z-index:9"
|
|
|
- :page-query="{ 'couldEdit': true, 'couldBack': true }" />
|
|
|
<MoreSearchBar business="MAJOR_BUSINESS" @fliterSearch="fliterSearch" @resetParams="resetParams"
|
|
|
:listQuery="listQuery" :nodeCode="false" :financial="false" :clientManager="false" :businessObjectType="false"
|
|
|
- :department="false" :clientName="false"></MoreSearchBar>
|
|
|
+ :department="false" :orderId="true" :productionNo="true">
|
|
|
+ <template v-slot:otherButton>
|
|
|
+ <PermissionButton menu-code="_views_major_order" class-name="filter-item" type="danger"
|
|
|
+ icon="el-icon-circle-plus-outline" :page-jump="true" round
|
|
|
+ :page-query="{ 'couldEdit': true, 'couldBack': true }" />
|
|
|
+ </template>
|
|
|
+ </MoreSearchBar>
|
|
|
</template>
|
|
|
- <parentTable :data="pageData.records" slot="table" style="width: 100%;">
|
|
|
+ <parentTable :data="pageData.records" slot="table" style="width: 100%;" >
|
|
|
<el-table-column label="订单名称" align="center" show-overflow-tooltip width='300'>
|
|
|
<template slot-scope="{row}">
|
|
|
<span>{{ row.orderName }}</span>
|
|
|
@@ -23,6 +26,16 @@
|
|
|
<span>{{ row.orderId }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column label="产品号" align="center" width='200'>
|
|
|
+ <template slot-scope="{row}">
|
|
|
+ <span>{{ row.productionNo }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="当前节点" align="center" width='200'>
|
|
|
+ <template slot-scope="{row}">
|
|
|
+ <span>{{ row.currentNodeName==null?(row.ifSaveFile===true?'已归档':'撰写节点'):row.currentNodeName}}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column label="负责人" align="center" width='120'>
|
|
|
<template slot-scope="{row}">
|
|
|
<span>{{ row.principal }}</span>
|
|
|
@@ -83,13 +96,13 @@
|
|
|
<div>
|
|
|
<PermissionButton menu-code="_views_myOrder_detail" class-name="filter-item" type="text" :page-jump="true"
|
|
|
size="mini"
|
|
|
- :page-query="{ 'couldEdit': false, 'id': row.id, 'back': '/major/my/order', 'recall': true, 'couldBack': true }" />
|
|
|
+ :page-query="{ 'couldEdit': false, 'id': row.businessId, 'back': '/major/my/order', 'recall': true, 'couldBack': true }" />
|
|
|
<el-button type="text" size="small" @click="openShouldAmountDialog(row)">应收款</el-button>
|
|
|
<!-- <el-button type="text" size="small" @click="openAllotProductionDialog(row)">实收款分配</el-button> -->
|
|
|
</div>
|
|
|
<div>
|
|
|
<el-button type="text" size="small" @click="openFinanceInvoiceDialog(row.orderFundId,row.realAmount,row.clienteleName,row.clienteleSubName)">申请开票</el-button>
|
|
|
- <el-button type="text" size="small" @click="productionList(row.id)">产品包</el-button>
|
|
|
+ <el-button type="text" size="small" @click="productionList(row.businessId)">产品包</el-button>
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -752,7 +765,6 @@ export default {
|
|
|
if (this.todoBusinessId) {
|
|
|
this.productionListDialog = true;
|
|
|
this.productionList(this.todoBusinessId, this.reportNo == null ? this.statementNo : this.reportNo)
|
|
|
- console.log(this.reportNo)
|
|
|
this.activeName = this.reportNo == null ? this.statementNo : this.reportNo
|
|
|
}
|
|
|
},
|
|
|
@@ -800,7 +812,7 @@ export default {
|
|
|
this.shouldAmountDialog = true;
|
|
|
this.fund.id = row.orderFundId;
|
|
|
this.fund.businessType = 'MAJOR_BUSINESS';
|
|
|
- this.fund.businessId = row.id;
|
|
|
+ this.fund.businessId = row.businessId;
|
|
|
this.fund.orderFundId = row.orderFundId;
|
|
|
this.fund.shouldAmount = row.shouldAmount;
|
|
|
this.fund.remark = row.remark;
|
