收款单新增字段

product
杨世强 1 year ago
parent 4fccadddd6
commit b11502778c

@ -165,6 +165,11 @@ public class CollectionController {
@PostMapping("/confirmprice/{ids}")
@Transactional
public ActionResult confirmPrice(@PathVariable("ids") String ids) {
String userId=userProvider.get().getUserId();
String detpartment=null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
String[] idList = ids.split(",");
for (String id : idList) {
CollectionEntity collectionEntity = collectionService.getInfo(id);
@ -235,6 +240,10 @@ public class CollectionController {
saleorderitemService.updateById(saleordercetEntity);
collectionEntity.setStatus("2");
collectionEntity.setBusinessDate(new Date());
collectionEntity.setCollectionUserId(userId);
if (StringUtil.isNotNull(detpartment)) {
collectionEntity.setCollectionDept(detpartment);
}
collectionService.updateById(collectionEntity);
}
return ActionResult.success("认款成功");

@ -116,6 +116,12 @@ public class CollectionEntity {
@TableField("CONTRACT_ID")
private String contractId;
@TableField("COLLECTION_USER_ID")
private String collectionUserId;
@TableField("COLLECTION_DEPT")
private String collectionDept;
@TableField(exist = false)
private String contractNm;
@TableField(exist = false)

@ -832,6 +832,11 @@ public class SaleorderitemController {
if (collection_item0Entity.size()>0) {
for (Collection_item0Entity collection_item0Entity1 : collection_item0Entity) {
List<CollectionsoitemEntity> jg_collectionList = saleorderitemService.GetCollectionsoitemList(collection_item0Entity1.getCollectionId());
if (jg_collectionList!=null && jg_collectionList.size()>0){
for (CollectionsoitemEntity entity1 : jg_collectionList) {
entity1.setAmountCollected(collection_item0Entity1.getAmount());
}
}
collectionsoitemEntityList.addAll(jg_collectionList);
}
}

@ -0,0 +1,150 @@
<template>
<el-dialog title="选择客户" :close-on-click-modal="false" :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center"
lock-scroll append-to-body width="1000px">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="8">
<el-form-item label="客户编码">
<el-input v-model="supplierCd" placeholder="请输入客户编码查询" clearable @keyup.enter.native="init()" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="客户名称">
<el-input v-model="supplierNm" placeholder="请输入客户名称查询" clearable @keyup.enter.native="init()" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="init()">{{$t('common.search')}}
</el-button>
<el-button icon="el-icon-refresh-right" @click="refresh()">{{$t('common.reset')}}
</el-button>
</el-form-item>
</el-col>
</el-form>
<div class="JNPF-common-search-box-right">
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="init()" />
</el-tooltip>
</div>
</el-row>
<JNPF-table v-loading="listLoading" :data="list" @row-click="rowClick" @row-dblclick="rowdbClick" :border="false" :hasNO="false">
<el-table-column width="35">
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="checkedRow.id">&nbsp;</el-radio>
</template>
</el-table-column>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="supplierCd" width="200" align="center" label="客户编码" />
<el-table-column prop="supplierNm" width="200" align="center" label="客户名称" />
<el-table-column prop="address" width="150" align="center" label="地址" />
<el-table-column prop="bankAccount" width="150" align="center" label="银行账号" />
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="refresh" />
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">{{$t('common.cancelButton')}}</el-button>
<el-button type="primary" @click="select()">{{$t('common.confirmButton')}}</el-button>
</span>
</el-dialog>
</template>
<script>
import request from '@/utils/request'
import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
import {
getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import {
GoodsList
} from '@/api/extend/order'
export default {
data() {
return {
primaryUnitOmeasureOptions: [{ 'fullName': '吨', 'id': '0' }, { 'fullName': '千克', 'id': '1' }],
visible: false,
listLoading: true,
supplierCd: '',
supplierNm: '',
list: [],
total: 0,
checkedRow: {},
listQuery: {
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "creatorTime",
supplierCd: '',
supplierNm: '',
},
total: 0,
checked: '',
}
},
methods: {
rowdbClick(row){
this.checked = row.id
this.checkedRow = row
this.select();
},
rowClick(row) {
this.checked = row.id
this.checkedRow = row
},
init() {
this.visible = true
this.listLoading = true
this.listQuery.supplierCd = this.supplierCd
this.listQuery.supplierNm = this.supplierNm
this.listQuery.menuId = '380358734926336581'
let listQuery = this.listQuery
request({
url: `/api/example/Customer/getList`,
method: 'post',
data: listQuery
}).then(res => {
this.list = res.data.list
this.total = res.data.pagination.total
this.listLoading = false
})
/* GoodsList(query).then(res => {
this.list = res.data.list
this.total = res.data.pagination.total
this.listLoading = false
}) */
},
refresh() {
this.supplierCd = ''
this.supplierNm = ''
this.init()
},
select() {
if (this.checked == '') return
this.$emit('refreshDataList', this.checkedRow)
this.visible = false
},
handleSelectionChange(val) {
this.checked = val
}
}
}
</script>
<style lang="scss" scoped>
>>>.el-dialog__body {
height: 70vh;
padding: 0 0 10px !important;
display: flex;
flex-direction: column;
overflow: hidden;
.JNPF-common-search-box {
margin-bottom: 0;
.JNPF-common-search-box-right {
padding: 10px 10px 0 0;
}
}
}
</style>

@ -13,11 +13,14 @@
</el-col>
<el-col :span="8">
<el-form-item label="客户名称" prop="customerId">
<popupSelect v-model="dataForm.customerId" placeholder="请选择" clearable field="customerId"
interfaceId="393371066040385285" :columnOptions="customerNamecolumnOptions" propsValue="id"
relationField="supplier_nm" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
@change="popupSelect">
</popupSelect>
<!-- <popupSelect v-model="dataForm.customerId" placeholder="请选择" clearable field="customerId"-->
<!-- interfaceId="393371066040385285" :columnOptions="customerNamecolumnOptions" propsValue="id"-->
<!-- relationField="supplier_nm" popupType="dialog" popupTitle="选择数据" popupWidth="800px"-->
<!-- @click.native="choiceCustomerId()">-->
<!-- </popupSelect>-->
<el-input v-model="dataForm.customerName" placeholder="选择客户" readonly
@click.native="choiceCustomerId()">
</el-input>
</el-form-item>
</el-col>
@ -190,13 +193,13 @@
</el-input>
</template>
</el-table-column>
<el-table-column prop="creatorTime" label="业务日期" align="center" width="160">
<template slot-scope="scope">
<el-date-picker v-model="scope.row.creatorTime" placeholder="请选择" clearable
:style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" disabled>
</el-date-picker>
</template>
</el-table-column>
<!-- <el-table-column prop="creatorTime" label="业务日期" align="center" width="160">-->
<!-- <template slot-scope="scope">-->
<!-- <el-date-picker v-model="scope.row.creatorTime" placeholder="请选择" clearable-->
<!-- :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" disabled>-->
<!-- </el-date-picker>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="操作" width="50">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@ -219,10 +222,12 @@
<el-button @click="visible = false"> </el-button>
<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail" :disabled="submitDisabled"> </el-button>
</span>
<CustomerBox v-if="formVisible2" ref="form2" @refreshDataList="initData2" />
</el-dialog>
</template>
<script>
import request from '@/utils/request'
import CustomerBox from './CustomerBox'
import {
getDataInterfaceRes
} from '@/api/systemData/dataInterface'
@ -230,10 +235,11 @@
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
export default {
components: {},
components: {CustomerBox},
props: [],
data() {
return {
formVisible2: false,
submitDisabled: false,
paymentType: "0",
currency: "0",
@ -454,11 +460,25 @@
}
this.dataForm.amountCollected = sum;
},
popupSelect(e, d) {
this.dataForm.code = d.id;
this.dataForm.collectionCount = d.bank_account;
this.dataForm.collectionBank = d.bank;
this.dataForm.collection_item0List = [];
choiceCustomerId(){
this.formVisible2 = true
this.$nextTick(() => {
this.$refs.form2.init()
})
},
initData2(custmer) {
this.dataForm.code = custmer.id;
this.dataForm.customerId = custmer.id;
this.dataForm.customerName = custmer.supplierNm;
this.dataForm.collectionCount = custmer.bankAccount;
this.dataForm.collectionBank = custmer.bank;
this.popupSelect();
},
popupSelect() {
// this.dataForm.code = d.id;
// this.dataForm.collectionCount = d.bank_account;
// this.dataForm.collectionBank = d.bank;
// this.dataForm.collection_item0List = [];
let params = {
"param" : this.dataForm.customerId
}
@ -489,7 +509,7 @@
});
},
contractSelect(){
this.dataForm.collection_item0List = [];
// this.dataForm.collection_item0List = [];
let params = {
"param" : this.dataForm.contractId
}

@ -515,7 +515,7 @@ export default {
});
},
handleDel(row) {
if (row.Status != "0") {
if (row.status != "0") {
this.$message({
type: "error",
message: "已认款无法删除",

Loading…
Cancel
Save