日照客户添加新的字段销售订单

product
bawei 2 years ago
parent 2d2eb8fd04
commit 6cefae75b6

@ -1,123 +1,137 @@
<template>
<el-dialog title="详情"
<el-dialog title="详情"
:close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
width="1500px">
<el-row :gutter="15" class="">
<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" >
<el-row :gutter="15" class="">
<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right">
<template v-if="!loading">
<el-col :span="8" >
<el-col :span="8">
<el-form-item label="单据编号"
prop="documentNo" >
prop="documentNo">
<p>{{dataForm.documentNo}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8">
<el-form-item label="合同名称"
prop="contractId" >
prop="contractId">
<p>{{dataForm.contractId}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8">
<el-form-item label="客户名称"
prop="customerId" >
prop="customerId">
<p>{{dataForm.customerId}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8">
<el-form-item label="币别"
prop="currency" >
prop="currency">
<p>{{ dataForm.currency | dynamicText(currencyOptions) }} </p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8">
<el-form-item label="对方合同"
prop="contractNo" >
prop="contractNo">
<p>{{dataForm.contractNo}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8">
<el-form-item label="垫资金额"
prop="advanceAmount" >
prop="advanceAmount">
<p>{{dataForm.advanceAmount}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8">
<el-form-item label="重量"
prop="num" >
prop="num">
<p>{{dataForm.num}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8">
<el-form-item label="金额"
prop="price" >
prop="price">
<p>{{dataForm.price}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8">
<el-form-item label="不含税金额"
prop="notPrice" >
prop="notPrice">
<p>{{dataForm.notPrice}}</p>
</el-form-item>
</el-col>
<el-col :span="16" >
<el-col :span="16">
<el-form-item label="备注信息"
prop="remark" >
prop="remark">
<p>{{dataForm.remark}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8">
<el-form-item label="已回款金额"
prop="amountCollected" >
prop="amountCollected">
<p>{{dataForm.amountCollected}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8">
<el-form-item label="发票数量"
prop="invoiceNum" >
prop="invoiceNum">
<p>{{dataForm.invoiceNum}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8">
<el-form-item label="发票金额"
prop="invoiceAmount" >
prop="invoiceAmount">
<p>{{dataForm.invoiceAmount}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8">
<el-form-item label="单据状态 "
prop="status" >
prop="status">
<p>{{ dataForm.status | dynamicText(statusOptions) }} </p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8">
<el-form-item label="ERP订单号"
prop="erpNo" >
prop="erpNo">
<p>{{dataForm.erpNo}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8">
<el-form-item label="制单人"
prop="creatorUserName" >
prop="creatorUserName">
<p>{{dataForm.creatorUserName}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8">
<el-form-item label="制单时间"
prop="creatorTime" >
prop="creatorTime">
<p>{{dataForm.creatorTime}}</p>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所属标段"
prop="bidSection">
<p>{{dataForm.bidSection}}</p>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="考核金额"
prop="assessmentPirce">
<p>{{dataForm.assessmentPirce}}</p>
</el-form-item>
</el-col>
<el-col :span="24">
<el-tabs v-model="activemtmitd" tab-position="top" class="mb-20">
<el-tab-pane label="磅单信息">
<el-col :span="24" >
<el-col :span="24">
<el-form-item label-width="0">
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.salesorder_item0List" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table :data="dataForm.salesorder_item0List" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center"/>
<el-table-column prop="vehicleId" label="车号">
<template slot-scope="scope">
<p>{{scope.row.vehicleId}}</p>
@ -181,15 +195,15 @@
</el-table>
</el-form-item>
</el-col>
</el-tab-pane >
</el-tab-pane>
<el-tab-pane label="发货信息">
<el-col :span="24" >
<el-col :span="24">
<el-form-item label-width="0">
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.receiptoutsoitemList" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table :data="dataForm.receiptoutsoitemList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center"/>
<el-table-column prop="documentNo" label="出库单号">
<template slot-scope="scope">
<p>{{scope.row.documentNo}}</p>
@ -263,15 +277,15 @@
</el-table>
</el-form-item>
</el-col>
</el-tab-pane >
</el-tab-pane>
<el-tab-pane label="发票信息">
<el-col :span="24" >
<el-col :span="24">
<el-form-item label-width="0">
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.arinvoices_item0soitemList" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table :data="dataForm.arinvoices_item0soitemList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center"/>
<el-table-column prop="invoiceNo" label="发票编号">
<template slot-scope="scope">
<p>{{scope.row.invoiceNo}}</p>
@ -321,22 +335,22 @@
<template slot-scope="scope">
<JNPF-UploadFz v-model="scope.row.attachMent"
disabled
detailed :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" >
detailed :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传">
</JNPF-UploadFz>
</template>
</el-table-column>
</el-table>
</el-form-item>
</el-col>
</el-tab-pane >
</el-tab-pane>
<el-tab-pane label="收款信息">
<el-col :span="24" >
<el-col :span="24">
<el-form-item label-width="0">
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.collectionsoitemList" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table :data="dataForm.collectionsoitemList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center"/>
<el-table-column prop="documentNo" label="收款单号">
<template slot-scope="scope">
<p>{{scope.row.documentNo}}</p>
@ -370,15 +384,15 @@
</el-table>
</el-form-item>
</el-col>
</el-tab-pane >
</el-tab-pane>
<el-tab-pane label="退货信息">
<el-col :span="24" >
<el-col :span="24">
<el-form-item label-width="0">
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.salesbacksoitemList" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table :data="dataForm.salesbacksoitemList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center"/>
<el-table-column prop="documentNo" label="退货单号">
<template slot-scope="scope">
<p>{{scope.row.documentNo}}</p>
@ -407,15 +421,15 @@
</el-table>
</el-form-item>
</el-col>
</el-tab-pane >
</el-tab-pane>
<el-tab-pane label="退款信息">
<el-col :span="24" >
<el-col :span="24">
<el-form-item label-width="0">
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.paymentsoitemList" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table :data="dataForm.paymentsoitemList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center"/>
<el-table-column prop="documentno" label="付款单号">
<template slot-scope="scope">
<p>{{scope.row.documentno}}</p>
@ -444,11 +458,11 @@
</el-table>
</el-form-item>
</el-col>
</el-tab-pane >
</el-tab-pane>
</el-tabs>
</el-col>
</template>
</el-form>
</el-form>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false"> </el-button>
@ -459,6 +473,7 @@
import request from '@/utils/request'
import PrintBrowse from '@/components/PrintBrowse'
import jnpf from '@/utils/jnpf'
export default {
components: {PrintBrowse},
props: [],
@ -469,46 +484,70 @@
printBrowseVisible: false,
printId: '',
dataForm: {
id :'',
documentNo : '',
contractCode : "",
costomerCode : "",
currency : "0",
contractNo : '',
advanceAmount : '',
num : '',
price : '',
notPrice : '',
remark : '',
amountCollected : '',
invoiceNum : '',
invoiceAmount : '',
status : "0",
erpNo : '',
creatorUserName : "",
creatorTime : "",
salesorder_item0List:[],
receiptoutsoitemList:[],
arinvoices_item0soitemList:[],
collectionsoitemList:[],
salesbacksoitemList:[],
paymentsoitemList:[],
id: '',
documentNo: '',
contractCode: "",
costomerCode: "",
currency: "0",
contractNo: '',
advanceAmount: '',
num: '',
price: '',
notPrice: '',
remark: '',
amountCollected: '',
invoiceNum: '',
invoiceAmount: '',
status: "0",
erpNo: '',
creatorUserName: "",
creatorTime: "",
salesorder_item0List: [],
receiptoutsoitemList: [],
arinvoices_item0soitemList: [],
collectionsoitemList: [],
salesbacksoitemList: [],
paymentsoitemList: [],
},
activemtmitd:'0',
currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"开票中","id":"1"},{"fullName":"付款申请","id":"2"},{"fullName":"待回款","id":"3"},{"fullName":"回款中","id":"4"},{"fullName":"归档","id":"5"}],
activemtmitd: '0',
currencyOptions: [{"fullName": "人民币", "id": "0"}, {"fullName": "美元", "id": "1"}, {"fullName": "英镑", "id": "2"}],
statusOptions: [{"fullName": "已保存", "id": "0"}, {"fullName": "开票中", "id": "1"}, {
"fullName": "付款申请",
"id": "2"
}, {"fullName": "待回款", "id": "3"}, {"fullName": "回款中", "id": "4"}, {"fullName": "归档", "id": "5"}],
poundTypeOptions:[{"fullName":"贸易","id":"0"},{"fullName":"其他","id":"1"}],
unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
advanceOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}],
rateOptions:[{"fullName":"13","id":"0"},{"fullName":"9","id":"1"},{"fullName":"6","id":"2"},{"fullName":"5","id":"3"},{"fullName":"3","id":"4"},{"fullName":"0","id":"5"}],
jnpf_jg_collection_jnpf_collectionCountOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
deleteUserNameOptions:[{"fullName":"13","id":"0"},{"fullName":"9","id":"1"},{"fullName":"6","id":"2"},{"fullName":"5","id":"3"},{"fullName":"3","id":"4"},{"fullName":"0","id":"5"}],
customerNameOptions:[{"fullName":"贸易","id":"0"},{"fullName":"自加工","id":"1"},{"fullName":"委外","id":"2"},{"fullName":"倒运","id":"3"}],
taxRateOptions:[{"fullName":"13","id":"0"},{"fullName":"9","id":"1"},{"fullName":"6","id":"2"},{"fullName":"5","id":"3"},{"fullName":"3","id":"4"},{"fullName":"0","id":"5"}],
invoiceStatusOptions:[{"fullName":"正常","id":"0"},{"fullName":"红冲","id":"1"},{"fullName":"作废","id":"2"}],
settlementTypeOptions:[{"fullName":"货款","id":"0"},{"fullName":"运费","id":"1"},{"fullName":"仓储","id":"2"}],
settlementtypeOptions:[{"fullName":"现金","id":"0"},{"fullName":"赊购","id":"1"},{"fullName":"网银","id":"2"},{"fullName":"银企直连","id":"3"},{"fullName":"银票","id":"4"},{"fullName":"商票","id":"5"}],
poundTypeOptions: [{"fullName": "贸易", "id": "0"}, {"fullName": "其他", "id": "1"}],
unitOptions: [{"fullName": "吨", "id": "0"}, {"fullName": "千克", "id": "1"}],
advanceOptions: [{"fullName": "否", "id": "0"}, {"fullName": "是", "id": "1"}],
rateOptions: [{"fullName": "13", "id": "0"}, {"fullName": "9", "id": "1"}, {
"fullName": "6",
"id": "2"
}, {"fullName": "5", "id": "3"}, {"fullName": "3", "id": "4"}, {"fullName": "0", "id": "5"}],
jnpf_jg_collection_jnpf_collectionCountOptions: [{"fullName": "吨", "id": "0"}, {"fullName": "千克", "id": "1"}],
deleteUserNameOptions: [{"fullName": "13", "id": "0"}, {"fullName": "9", "id": "1"}, {
"fullName": "6",
"id": "2"
}, {"fullName": "5", "id": "3"}, {"fullName": "3", "id": "4"}, {"fullName": "0", "id": "5"}],
customerNameOptions: [{"fullName": "贸易", "id": "0"}, {"fullName": "自加工", "id": "1"}, {
"fullName": "委外",
"id": "2"
}, {"fullName": "倒运", "id": "3"}],
taxRateOptions: [{"fullName": "13", "id": "0"}, {"fullName": "9", "id": "1"}, {
"fullName": "6",
"id": "2"
}, {"fullName": "5", "id": "3"}, {"fullName": "3", "id": "4"}, {"fullName": "0", "id": "5"}],
invoiceStatusOptions: [{"fullName": "正常", "id": "0"}, {"fullName": "红冲", "id": "1"}, {
"fullName": "作废",
"id": "2"
}],
settlementTypeOptions: [{"fullName": "货款", "id": "0"}, {"fullName": "运费", "id": "1"}, {
"fullName": "仓储",
"id": "2"
}],
settlementtypeOptions: [{"fullName": "现金", "id": "0"}, {"fullName": "赊购", "id": "1"}, {
"fullName": "网银",
"id": "2"
}, {"fullName": "银企直连", "id": "3"}, {"fullName": "银票", "id": "4"}, {"fullName": "商票", "id": "5"}],
}
},
computed: {},
@ -516,31 +555,32 @@
created() {
},
mounted() {},
mounted() {
},
methods: {
dataInfo(dataAll){
let _dataAll =dataAll
for(let i=0;i<_dataAll.salesorder_item0List.length;i++){
dataInfo(dataAll) {
let _dataAll = dataAll
for (let i = 0; i < _dataAll.salesorder_item0List.length; i++) {
var _list = _dataAll.salesorder_item0List[i];
}
for(let i=0;i<_dataAll.receiptoutsoitemList.length;i++){
for (let i = 0; i < _dataAll.receiptoutsoitemList.length; i++) {
var _list = _dataAll.receiptoutsoitemList[i];
_list.issueDate = _list.issueDate ? jnpf.dateFormat(_list.issueDate) : ''
}
for(let i=0;i<_dataAll.arinvoices_item0soitemList.length;i++){
for (let i = 0; i < _dataAll.arinvoices_item0soitemList.length; i++) {
var _list = _dataAll.arinvoices_item0soitemList[i];
_list.invoiceDate = _list.invoiceDate ? jnpf.dateFormat(_list.invoiceDate) : ''
_list.attachMent = _list.attachMent? JSON.parse(_list.attachMent):[]
_list.attachMent = _list.attachMent ? JSON.parse(_list.attachMent) : []
}
for(let i=0;i<_dataAll.collectionsoitemList.length;i++){
for (let i = 0; i < _dataAll.collectionsoitemList.length; i++) {
var _list = _dataAll.collectionsoitemList[i];
_list.businessDate = _list.businessDate ? jnpf.dateFormat(_list.businessDate) : ''
}
for(let i=0;i<_dataAll.salesbacksoitemList.length;i++){
for (let i = 0; i < _dataAll.salesbacksoitemList.length; i++) {
var _list = _dataAll.salesbacksoitemList[i];
_list.creatorTime = _list.creatorTime ? jnpf.dateFormat(_list.creatorTime) : ''
}
for(let i=0;i<_dataAll.paymentsoitemList.length;i++){
for (let i = 0; i < _dataAll.paymentsoitemList.length; i++) {
var _list = _dataAll.paymentsoitemList[i];
_list.duedate = _list.duedate ? jnpf.dateFormat(_list.duedate) : ''
}
@ -551,10 +591,10 @@
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
if (this.dataForm.id) {
this.loading = true
request({
url: '/api/saleorder/Saleorderitem/detail/'+this.dataForm.id,
url: '/api/saleorder/Saleorderitem/detail/' + this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)

File diff suppressed because it is too large Load Diff

@ -1,12 +1,12 @@
<template>
<div class="JNPF-common-layout">
<!--测试-->
<!--测试-->
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="单据编号">
<el-input v-model="query.documentNo" placeholder="请输入" clearable> </el-input>
<el-input v-model="query.documentNo" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@ -33,7 +33,7 @@
<el-form-item label="制单日期">
<el-date-picker v-model="query.creatorTime" type="daterange"
value-format="timestamp" format="yyyy-MM-dd" start-placeholder="开始日期"
end-placeholder="结束日期" >
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
</el-col>
@ -48,21 +48,21 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<!-- <el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">-->
<!-- </el-button>-->
<el-button type="text" icon="el-icon-download" @click="exportData()" >
<!-- <el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">-->
<!-- </el-button>-->
<el-button type="text" icon="el-icon-download" @click="exportData()">
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">
</el-button>
<el-button type="text" icon="el-icon-delete" @click="delivery()" >
<el-button type="text" icon="el-icon-delete" @click="delivery()">
</el-button>
<el-button type="text" icon="el-icon-delete" @click="invoicesEntry()" >发票录
<el-button type="text" icon="el-icon-delete" @click="invoicesEntry()">
</el-button>
<el-button type="text" icon="el-icon-delete" @click="collection()" >
<el-button type="text" icon="el-icon-delete" @click="collection()">
</el-button>
<el-button type="text" icon="el-icon-check" @click="archive()" >
<el-button type="text" icon="el-icon-check" @click="archive()">
</el-button>
<el-button type="text" icon="el-icon-check" @click="materialBack()" >退
<el-button type="text" icon="el-icon-check" @click="materialBack()">退
</el-button>
</div>
<div class="JNPF-common-head-right">
@ -73,48 +73,56 @@
<screenfull isContainer/>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c @selection-change="handleSelectionChange" border>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" border>
<el-table-column prop="documentNo" label="单据编号" width="150" align="center"
/>
<!-- <el-table-column prop="erpNo" label="ERP订单号" width="0" align="center"-->
<!--/>-->
/>
<!-- <el-table-column prop="erpNo" label="ERP订单号" width="0" align="center"-->
<!--/>-->
<el-table-column prop="contractName" label="合同名称" width="200" align="center"
/>
/>
<el-table-column prop="customerName" label="客户名称" width="170" align="center"
/>
<el-table-column prop="price" label="金额" width="130" align="center"
/>
/>
<el-table-column prop="bidSection" label="所属标段" width="130" align="center"
/>
<el-table-column prop="num" label="重量" width="0" align="center"
/>
/>
<el-table-column prop="price" label="金额" width="130" align="center"
/>
<el-table-column label="币别" width="0" prop="currency" algin="center"
>
>
<template slot-scope="scope">
{{ scope.row.currency | dynamicText(currencyOptions) }}
</template>
</el-table-column>
<el-table-column prop="amountCollected" label="已回款金额" width="130" align="center"
/>
<el-table-column prop="assessmentPirce" label="考核金额" width="130" align="center"
/>
<el-table-column prop="invoiceNum" label="发票数量" width="0" align="center"
/>
/>
<el-table-column prop="invoiceAmount" label="发票金额" width="130" align="center"
/>
/>
<el-table-column prop="advanceAmount" label="垫资金额" width="130" align="center"
/>
/>
<el-table-column prop="amountCollected" label="已回款金额" width="130" align="center"
/>
<el-table-column prop="creatorTime" label="制单时间" width="140" align="center"
/>
/>
<el-table-column label="单据状态 " width="0" prop="status" algin="center"
>
>
<template slot-scope="scope">
{{ scope.row.status | dynamicText(statusOptions) }}
</template>
</el-table-column>
<el-table-column prop="creatorUserName" label="制单人" width="130" align="center"
/>
/>
<el-table-column label="操作" fixed="right" algin="center"
width="150" >
width="150">
<template slot-scope="scope">
<el-button type="text"
@click="addOrUpdateHandle(scope.row)" >编辑
@click="addOrUpdateHandle(scope.row)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
</el-button>
@ -124,7 +132,8 @@ width="150" >
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData"/>
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
@ -150,13 +159,13 @@ width="150" >
import Detail from './Detail'
export default {
components: {JNPFForm,JNPFForm2,JNPFForm3,JNPFForm4,JNPFForm5, ExportBox,Detail},
components: {JNPFForm, JNPFForm2, JNPFForm3, JNPFForm4, JNPFForm5, ExportBox, Detail},
data() {
return {
detailVisible: false,
query: {
documentNo:undefined,
status:undefined,
documentNo: undefined,
status: undefined,
},
treeProps: {
children: 'children',
@ -191,13 +200,18 @@ width="150" >
{prop: 'invoiceAmount', label: '发票金额'},
{prop: 'advanceAmount', label: '垫资金额'},
{prop: 'creatorTime', label: '制单时间'},
{prop: 'assessmentPirce', label: '考核金额'},
{prop: 'bidSection', label: '所属标段'},
{prop: 'status', label: '单据状态 '},
{prop: 'creatorUserName', label: '制单人'},
],
currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
currencyProps:{"label":"fullName","value":"id"},
statusOptions:[{"fullName":"待发货","id":"0"},{"fullName":"待开票","id":"1"},{"fullName":"待回款","id":"2"},{"fullName":"归档","id":"3"}],
statusProps:{"label":"fullName","value":"id"},
currencyOptions: [{"fullName": "人民币", "id": "0"}, {"fullName": "美元", "id": "1"}, {"fullName": "英镑", "id": "2"}],
currencyProps: {"label": "fullName", "value": "id"},
statusOptions: [{"fullName": "待发货", "id": "0"}, {"fullName": "待开票", "id": "1"}, {
"fullName": "待回款",
"id": "2"
}, {"fullName": "归档", "id": "3"}],
statusProps: {"label": "fullName", "value": "id"},
}
},
computed: {
@ -209,7 +223,7 @@ width="150" >
this.initData()
},
methods: {
delivery(){
delivery() {
if (!this.multipleSelection.length) {
this.$message({
type: 'error',
@ -230,12 +244,12 @@ width="150" >
list.push(_data)
debugger
}
if (list.length>0) {
if (list.length > 0) {
this.formVisible3 = true
this.$nextTick(() => {
this.$refs.JNPFForm3.init(list)
})
}else{
} else {
this.$message({
message: '未找到符合条件数据',
type: 'error',
@ -244,7 +258,7 @@ width="150" >
}
})
},
invoicesEntry(){
invoicesEntry() {
if (!this.multipleSelection.length) {
this.$message({
type: 'error',
@ -278,18 +292,18 @@ width="150" >
duration: 1000
})
}
}else if (res.data instanceof Object){
} else if (res.data instanceof Object) {
debugger
let list2 = {};
list2 = res.data
debugger
if (list2 != null){
if (list2 != null) {
this.formVisible2 = true
this.$nextTick(() => {
this.$refs.JNPFForm2.init2(list2)
debugger
})
}else{
} else {
this.$message({
message: '未找到符合条件数据',
type: 'error',
@ -299,7 +313,7 @@ width="150" >
}
})
},
collection(){
collection() {
if (!this.multipleSelection.length) {
this.$message({
type: 'error',
@ -335,7 +349,7 @@ width="150" >
}
})
},
archive(){
archive() {
if (!this.multipleSelection.length) {
this.$message({
type: 'error',
@ -358,7 +372,7 @@ width="150" >
});
})
},
materialBack(){
materialBack() {
if (!this.multipleSelection.length) {
this.$message({
type: 'error',
@ -394,7 +408,7 @@ width="150" >
}
})
},
goDetail(id){
goDetail(id) {
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(id)
@ -410,15 +424,15 @@ width="150" >
let _query = {
...this.listQuery,
...this.query,
menuId:this.menuId
menuId: this.menuId
};
request({
url: `/api/saleorder/Saleorderitem/getList`,
method: 'post',
data: _query
}).then(res => {
var _list =[];
for(let i=0;i<res.data.list.length;i++){
var _list = [];
for (let i = 0; i < res.data.list.length; i++) {
let _data = res.data.list[i];
_list.push(_data)
}
@ -481,9 +495,9 @@ width="150" >
},
addOrUpdateHandle(row, isDetail) {
var id = undefined;
if(row){
if (row) {
id = row.id;
if(row.status != '0'){
if (row.status != '0') {
this.$message({
type: 'error',
message: '发货后无法编辑',
@ -504,7 +518,7 @@ width="150" >
})
},
download(data) {
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
let query = {...data, ...this.listQuery, ...this.query, menuId: this.menuId}
request({
url: `/api/saleorder/Saleorderitem/Actions/Export`,
method: 'GET',

@ -1,121 +1,133 @@
<template>
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'"
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'"
:close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
width="1500px">
<el-row :gutter="15" class="">
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
<el-row :gutter="15" class="">
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right">
<template v-if="!loading">
<el-col :span="8" >
<el-col :span="8">
<el-form-item label="单据编号"
prop="documentNo" >
prop="documentNo">
<el-input v-model="dataForm.documentNo"
placeholder="系统自动生成" readonly >
placeholder="系统自动生成" readonly>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8">
<el-form-item label="业务类型"
prop="type" >
prop="type">
<el-select v-model="dataForm.type"
placeholder="请选择" clearable :style='{"width":"100%"}' disabled>
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8">
<el-form-item label="来源单号"
prop="sourceNo" >
prop="sourceNo">
<popupSelect v-model="dataForm.sourceNo"
placeholder="请选择" clearable field="salesId" interfaceId="392956668264114117" :columnOptions="salesIdcolumnOptions" propsValue="id" relationField="document_no" popupType="dialog"
placeholder="请选择" clearable field="salesId" interfaceId="392956668264114117"
:columnOptions="salesIdcolumnOptions" propsValue="id" relationField="document_no"
popupType="dialog"
popupTitle="选择数据" popupWidth="800px" disabled
hasPage :pageSize="20" >
hasPage :pageSize="20">
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8">
<el-form-item label="出库金额"
prop="amount" >
prop="amount">
<el-input v-model="dataForm.amount"
placeholder="请输入出库金额" readonly clearable :style='{"width":"100%"}' disabled>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8">
<el-form-item label="币别"
prop="currency" >
prop="currency">
<el-select v-model="dataForm.currency"
placeholder="请选择" clearable :style='{"width":"100%"}' disabled>
<el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
<el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8">
<el-form-item label="出库数量"
prop="num" >
prop="num">
<el-input v-model="dataForm.num"
placeholder="请输入出库数量" readonly clearable :style='{"width":"100%"}' disabled>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8">
<el-form-item label="客户"
prop="customerId" >
prop="customerId">
<popupSelect v-model="dataForm.customerId"
placeholder="请选择" clearable field="customerId" interfaceId="395936123471343749" :columnOptions="customerIdcolumnOptions" propsValue="id" relationField="supplier_nm" popupType="dialog"
placeholder="请选择" clearable field="customerId" interfaceId="395936123471343749"
:columnOptions="customerIdcolumnOptions" propsValue="id" relationField="supplier_nm"
popupType="dialog"
popupTitle="选择数据" popupWidth="800px" disabled
hasPage :pageSize="20" >
hasPage :pageSize="20">
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="16" >
<el-col :span="16">
<el-form-item label="备注"
prop="remark" >
prop="remark">
<el-input v-model="dataForm.remark"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="12" >-->
<!-- <el-form-item label="出库日期"-->
<!-- prop="issueDate" >-->
<!-- <el-date-picker v-model="dataForm.issueDate"-->
<!-- placeholder="请选择出库日期" clearable :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" >-->
<!-- <el-form-item label="单据状态"-->
<!-- prop="status" >-->
<!-- <el-select v-model="dataForm.status"-->
<!-- placeholder="请选择" clearable :style='{"width":"100%"}'>-->
<!-- <el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" >-->
<!-- <el-form-item label="出库日期"-->
<!-- prop="issueDate" >-->
<!-- <el-date-picker v-model="dataForm.issueDate"-->
<!-- placeholder="请选择出库日期" clearable :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" >-->
<!-- <el-form-item label="单据状态"-->
<!-- prop="status" >-->
<!-- <el-select v-model="dataForm.status"-->
<!-- placeholder="请选择" clearable :style='{"width":"100%"}'>-->
<!-- <el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="24">
<el-tabs v-model="activezlqlfb" tab-position="top" class="mb-20">
<el-tab-pane label="磅单明细">
<el-col :span="24" >
<el-col :span="24">
<el-form-item label-width="0">
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.receiptout_item0List" size='mini' show-summary :summary-method="getSummaries" >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table :data="dataForm.receiptout_item0List" size='mini' show-summary
:summary-method="getSummaries">
<el-table-column type="index" width="50" label="序号" align="center"/>
<el-table-column prop="vehicleId" label="车牌号" align="center" width="130">
<template slot-scope="scope">
<popupSelect v-model="scope.row.vehicleId"
placeholder="请选择" clearable :field="'vehicleId'+scope.$index" interfaceId="398732963950472005" :columnOptions="receiptout_item0vehicleIdcolumnOptions" propsValue="id" relationField="ticketno" popupType="dialog"
placeholder="请选择" clearable :field="'vehicleId'+scope.$index"
interfaceId="398732963950472005"
:columnOptions="receiptout_item0vehicleIdcolumnOptions" propsValue="id"
relationField="ticketno" popupType="dialog"
popupWidth="800px"
hasPage :pageSize="20" disabled>
</popupSelect>
@ -124,7 +136,10 @@
<el-table-column prop="materialId" label="物料名称" align="center" width="180">
<template slot-scope="scope">
<popupSelect v-model="scope.row.materialId"
placeholder="请选择" clearable :field="'materialId'+scope.$index" interfaceId="398719564478785669" :columnOptions="receiptout_item0materialIdcolumnOptions" propsValue="id" relationField="item_name" popupType="dialog"
placeholder="请选择" clearable :field="'materialId'+scope.$index"
interfaceId="398719564478785669"
:columnOptions="receiptout_item0materialIdcolumnOptions" propsValue="id"
relationField="item_name" popupType="dialog"
popupWidth="800px" disabled
>
</popupSelect>
@ -133,7 +148,10 @@
<el-table-column prop="reservoirareaId" label="库区名称" align="center" width="130">
<template slot-scope="scope">
<popupSelect v-model="scope.row.reservoirareaId"
placeholder="请选择" clearable :field="'reservoirareaId'+scope.$index" interfaceId="381404161809350213" :columnOptions="receiptout_item0reservoirareaIdcolumnOptions" propsValue="id" relationField="areaname" popupType="dialog"
placeholder="请选择" clearable :field="'reservoirareaId'+scope.$index"
interfaceId="381404161809350213"
:columnOptions="receiptout_item0reservoirareaIdcolumnOptions" propsValue="id"
relationField="areaname" popupType="dialog"
popupWidth="800px" @change="areaSelect"
>
</popupSelect>
@ -142,7 +160,10 @@
<el-table-column prop="warehouseId" label="仓库名称" align="center" width="130">
<template slot-scope="scope">
<popupSelect v-model="scope.row.warehouseId"
placeholder="请选择" clearable :field="'reservoirareaId'+scope.$index" interfaceId="399117969575232581" :columnOptions="receiptout_item0reservoirareaIdcolumnOptions" propsValue="id" relationField="name" popupType="dialog"
placeholder="请选择" clearable :field="'reservoirareaId'+scope.$index"
interfaceId="399117969575232581"
:columnOptions="receiptout_item0reservoirareaIdcolumnOptions" propsValue="id"
relationField="name" popupType="dialog"
popupWidth="800px" disabled>
</popupSelect>
</template>
@ -165,7 +186,8 @@
<template slot-scope="scope">
<el-select v-model="scope.row.unit"
placeholder="请选择" clearable :style='{"width":"100%"}' disabled>
<el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
<el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
</el-select>
</template>
</el-table-column>
@ -180,7 +202,8 @@
<template slot-scope="scope">
<el-select v-model="scope.row.rate"
placeholder="请选择" clearable :style='{"width":"100%"}' disabled>
<el-option v-for="(item, index) in rateOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
<el-option v-for="(item, index) in rateOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
</el-select>
</template>
</el-table-column>
@ -202,26 +225,27 @@
<template slot-scope="scope">
<el-select v-model="scope.row.poundType"
placeholder="请选择" clearable :style='{"width":"100%"}' disabled>
<el-option v-for="(item, index) in poundTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
<el-option v-for="(item, index) in poundTypeOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
</el-select>
</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="delreceiptout_item0List(scope.$index)" disabled>删除</el-button>-->
<!-- </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="delreceiptout_item0List(scope.$index)" disabled>删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<!-- <div class="table-actions" @click="addreceiptout_item0List()" disabled="">-->
<!-- <el-button type="text" icon="el-icon-plus" disabled >添加</el-button>-->
<!-- </div>-->
<!-- <div class="table-actions" @click="addreceiptout_item0List()" disabled="">-->
<!-- <el-button type="text" icon="el-icon-plus" disabled >添加</el-button>-->
<!-- </div>-->
</el-form-item>
</el-col>
</el-tab-pane >
</el-tab-pane>
</el-tabs>
</el-col>
</template>
</el-form>
</el-form>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false"> </el-button>
@ -231,8 +255,9 @@
</template>
<script>
import request from '@/utils/request'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
export default {
components: {},
props: [],
@ -242,23 +267,23 @@
loading: false,
isDetail: false,
dataForm: {
documentNo : '',
type : "0",
salesId : "",
amount : '',
currency : "0",
num : '',
customerId : '',
remark : '',
issueDate : '',
status : "0",
creatorTime : "",
creatorUserName : "",
lastModifyTime : "",
lastModifyUserName : "",
receiptout_item0List:[],
documentNo: '',
type: "0",
salesId: "",
amount: '',
currency: "0",
num: '',
customerId: '',
remark: '',
issueDate: '',
status: "0",
creatorTime: "",
creatorUserName: "",
lastModifyTime: "",
lastModifyUserName: "",
receiptout_item0List: [],
},
activezlqlfb:'0',
activezlqlfb: '0',
rules:
{
type: [
@ -276,27 +301,52 @@
},
],
},
typeOptions:[{"fullName":"销售出库","id":"0"},{"fullName":"购销出库","id":"1"}],
salesIdcolumnOptions:[ {"label":"单据编号","value":"document_no"}, {"label":"币别","value":"currency"}, {"label":"客户名称","value":"customer_name"},],
currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"}],
customerIdcolumnOptions:[ {"label":"客户编码","value":"supplier_cd"}, {"label":"客户名称","value":"supplier_nm"}, {"label":"联系人","value":"contact_name"}, {"label":"地址","value":"address"},],
receiptout_item0vehicleIdcolumnOptions:[ {"label":"车辆号","value":"ticketno"}],
receiptout_item0materialIdcolumnOptions:[ {"label":"物料编码","value":"item_code"}, {"label":"物料名称","value":"item_name"}, {"label":"单位","value":"primary_unit_of_measure"}, {"label":"默认入库区","value":"in_area"}, {"label":"默认出库区","value":"out_area"},],
receiptout_item0reservoirareaIdcolumnOptions:[ {"label":"库区名称","value":"areaname"}, {"label":"最高库存","value":"maximum"}, {"label":"安全库存","value":"safety"}, {"label":"最低库存","value":"minimum"}, {"label":"仓库名称","value":"name"},],
unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
rateOptions:[{"fullName":"13","id":"0"},{"fullName":"9","id":"1"},{"fullName":"6","id":"2"},{"fullName":"5","id":"3"},{"fullName":"3","id":"4"},{"fullName":"0","id":"5"}],
poundTypeOptions:[{"fullName":"贸易","id":"0"},{"fullName":"自加工","id":"1"},{"fullName":"委外","id":"2"},{"fullName":"倒运","id":"3"}],
typeOptions: [{"fullName": "销售出库", "id": "0"}, {"fullName": "购销出库", "id": "1"}],
salesIdcolumnOptions: [{"label": "单据编号", "value": "document_no"}, {
"label": "币别",
"value": "currency"
}, {"label": "客户名称", "value": "customer_name"},],
currencyOptions: [{"fullName": "人民币", "id": "0"}, {"fullName": "美元", "id": "1"}, {"fullName": "英镑", "id": "2"}],
statusOptions: [{"fullName": "已保存", "id": "0"}, {"fullName": "审批中", "id": "1"}, {"fullName": "已审批", "id": "2"}],
customerIdcolumnOptions: [{"label": "客户编码", "value": "supplier_cd"}, {
"label": "客户名称",
"value": "supplier_nm"
}, {"label": "联系人", "value": "contact_name"}, {"label": "地址", "value": "address"},],
receiptout_item0vehicleIdcolumnOptions: [{"label": "车辆号", "value": "ticketno"}],
receiptout_item0materialIdcolumnOptions: [{"label": "物料编码", "value": "item_code"}, {
"label": "物料名称",
"value": "item_name"
}, {"label": "单位", "value": "primary_unit_of_measure"}, {
"label": "默认入库区",
"value": "in_area"
}, {"label": "默认出库区", "value": "out_area"},],
receiptout_item0reservoirareaIdcolumnOptions: [{"label": "库区名称", "value": "areaname"}, {
"label": "最高库存",
"value": "maximum"
}, {"label": "安全库存", "value": "safety"}, {"label": "最低库存", "value": "minimum"}, {
"label": "仓库名称",
"value": "name"
},],
unitOptions: [{"fullName": "吨", "id": "0"}, {"fullName": "千克", "id": "1"}],
rateOptions: [{"fullName": "13", "id": "0"}, {"fullName": "9", "id": "1"}, {
"fullName": "6",
"id": "2"
}, {"fullName": "5", "id": "3"}, {"fullName": "3", "id": "4"}, {"fullName": "0", "id": "5"}],
poundTypeOptions: [{"fullName": "贸易", "id": "0"}, {"fullName": "自加工", "id": "1"}, {
"fullName": "委外",
"id": "2"
}, {"fullName": "倒运", "id": "3"}],
}
},
computed: {},
watch: {},
created() {
},
mounted() {},
mounted() {
},
methods: {
getSummaries(param) {
const { columns, data } = param;
const {columns, data} = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
@ -304,7 +354,7 @@
return;
}
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value)) && (index === 6 || index === 8 || index === 10 || index === 11 )) {
if (!values.every(value => isNaN(value)) && (index === 6 || index === 8 || index === 10 || index === 11)) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
@ -319,8 +369,8 @@
});
return sums;
},
areaSelect(a,b){
for (let i = 0;i<this.dataForm.receiptout_item0List.length;i++) {
areaSelect(a, b) {
for (let i = 0; i < this.dataForm.receiptout_item0List.length; i++) {
if (a == this.dataForm.receiptout_item0List[i].reservoirareaId) {
this.dataForm.receiptout_item0List[i].warehouseId = b.warehouse_id
}
@ -328,12 +378,12 @@
},
receiptout_item0Exist() {
let isOk = true;
for(let i=0;i<this.dataForm.receiptout_item0List.length;i++){
for (let i = 0; i < this.dataForm.receiptout_item0List.length; i++) {
const e = this.dataForm.receiptout_item0List[i];
}
return isOk;
},
clearData(data){
clearData(data) {
for (let key in data) {
if (data[key] instanceof Array) {
data[key] = [];
@ -353,7 +403,7 @@
this.dataForm.customerId = list[0].customerId;
debugger
this.dataForm.receiptout_item0List = list[0].list;
for (let i = 0;i<list[0].list.length;i++){
for (let i = 0; i < list[0].list.length; i++) {
this.dataForm.receiptout_item0List[i].amount = list[0].list[i].price;
this.dataForm.receiptout_item0List[i].price = list[0].list[i].unitPrice;
this.dataForm.receiptout_item0List[i].deliveryNum = list[0].list[i].settlement;
@ -362,7 +412,7 @@
debugger
this.rateOptions.find((item) => {
if (this.dataForm.receiptout_item0List[i].rate == item.id) {
this.dataForm.receiptout_item0List[i].rateAmount = this.dataForm.receiptout_item0List[i].amount*item.fullName/100
this.dataForm.receiptout_item0List[i].rateAmount = this.dataForm.receiptout_item0List[i].amount * item.fullName / 100
debugger
}
})
@ -379,7 +429,7 @@
})
},
request() {
var _data =this.dataList()
var _data = this.dataList()
if (!this.dataForm.id) {
request({
url: '/api/receipout/Receiptout/saleordercreate',
@ -396,9 +446,9 @@
}
})
})
}else{
} else {
request({
url: '/api/receipout/Receiptout/'+this.dataForm.id,
url: '/api/receipout/Receiptout/' + this.dataForm.id,
method: 'PUT',
data: _data
}).then((res) => {
@ -414,36 +464,36 @@
})
}
},
addreceiptout_item0List(){
addreceiptout_item0List() {
let item = {
vehicleId:undefined,
materialId:undefined,
reservoirareaId:undefined,
warehouseId:undefined,
deliveryNum:undefined,
unit:undefined,
price:undefined,
rate:undefined,
amount:undefined,
rateAmount:undefined,
batchNo:undefined,
poundType:undefined,
vehicleId: undefined,
materialId: undefined,
reservoirareaId: undefined,
warehouseId: undefined,
deliveryNum: undefined,
unit: undefined,
price: undefined,
rate: undefined,
amount: undefined,
rateAmount: undefined,
batchNo: undefined,
poundType: undefined,
}
this.dataForm.receiptout_item0List.push(item)
},
delreceiptout_item0List(index) {
this.dataForm.receiptout_item0List.splice(index, 1);
},
dataList(){
dataList() {
var _data = JSON.parse(JSON.stringify(this.dataForm));
for(let i=0;i<_data.receiptout_item0List.length;i++){
for (let i = 0; i < _data.receiptout_item0List.length; i++) {
var _list = _data.receiptout_item0List[i];
}
return _data;
},
dataInfo(dataAll){
let _dataAll =dataAll
for(let i=0;i<_dataAll.receiptout_item0List.length;i++){
dataInfo(dataAll) {
let _dataAll = dataAll
for (let i = 0; i < _dataAll.receiptout_item0List.length; i++) {
var _list = _dataAll.receiptout_item0List[i];
}
this.dataForm = _dataAll

@ -18,6 +18,8 @@
</JNPF-UploadImg>
</el-form-item>
</el-col>
<el-col :span="24">
</el-col>
<el-col :span="6">
<el-form-item label="物料名称" prop="materialId">
<popupSelect v-model="dataForm.materialId" placeholder="请选择物料编码" clearable field="materialId"

Loading…
Cancel
Save