BUG 修改
This commit is contained in:
@@ -475,8 +475,6 @@ export default {
|
|||||||
// 获取应收金额和已收金额
|
// 获取应收金额和已收金额
|
||||||
this.accountsReceivableNum = record.accountsReceivableAmount
|
this.accountsReceivableNum = record.accountsReceivableAmount
|
||||||
this.amountReceivedNum = record.amountReceived
|
this.amountReceivedNum = record.amountReceived
|
||||||
// 将pack值改为数字,解决控制台报错
|
|
||||||
record.pack = record.pack
|
|
||||||
this.model = Object.assign({}, record)
|
this.model = Object.assign({}, record)
|
||||||
this.temporaryModel = Object.assign({}, record)
|
this.temporaryModel = Object.assign({}, record)
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
</a-col>
|
</a-col>
|
||||||
<a-col :xl="6" :lg="7" :md="8" :sm="24">
|
<a-col :xl="6" :lg="7" :md="8" :sm="24">
|
||||||
<a-form-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
<a-form-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||||
<a-input placeholder="请输入用户名称" v-model="queryParam.contactsName"></a-input>
|
<a-input placeholder="请输入姓名" v-model="queryParam.contactsName"></a-input>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :xl="6" :lg="7" :md="8" :sm="24">
|
<a-col :xl="6" :lg="7" :md="8" :sm="24">
|
||||||
@@ -67,7 +67,6 @@
|
|||||||
</span>
|
</span>
|
||||||
|
|
||||||
<a-table
|
<a-table
|
||||||
v-if="record.list.length > 0"
|
|
||||||
rowKey="childrenId"
|
rowKey="childrenId"
|
||||||
slot="expandedRowRender"
|
slot="expandedRowRender"
|
||||||
slot-scope="record"
|
slot-scope="record"
|
||||||
@@ -84,6 +83,7 @@
|
|||||||
<a @click="handleDeleteMember(itemRecord.childrenId)" v-has="'committee:member:delete'">删除</a>
|
<a @click="handleDeleteMember(itemRecord.childrenId)" v-has="'committee:member:delete'">删除</a>
|
||||||
</span>
|
</span>
|
||||||
</a-table>
|
</a-table>
|
||||||
|
|
||||||
</a-table>
|
</a-table>
|
||||||
</div>
|
</div>
|
||||||
<!-- /table表格区域-->
|
<!-- /table表格区域-->
|
||||||
|
|||||||
@@ -79,8 +79,8 @@
|
|||||||
</span>
|
</span>
|
||||||
</a-table>
|
</a-table>
|
||||||
</div>
|
</div>
|
||||||
<mail-contract-modal ref="modalForm" @ok="modalFormOk"></mail-contract-modal>
|
|
||||||
</a-card>
|
</a-card>
|
||||||
|
<mail-contract-modal ref="modalForm" @ok="modalFormOk"></mail-contract-modal>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
|
|||||||
@@ -82,7 +82,7 @@
|
|||||||
:columns="columns"
|
:columns="columns"
|
||||||
:scroll="{x: 1000}"
|
:scroll="{x: 1000}"
|
||||||
:dataSource="dataSource"
|
:dataSource="dataSource"
|
||||||
:pagination="ipagination"
|
:pagination="false"
|
||||||
:loading="loading"
|
:loading="loading"
|
||||||
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
|
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
|
||||||
@change="handleTableChange"
|
@change="handleTableChange"
|
||||||
|
|||||||
@@ -368,6 +368,7 @@ export default {
|
|||||||
this.form.resetFields()
|
this.form.resetFields()
|
||||||
this.clearThisTimeAmount()
|
this.clearThisTimeAmount()
|
||||||
this.dataSource = []
|
this.dataSource = []
|
||||||
|
this.$forceUpdate()
|
||||||
this.$emit('update:visible', false)
|
this.$emit('update:visible', false)
|
||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
<a-row>
|
<a-row>
|
||||||
<a-col :xl="8" :lg="9" :md="10" :sm="24">
|
<a-col :xl="8" :lg="9" :md="10" :sm="24">
|
||||||
<a-form-item label="项目名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
<a-form-item label="项目名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||||
<a-input placeholder="请输入项目名称" v-model="queryParam.chargeProject"></a-input>
|
<a-input placeholder="请输入项目名称" v-model="queryParam.projectName"></a-input>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :xl="8" :lg="9" :md="10" :sm="24">
|
<a-col :xl="8" :lg="9" :md="10" :sm="24">
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
@cancel="handleCancel"
|
@cancel="handleCancel"
|
||||||
cancelText="关闭">
|
cancelText="关闭">
|
||||||
<a-spin :spinning="confirmLoading">
|
<a-spin :spinning="confirmLoading">
|
||||||
<a-form :form="form">
|
<a-form :form="form" v-if="memberList.length > 0">
|
||||||
<a-row>
|
<a-row>
|
||||||
<a-col :span="2"></a-col>
|
<a-col :span="2"></a-col>
|
||||||
<a-col :span="20">
|
<a-col :span="20">
|
||||||
@@ -25,6 +25,7 @@
|
|||||||
</a-col>
|
</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
</a-form>
|
</a-form>
|
||||||
|
<a-empty v-else></a-empty>
|
||||||
</a-spin>
|
</a-spin>
|
||||||
<template slot="footer">
|
<template slot="footer">
|
||||||
<a-button @click="handleCancel">关闭</a-button>
|
<a-button @click="handleCancel">关闭</a-button>
|
||||||
@@ -147,6 +148,10 @@ export default {
|
|||||||
this.memberList = []
|
this.memberList = []
|
||||||
},
|
},
|
||||||
handleOk() {
|
handleOk() {
|
||||||
|
if (this.memberList.length === 0) {
|
||||||
|
this.$message.warn('当前工作组暂无成员,无法分发文件')
|
||||||
|
return
|
||||||
|
}
|
||||||
if (this.checkedKeys.length === 0) {
|
if (this.checkedKeys.length === 0) {
|
||||||
this.form.validateFields()
|
this.form.validateFields()
|
||||||
return
|
return
|
||||||
|
|||||||
+2
-2
@@ -276,8 +276,8 @@ export default {
|
|||||||
}
|
}
|
||||||
this.footerDataSource = [obj]
|
this.footerDataSource = [obj]
|
||||||
console.log(this.footerDataSource)
|
console.log(this.footerDataSource)
|
||||||
if (res.result.total) {
|
if (res.result.pageList.total) {
|
||||||
this.ipagination.total = res.result.total
|
this.ipagination.total = res.result.pageList.total
|
||||||
//清空列表选中
|
//清空列表选中
|
||||||
this.onClearSelected()
|
this.onClearSelected()
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
+2
-2
@@ -243,8 +243,8 @@ export default {
|
|||||||
comeAllMoney: res.result.sumOfReallyMoney.toString()
|
comeAllMoney: res.result.sumOfReallyMoney.toString()
|
||||||
}
|
}
|
||||||
this.footerDataSource = [obj]
|
this.footerDataSource = [obj]
|
||||||
if (res.result.total) {
|
if (res.result.pageList.total) {
|
||||||
this.ipagination.total = res.result.total
|
this.ipagination.total = res.result.pageList.total
|
||||||
//清空列表选中
|
//清空列表选中
|
||||||
this.onClearSelected()
|
this.onClearSelected()
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user