修改单号

product
tengxi 2 years ago
parent a787dd5fa2
commit 312f7d9e14

@ -110,4 +110,7 @@ public class CollectionEntity {
@TableField("DELETE_MARK")
private String deleteMark;
@TableField("CUSTOMER_ID")
private String customerId;
}

@ -2,6 +2,7 @@
package jnpf.collection.model.collection;
import com.baomidou.mybatisplus.annotation.TableField;
import jnpf.collection.model.collection.Collection_item0Model;
import lombok.Data;
import java.util.List;
@ -75,6 +76,7 @@ public class CollectionCrForm {
/** 子表数据 **/
@JsonProperty("collection_item0List")
private List<Collection_item0Model> collection_item0List;
/** 客户id **/
@JsonProperty("customerId")
private String customerId;
}

@ -79,4 +79,7 @@ public class CollectionInfoVO{
/** 子表数据 **/
@JsonProperty("collection_item0List")
private List<Collection_item0Model> collection_item0List;
/** 客户id **/
@JsonProperty("customerId")
private String customerId;
}

@ -86,6 +86,8 @@ public class CollectionListVO{
/** 制单人 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 客户id **/
@JsonProperty("customerId")
private String customerId;
}

@ -90,5 +90,8 @@ public class CollectionUpForm{
/** 子表数据 **/
@JsonProperty("collection_item0List")
private List<Collection_item0Model> collection_item0List;
/** 客户id **/
@JsonProperty("customerId")
private String customerId;
}

@ -96,4 +96,7 @@ public class ReceiptoutEntity {
@TableField("REMARK")
private String remark;
@TableField("SALES_ID")
private String salesId;
}

@ -2,6 +2,7 @@
package jnpf.receiptout.model.receiptout;
import com.baomidou.mybatisplus.annotation.TableField;
import jnpf.receiptout.model.receiptout.Receiptout_item0Model;
import lombok.Data;
import java.util.List;
@ -80,5 +81,7 @@ public class ReceiptoutCrForm {
@JsonProperty("receiptout_item0List")
private List<Receiptout_item0Model> receiptout_item0List;
/** 销售id **/
@TableField("salesId")
private String salesId;
}

@ -3,6 +3,7 @@
package jnpf.receiptout.model.receiptout;
import com.baomidou.mybatisplus.annotation.TableField;
import jnpf.receiptout.model.receiptout.Receiptout_item0Model;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonProperty;
@ -85,4 +86,8 @@ public class ReceiptoutInfoVO{
/** 子表数据 **/
@JsonProperty("receiptout_item0List")
private List<Receiptout_item0Model> receiptout_item0List;
/** 来源单号销售id **/
@TableField("salesId")
private String salesId;
}

@ -3,6 +3,7 @@
package jnpf.receiptout.model.receiptout;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import java.sql.Time;
import java.util.Date;
@ -97,4 +98,9 @@ public class ReceiptoutListVO{
private String lastModifyUserName;
/** 来源单号销售id **/
@TableField("salesId")
private String salesId;
}

@ -2,6 +2,7 @@
package jnpf.receiptout.model.receiptout;
import com.baomidou.mybatisplus.annotation.TableField;
import jnpf.receiptout.model.receiptout.Receiptout_item0Model;
import lombok.Data;
import java.util.List;
@ -97,4 +98,8 @@ public class ReceiptoutUpForm{
@JsonProperty("receiptout_item0List")
private List<Receiptout_item0Model> receiptout_item0List;
/** 来源单号销售id **/
@TableField("salesId")
private String salesId;
}

@ -11,15 +11,31 @@
</el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="8">-->
<!-- <el-form-item label="客户名称" prop="customerName">-->
<!-- <popupSelect v-model="dataForm.customerName" placeholder="请选择" clearable field="customerName"-->
<!-- interfaceId="393371066040385285" :columnOptions="customerNamecolumnOptions"-->
<!-- propsValue="supplier_nm"-->
<!-- relationField="supplier_nm" popupType="dialog" popupTitle="选择数据" popupWidth="800px"-->
<!-- @change="popupSelect">-->
<!-- </popupSelect>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="8">
<el-form-item label="客户名称" prop="customerName">
<popupSelect v-model="dataForm.customerName" placeholder="请选择" clearable field="customerName"
interfaceId="393371066040385285" :columnOptions="customerNamecolumnOptions" propsValue="supplier_nm"
relationField="supplier_nm" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
@change="popupSelect">
<el-form-item label="客户名称"
prop="customerId">
<popupSelect v-model="dataForm.customerId"
placeholder="请选择" clearable field="customerId" interfaceId="393371066040385285"
:columnOptions="customerIdcolumnOptions" propsValue="id" relationField="supplier_nm"
popupType="dialog"
popupTitle="选择数据" popupWidth="800px" >
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="收款金额" prop="amountCollected">
<el-input v-model="dataForm.amountCollected" placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -106,45 +122,47 @@
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.collection_item0List" size='mini' show-summary :summary-method="getSummaries">
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="amount" label="收款金额" align="center" >
<el-table :data="dataForm.collection_item0List" size='mini' show-summary
:summary-method="getSummaries">
<el-table-column type="index" width="50" label="序号" align="center"/>
<el-table-column prop="amount" label="收款金额" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.amount" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="price" label="订单金额" align="center" >
<el-table-column prop="price" label="订单金额" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.price" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="amountCollected" label="已收款金额" align="center" >
<el-table-column prop="amountCollected" label="已收款金额" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.amountCollected" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="coustomerCode" label="销售订单编号" align="center" >
<el-table-column prop="coustomerCode" label="销售订单编号" align="center">
<template slot-scope="scope">
<popupSelect v-model="scope.row.documentNo" placeholder="请选择" clearable
:field="'deleteTime'+scope.$index" interfaceId="393372436705378053"
:columnOptions="jg_collection_item0deleteTimecolumnOptions" propsValue="document_no"
:columnOptions="jg_collection_item0deleteTimecolumnOptions"
propsValue="document_no"
relationField="document_no" popupType="dialog" popupWidth="800px"
:bissId="dataForm.customerCode" @change="popupSelect2">
</popupSelect>
</template>
</el-table-column>
<el-table-column prop="contractCode" label="合同编号" align="center" >
<el-table-column prop="contractCode" label="合同编号" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.contractCode" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="num" label="数量" align="center" >
<el-table-column prop="num" label="数量" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.num" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
@ -158,36 +176,38 @@
<!-- </el-select>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="advanceAmount" label="垫资金额" align="center" >
<el-table-column prop="advanceAmount" label="垫资金额" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.advanceAmount" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="rate" label="税额" align="center" >
<el-table-column prop="rate" label="税额" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.rate" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="notPrice" label="不含税金额" align="center" >
<el-table-column prop="notPrice" label="不含税金额" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.notPrice" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="creatorTime" label="业务日期" align="center" >
<el-table-column prop="creatorTime" label="业务日期" align="center">
<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">
:style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
value-format="timestamp">
</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"
@click="delcollection_item0List(scope.$index)">删除</el-button>
@click="delcollection_item0List(scope.$index)">删除
</el-button>
</template>
</el-table-column>
</el-table>
@ -216,6 +236,7 @@
import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
export default {
components: {},
props: [],
@ -232,137 +253,141 @@
amountCollected: '',
collectionCount: '',
collectionBank: '',
paymentType: "0",
currency: "0",
settlementType: "0",
paymentType: '0',
currency: '0',
settlementType: '0',
remark: '',
voucher: [],
status: "0",
status: '0',
creatorUserName: '',
collection_item0List: [],
collection_item0List: []
},
activeojnisi: '0',
rules: {},
customerNamecolumnOptions: [{
"label": "客户编码",
"value": "supplier_cd"
customerIdcolumnOptions: [{
'label': '客户编码',
'value': 'supplier_cd'
}, {
"label": "客户名称",
"value": "supplier_nm"
'label': '客户名称',
'value': 'supplier_nm'
},{
'label': '客户id',
'value': 'id'
}, {
"label": "客户地点名称",
"value": "supplier_site_code"
'label': '客户地点名称',
'value': 'supplier_site_code'
}, {
"label": "客户等级",
"value": "customer_level"
}, ],
'label': '客户等级',
'value': 'customer_level'
}],
jg_collection_item0deleteTimecolumnOptions: [{
"label": "销售订单ID",
"value": "id"
'label': '销售订单ID',
'value': 'id'
}, {
"label": "销售订单编号",
"value": "document_no"
'label': '销售订单编号',
'value': 'document_no'
}, {
"label": "合同编号",
"value": "contract_code"
'label': '合同编号',
'value': 'contract_code'
},
{
"label": "订单金额",
"value": "price"
'label': '订单金额',
'value': 'price'
}, {
"label": "已收款金额",
"value": "amount_collected"
'label': '已收款金额',
'value': 'amount_collected'
},
{
"label": "重量",
"value": "num"
'label': '重量',
'value': 'num'
}, {
"label": "垫资金额",
"value": "advance_amount"
'label': '垫资金额',
'value': 'advance_amount'
},
{
"label": "税额",
"value": "rate"
'label': '税额',
'value': 'rate'
}, {
"label": "不含税金额",
"value": "not_price"
'label': '不含税金额',
'value': 'not_price'
}, {
"label": "业务日期",
"value": "creator_time"
},
'label': '业务日期',
'value': 'creator_time'
}
],
paymentTypeOptions: [{
"fullName": "货款",
"id": "0"
'fullName': '货款',
'id': '0'
}, {
"fullName": "运费",
"id": "1"
'fullName': '运费',
'id': '1'
}, {
"fullName": "仓储",
"id": "2"
'fullName': '仓储',
'id': '2'
}],
currencyOptions: [{
"fullName": "人民币",
"id": "0"
'fullName': '人民币',
'id': '0'
}, {
"fullName": "美元",
"id": "1"
'fullName': '美元',
'id': '1'
}, {
"fullName": "英镑",
"id": "2"
'fullName': '英镑',
'id': '2'
}],
settlementTypeOptions: [{
"fullName": "现金",
"id": "0"
'fullName': '现金',
'id': '0'
}, {
"fullName": "赊购",
"id": "1"
'fullName': '赊购',
'id': '1'
}, {
"fullName": "网银",
"id": "2"
'fullName': '网银',
'id': '2'
}, {
"fullName": "银企直连",
"id": "3"
'fullName': '银企直连',
'id': '3'
}, {
"fullName": "银票",
"id": "4"
'fullName': '银票',
'id': '4'
}, {
"fullName": "商票",
"id": "5"
'fullName': '商票',
'id': '5'
}],
statusOptions: [{
"fullName": "已保存",
"id": "0"
'fullName': '已保存',
'id': '0'
}, {
"fullName": "审批中",
"id": "1"
'fullName': '审批中',
'id': '1'
}, {
"fullName": "已审批",
"id": "2"
'fullName': '已审批',
'id': '2'
}, {
"fullName": "已付款",
"id": "3"
'fullName': '已付款',
'id': '3'
}],
taxRateOptions: [{
"fullName": "13",
"id": "0"
'fullName': '13',
'id': '0'
}, {
"fullName": "9",
"id": "1"
'fullName': '9',
'id': '1'
}, {
"fullName": "6",
"id": "2"
'fullName': '6',
'id': '2'
}, {
"fullName": "5",
"id": "3"
'fullName': '5',
'id': '3'
}, {
"fullName": "3",
"id": "4"
'fullName': '3',
'id': '4'
}, {
"fullName": "0",
"id": "5"
}],
'fullName': '0',
'id': '5'
}]
}
},
computed: {},
@ -374,77 +399,78 @@
}
}
},
created() {},
mounted() {},
created() {
},
mounted() {
},
methods: {
popupnum() {
let amount = 0
for (let i = 0; i < this.dataForm.collection_item0List.length; i++) {
amount = amount + parseFloat(this.dataForm.collection_item0List[i].amount);
amount = amount + parseFloat(this.dataForm.collection_item0List[i].amount)
}
parseFloat(this.dataForm.amountCollected = amount)
},
popupSelect(e, d) {
this.dataForm.customerCode = d.id;
this.dataForm.customerCode = d.id
},
popupSelect2(a, b) {
for (let i = 0; i < this.dataForm.collection_item0List.length; i++) {
if (a == this.dataForm.collection_item0List[i].documentNo) {
this.dataForm.collection_item0List[i].id = b.id;
this.dataForm.collection_item0List[i].price = b.price;
this.dataForm.collection_item0List[i].amountCollected = b.amount_collected;
this.dataForm.collection_item0List[i].contractCode = b.contract_code;
this.dataForm.collection_item0List[i].num = b.num;
this.dataForm.collection_item0List[i].advanceAmount = b.advance_amount;
this.dataForm.collection_item0List[i].rate = b.rate;
this.dataForm.collection_item0List[i].notPrice = b.not_price;
this.dataForm.collection_item0List[i].creatorTime = b.creator_time;
this.dataForm.collection_item0List[i].id = b.id
this.dataForm.collection_item0List[i].price = b.price
this.dataForm.collection_item0List[i].amountCollected = b.amount_collected
this.dataForm.collection_item0List[i].contractCode = b.contract_code
this.dataForm.collection_item0List[i].num = b.num
this.dataForm.collection_item0List[i].advanceAmount = b.advance_amount
this.dataForm.collection_item0List[i].rate = b.rate
this.dataForm.collection_item0List[i].notPrice = b.not_price
this.dataForm.collection_item0List[i].creatorTime = b.creator_time
}
}
},
getSummaries(param) {
const { columns, data } = param;
const sums = [];
const { columns, data } = param
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计';
return;
sums[index] = '合计'
return
}
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value)) && (index === 1 || index === 2 || index === 3 || index === 6|| index === 7|| index === 8 || index === 9 )) {
const values = data.map(item => Number(item[column.property]))
if (!values.every(value => isNaN(value)) && (index === 1 || index === 2 || index === 3 || index === 6 || index === 7 || index === 8 || index === 9)) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr;
return prev + curr
} else {
return prev;
return prev
}
}, 0);
}, 0)
} else {
sums[index] = '';
sums[index] = ''
}
});
})
return sums;
return sums
},
collection_item0Exist() {
let isOk = true;
let isOk = true
for (let i = 0; i < this.dataForm.collection_item0List.length; i++) {
const e = this.dataForm.collection_item0List[i];
const e = this.dataForm.collection_item0List[i]
}
return isOk;
return isOk
},
clearData(data) {
for (let key in data) {
if (data[key] instanceof Array) {
data[key] = [];
data[key] = []
} else if (data[key] instanceof Object) {
this.clearData(data[key]);
this.clearData(data[key])
} else {
data[key] = "";
data[key] = ''
}
}
// request({
@ -458,11 +484,11 @@
// });
},
init(id, isDetail) {
this.dataForm.id = id || 0;
this.visible = true;
this.isDetail = isDetail || false;
this.dataForm.id = id || 0
this.visible = true
this.isDetail = isDetail || false
this.$nextTick(() => {
this.$refs['elForm'].resetFields();
this.$refs['elForm'].resetFields()
if (this.dataForm.id) {
this.loading = true
request({
@ -471,11 +497,11 @@
}).then(res => {
this.dataInfo(res.data)
this.loading = false
});
})
} else {
this.clearData(this.dataForm)
}
});
})
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
//
@ -535,29 +561,29 @@
lastModifyTime: undefined,
deleteUserId: undefined,
deleteUserName: undefined,
creatorTime: undefined,
creatorTime: undefined
}
this.dataForm.collection_item0List.push(item)
},
delcollection_item0List(index) {
this.dataForm.collection_item0List.splice(index, 1);
this.dataForm.collection_item0List.splice(index, 1)
},
dataList() {
var _data = JSON.parse(JSON.stringify(this.dataForm));
var _data = JSON.parse(JSON.stringify(this.dataForm))
_data.voucher = JSON.stringify(_data.voucher)
for (let i = 0; i < _data.collection_item0List.length; i++) {
var _list = _data.collection_item0List[i];
var _list = _data.collection_item0List[i]
}
return _data;
return _data
},
dataInfo(dataAll) {
let _dataAll = dataAll
_dataAll.voucher = JSON.parse(_dataAll.voucher)
for (let i = 0; i < _dataAll.collection_item0List.length; i++) {
var _list = _dataAll.collection_item0List[i];
var _list = _dataAll.collection_item0List[i]
}
this.dataForm = _dataAll
},
},
}
}
}
</script>

@ -35,7 +35,6 @@
popupTitle="选择数据" popupWidth="800px"
hasPage :pageSize="20" @change="popupSelectourceNo">
>
</popupSelect>
</el-form-item>
</el-col>

@ -76,11 +76,23 @@
<!-- </div>-->
<el-table :data="dataForm.receiptout_item0List" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="vehicleId" label="车牌号">
<el-table-column prop="vehicleId" label="车牌号" >
<template slot-scope="scope">
<p>{{scope.row.vehicleId}}</p>
</template>
</el-table-column>
<el-table-column prop="vehicleId" width="140" label="车牌号" align="center">
<template slot-scope="scope">
<popupSelect v-model="scope.row.vehicleId" :bissId="dataForm.sourceNo" :excludeFields="excludeFields"
placeholder="请选择" clearable :field="'vehicleId'+scope.$index" interfaceId="392933248017164229" :columnOptions="receiptout_item0vehicleIdcolumnOptions" propsValue="vehicle_id" relationField="ticketno" popupType="dialog"
popupWidth="800px"
hasPage :pageSize="20" @change="popupSelectlicenseNo">
</popupSelect>
</template>
</el-table-column>
<el-table-column prop="materialName" label="物料名称">
<template slot-scope="scope">
<p>{{scope.row.materialName}}</p>

@ -21,12 +21,23 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="来源单号" prop="sourceNo">
<popupSelect v-model="dataForm.sourceNo" placeholder="请选择" clearable field="sourceNo"
interfaceId="392956668264114117" :columnOptions="sourceNocolumnOptions" propsValue="document_no"
relationField="document_no" popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage
:pageSize="20" @change="popupSelectChangeSourceNo">
<!-- <el-form-item label="来源单号" prop="sourceNo">-->
<!-- <popupSelect v-model="dataForm.sourceNo" placeholder="请选择" clearable field="sourceNo"-->
<!-- interfaceId="392956668264114117" :columnOptions="sourceNocolumnOptions" propsValue="document_no"-->
<!-- relationField="document_no" popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage-->
<!-- :pageSize="20" @change="popupSelectChangeSourceNo">-->
<!-- </popupSelect>-->
<!-- </el-form-item>-->
<el-form-item label="来源单号(销售订单id)"
prop="salesId">
<popupSelect v-model="dataForm.salesId"
placeholder="请选择" clearable field="salesId" interfaceId="392956668264114117"
:columnOptions="sourceNocolumnOptions" propsValue="id" relationField="document_no"
popupType="dialog"
popupTitle="选择数据" popupWidth="800px"
hasPage :pageSize="20" @change="popupSelectChangeSourceNo" >
</popupSelect>
</el-form-item>
</el-col>
@ -106,7 +117,7 @@
<!-- </el-table-column>-->
<el-table-column prop="vehicleId" width="140" label="车牌号" align="center">
<template slot-scope="scope">
<popupSelect v-model="scope.row.vehicleId" :bissId="dataForm.sourceNo" :excludeFields="excludeFields"
<popupSelect v-model="scope.row.vehicleId" :bissId="dataForm.salesId" :excludeFields="excludeFields"
placeholder="请选择" clearable :field="'vehicleId'+scope.$index" interfaceId="392933248017164229" :columnOptions="receiptout_item0vehicleIdcolumnOptions" propsValue="vehicle_id" relationField="ticketno" popupType="dialog"
popupWidth="800px"
hasPage :pageSize="20" @change="popupSelectlicenseNo">
@ -238,6 +249,7 @@
dataForm: {
documentNo: '',
type: "0",
salesId :'',
sourceNo: "XS002",
amount: '',
currency: "0",
@ -264,6 +276,11 @@
message: '请至少选择一个',
trigger: 'change'
}, ],
salesId: [{
required: true,
message: '请至少选择一个',
trigger: 'change'
}, ],
},
typeOptions: [{
"fullName": "销售出库",
@ -431,7 +448,7 @@
for (let i = 0; i < this.dataForm.receiptout_item0List.length; i++) {
excludeFields.push(this.dataForm.receiptout_item0List[i].vehicleId);
if (a == this.dataForm.receiptout_item0List[i].vehicleId) {
this.dataForm.receiptout_item0List[i].vehicleId = b.ticketno;
this.dataForm.receiptout_item0List[i].ticketno = b.ticketno;
this.dataForm.receiptout_item0List[i].materialName = b.material_name;
this.dataForm.receiptout_item0List[i].deliveryNum = b.settlement;
this.dataForm.receiptout_item0List[i].unit = b.unit;

Loading…
Cancel
Save