yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改单号

Browse Source
product
tengxi 2 years ago
parent a787dd5fa2
commit 312f7d9e14
14 changed files with 264 additions and 175 deletions
Show Stats Download Patch File Download Diff File

3
SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/CollectionEntity.java
Unescape View File

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

6
SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionCrForm.java
Unescape View File

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

3
SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionInfoVO.java
Unescape View File

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

4
SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionListVO.java
Unescape View File

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

3
SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionUpForm.java
Unescape View File

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

3
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/ReceiptoutEntity.java
Unescape View File

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

5
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutCrForm.java
Unescape View File

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

5
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutInfoVO.java
Unescape View File

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

6
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListVO.java
Unescape View File

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

5
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutUpForm.java
Unescape View File

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

298
SC-web/src/views/scm/basicInformation/collection/Form.vue
Unescape View File

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

1
SC-web/src/views/scm/basicInformation/paymentdoc/Form.vue
Unescape View File

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

12
SC-web/src/views/scm/basicInformation/receiptout/Detail.vue
Unescape View File

@ -76,11 +76,23 @@
<!-- </div>--> <!-- </div>-->
<el-table :data="dataForm.receiptout_item0List" size='mini' > <el-table :data="dataForm.receiptout_item0List" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" /> <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"> <template slot-scope="scope">
<p>{{scope.row.vehicleId}}</p> <p>{{scope.row.vehicleId}}</p>
</template> </template>
</el-table-column> </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="物料名称"> <el-table-column prop="materialName" label="物料名称">
<template slot-scope="scope"> <template slot-scope="scope">
<p>{{scope.row.materialName}}</p> <p>{{scope.row.materialName}}</p>

31
SC-web/src/views/scm/basicInformation/receiptout/Form.vue
Unescape View File

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

Write Preview
Loading…
Cancel
Save