|
|
|
@ -8,13 +8,13 @@
|
|
|
|
<el-form-item label="磅单时间">
|
|
|
|
<el-form-item label="磅单时间">
|
|
|
|
<el-date-picker v-model="query.poundDate" type="daterange"
|
|
|
|
<el-date-picker v-model="query.poundDate" type="daterange"
|
|
|
|
value-format="timestamp" format="yyyy-MM-dd" start-placeholder="开始日期"
|
|
|
|
value-format="timestamp" format="yyyy-MM-dd" start-placeholder="开始日期"
|
|
|
|
end-placeholder="结束日期" >
|
|
|
|
end-placeholder="结束日期">
|
|
|
|
</el-date-picker>
|
|
|
|
</el-date-picker>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="6">
|
|
|
|
<el-col :span="6">
|
|
|
|
<el-form-item label="磅单号">
|
|
|
|
<el-form-item label="磅单号">
|
|
|
|
<el-input v-model="query.poundlistNo" placeholder="请输入" clearable> </el-input>
|
|
|
|
<el-input v-model="query.poundlistNo" placeholder="请输入" clearable></el-input>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="6">
|
|
|
|
<el-col :span="6">
|
|
|
|
@ -30,9 +30,11 @@
|
|
|
|
<div>
|
|
|
|
<div>
|
|
|
|
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
|
|
|
|
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
|
|
|
|
</el-button>
|
|
|
|
</el-button>
|
|
|
|
<el-button type="text" icon="el-icon-download" @click="exportData()" >导出
|
|
|
|
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
|
|
|
|
</el-button>
|
|
|
|
</el-button>
|
|
|
|
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
|
|
|
|
<el-button type="text" icon="el-icon-download" @click="">导入
|
|
|
|
|
|
|
|
</el-button>
|
|
|
|
|
|
|
|
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
|
|
|
|
</el-button>
|
|
|
|
</el-button>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<div class="JNPF-common-head-right">
|
|
|
|
<div class="JNPF-common-head-right">
|
|
|
|
@ -43,50 +45,54 @@
|
|
|
|
<screenfull isContainer/>
|
|
|
|
<screenfull isContainer/>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c @selection-change="handleSelectionChange">
|
|
|
|
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
|
|
|
|
<el-table-column prop="creatorTime" label="磅单日期" width="0" align="left"
|
|
|
|
@selection-change="handleSelectionChange" border>
|
|
|
|
/>
|
|
|
|
<el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
|
|
|
|
<el-table-column prop="vehicleId" label="车牌号" width="0" align="left"
|
|
|
|
<el-table-column prop="creatorTime" label="磅单日期" width="200" align="center" sortable fixed="left"
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
<el-table-column prop="materialId" label="物料名称" width="0" align="left"
|
|
|
|
<el-table-column prop="vehicleId" label="车牌号" width="150" align="center" sortable fixed="left"
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
<el-table-column prop="grossWeight" label="毛重" width="0" align="left"
|
|
|
|
<el-table-column prop="materialId" label="物料名称" width="200" align="center" sortable
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
<el-table-column prop="tareWeight" label="皮重" width="0" align="left"
|
|
|
|
<el-table-column prop="grossWeight" label="毛重" width="120" align="center" sortable
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
<el-table-column prop="buckleWeight" label="扣重" width="0" align="left"
|
|
|
|
<el-table-column prop="tareWeight" label="皮重" width="120" align="center" sortable
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
<el-table-column prop="netWeight" label="净重" width="0" align="left"
|
|
|
|
<el-table-column prop="buckleWeight" label="扣重" width="120" align="center" sortable
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
<el-table-column prop="customerId" label="客户名称" width="0" align="left"
|
|
|
|
<el-table-column prop="netWeight" label="净重" width="120" align="center" sortable
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
<el-table-column prop="salesId" label="销售合同" width="0" align="left"
|
|
|
|
<el-table-column prop="customerId" label="客户名称" width="200" align="center" sortable
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
<el-table-column label="是否垫资" width="0" prop="advance" algin="left"
|
|
|
|
<el-table-column prop="salesId" label="销售合同" width="150" align="center" sortable
|
|
|
|
>
|
|
|
|
/>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-table-column label="是否垫资" width="120" sortable prop="advance" align="center" >
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
{{ scope.row.advance | dynamicText(advanceOptions) }}
|
|
|
|
{{ scope.row.advance | dynamicText(advanceOptions) }}
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="运输类型" width="0" prop="transportType" algin="left"
|
|
|
|
|
|
|
|
>
|
|
|
|
<el-table-column label="运输类型" width="120" sortable prop="transportType" align="center" >
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
{{ scope.row.transportType | dynamicText(transportTypeOptions) }}
|
|
|
|
{{ scope.row.transportType | dynamicText(transportTypeOptions) }}
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column prop="transportPrice" label="运费" width="0" align="left"
|
|
|
|
|
|
|
|
/>
|
|
|
|
<el-table-column prop="transportPrice" label="运费" width="150" align="center" sortable
|
|
|
|
<el-table-column prop="salesPrice" label="销售价格" width="0" align="left"
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
<el-table-column prop="salesPrice" label="销售价格" width="150" align="center" sortable
|
|
|
|
<el-table-column prop="creatorUserName" label="业务员" width="0" align="left"
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
<el-table-column prop="creatorUserName" label="业务员" width="120" align="center" sortable
|
|
|
|
<el-table-column prop="remark" label="备注" width="0" align="left"
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
<el-table-column prop="remark" label="备注" width="200" align="center" sortable
|
|
|
|
|
|
|
|
/>
|
|
|
|
<el-table-column label="操作" fixed="right"
|
|
|
|
<el-table-column label="操作" fixed="right"
|
|
|
|
width="150" >
|
|
|
|
width="150">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<el-button type="text"
|
|
|
|
<el-button type="text"
|
|
|
|
@click="addOrUpdateHandle(scope.row.id)" >编辑
|
|
|
|
@click="addOrUpdateHandle(scope.row.id)">编辑
|
|
|
|
</el-button>
|
|
|
|
</el-button>
|
|
|
|
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
|
|
|
|
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
|
|
|
|
</el-button>
|
|
|
|
</el-button>
|
|
|
|
@ -96,7 +102,8 @@ width="150" >
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
</JNPF-table>
|
|
|
|
</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>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
|
|
|
|
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
|
|
|
|
@ -107,20 +114,20 @@ width="150" >
|
|
|
|
|
|
|
|
|
|
|
|
<script>
|
|
|
|
<script>
|
|
|
|
import request from '@/utils/request'
|
|
|
|
import request from '@/utils/request'
|
|
|
|
import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
|
|
|
|
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
|
|
|
|
import JNPFForm from './Form'
|
|
|
|
import JNPFForm from './Form'
|
|
|
|
import ExportBox from './ExportBox'
|
|
|
|
import ExportBox from './ExportBox'
|
|
|
|
import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
|
|
|
|
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
|
|
|
|
import Detail from './Detail'
|
|
|
|
import Detail from './Detail'
|
|
|
|
|
|
|
|
|
|
|
|
export default {
|
|
|
|
export default {
|
|
|
|
components: {JNPFForm, ExportBox,Detail},
|
|
|
|
components: { JNPFForm, ExportBox, Detail },
|
|
|
|
data() {
|
|
|
|
data() {
|
|
|
|
return {
|
|
|
|
return {
|
|
|
|
detailVisible: false,
|
|
|
|
detailVisible: false,
|
|
|
|
query: {
|
|
|
|
query: {
|
|
|
|
poundDate:undefined,
|
|
|
|
poundDate: undefined,
|
|
|
|
poundlistNo:undefined,
|
|
|
|
poundlistNo: undefined
|
|
|
|
},
|
|
|
|
},
|
|
|
|
treeProps: {
|
|
|
|
treeProps: {
|
|
|
|
children: 'children',
|
|
|
|
children: 'children',
|
|
|
|
@ -133,34 +140,37 @@ width="150" >
|
|
|
|
listQuery: {
|
|
|
|
listQuery: {
|
|
|
|
currentPage: 1,
|
|
|
|
currentPage: 1,
|
|
|
|
pageSize: 20,
|
|
|
|
pageSize: 20,
|
|
|
|
sort: "desc",
|
|
|
|
sort: 'desc',
|
|
|
|
sidx: "",
|
|
|
|
sidx: ''
|
|
|
|
},
|
|
|
|
},
|
|
|
|
formVisible: false,
|
|
|
|
formVisible: false,
|
|
|
|
exportBoxVisible: false,
|
|
|
|
exportBoxVisible: false,
|
|
|
|
columnList: [
|
|
|
|
columnList: [
|
|
|
|
{prop: 'creatorTime', label: '磅单日期'},
|
|
|
|
{ prop: 'creatorTime', label: '磅单日期' },
|
|
|
|
{prop: 'vehicleId', label: '车牌号'},
|
|
|
|
{ prop: 'vehicleId', label: '车牌号' },
|
|
|
|
{prop: 'materialId', label: '物料名称'},
|
|
|
|
{ prop: 'materialId', label: '物料名称' },
|
|
|
|
{prop: 'grossWeight', label: '毛重'},
|
|
|
|
{ prop: 'grossWeight', label: '毛重' },
|
|
|
|
{prop: 'tareWeight', label: '皮重'},
|
|
|
|
{ prop: 'tareWeight', label: '皮重' },
|
|
|
|
{prop: 'buckleWeight', label: '扣重'},
|
|
|
|
{ prop: 'buckleWeight', label: '扣重' },
|
|
|
|
{prop: 'netWeight', label: '净重'},
|
|
|
|
{ prop: 'netWeight', label: '净重' },
|
|
|
|
{prop: 'customerId', label: '客户名称'},
|
|
|
|
{ prop: 'customerId', label: '客户名称' },
|
|
|
|
{prop: 'salesId', label: '销售合同'},
|
|
|
|
{ prop: 'salesId', label: '销售合同' },
|
|
|
|
{prop: 'advance', label: '是否垫资'},
|
|
|
|
{ prop: 'advance', label: '是否垫资' },
|
|
|
|
{prop: 'transportType', label: '运输类型'},
|
|
|
|
{ prop: 'transportType', label: '运输类型' },
|
|
|
|
{prop: 'transportPrice', label: '运费'},
|
|
|
|
{ prop: 'transportPrice', label: '运费' },
|
|
|
|
{prop: 'salesPrice', label: '销售价格'},
|
|
|
|
{ prop: 'salesPrice', label: '销售价格' },
|
|
|
|
{prop: 'creatorUserName', label: '业务员'},
|
|
|
|
{ prop: 'creatorUserName', label: '业务员' },
|
|
|
|
{prop: 'remark', label: '备注'},
|
|
|
|
{ prop: 'remark', label: '备注' }
|
|
|
|
],
|
|
|
|
],
|
|
|
|
unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
|
|
|
|
unitOptions: [{ 'fullName': '吨', 'id': '0' }, { 'fullName': '千克', 'id': '1' }],
|
|
|
|
unitProps:{"label":"fullName","value":"id"},
|
|
|
|
unitProps: { 'label': 'fullName', 'value': 'id' },
|
|
|
|
transportTypeOptions:[{"fullName":"汽运","id":"0"},{"fullName":"船运","id":"1"},{"fullName":"火车","id":"2"}],
|
|
|
|
transportTypeOptions: [{ 'fullName': '汽运', 'id': '0' }, { 'fullName': '船运', 'id': '1' }, {
|
|
|
|
transportTypeProps:{"label":"fullName","value":"id"},
|
|
|
|
'fullName': '火车',
|
|
|
|
advanceOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}],
|
|
|
|
'id': '2'
|
|
|
|
advanceProps:{"label":"fullName","value":"id"},
|
|
|
|
}],
|
|
|
|
|
|
|
|
transportTypeProps: { 'label': 'fullName', 'value': 'id' },
|
|
|
|
|
|
|
|
advanceOptions: [{ 'fullName': '否', 'id': '0' }, { 'fullName': '是', 'id': '1' }],
|
|
|
|
|
|
|
|
advanceProps: { 'label': 'fullName', 'value': 'id' }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
computed: {
|
|
|
|
computed: {
|
|
|
|
@ -172,32 +182,33 @@ width="150" >
|
|
|
|
this.initData()
|
|
|
|
this.initData()
|
|
|
|
},
|
|
|
|
},
|
|
|
|
methods: {
|
|
|
|
methods: {
|
|
|
|
goDetail(id){
|
|
|
|
goDetail(id) {
|
|
|
|
this.detailVisible = true
|
|
|
|
this.detailVisible = true
|
|
|
|
this.$nextTick(() => {
|
|
|
|
this.$nextTick(() => {
|
|
|
|
this.$refs.Detail.init(id)
|
|
|
|
this.$refs.Detail.init(id)
|
|
|
|
})
|
|
|
|
})
|
|
|
|
},
|
|
|
|
},
|
|
|
|
sortChange({column, prop, order}) {
|
|
|
|
sortChange({ column, prop, order }) {
|
|
|
|
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
|
|
|
|
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
|
|
|
|
this.listQuery.sidx = !order ? '' : prop
|
|
|
|
this.listQuery.sidx = !order ? '' : prop
|
|
|
|
this.initData()
|
|
|
|
this.initData()
|
|
|
|
},
|
|
|
|
},
|
|
|
|
initData() {
|
|
|
|
initData() {
|
|
|
|
this.listLoading = true;
|
|
|
|
this.listLoading = true
|
|
|
|
let _query = {
|
|
|
|
let _query = {
|
|
|
|
...this.listQuery,
|
|
|
|
...this.listQuery,
|
|
|
|
...this.query,
|
|
|
|
...this.query,
|
|
|
|
menuId:this.menuId
|
|
|
|
menuId: this.menuId
|
|
|
|
};
|
|
|
|
}
|
|
|
|
request({
|
|
|
|
request({
|
|
|
|
url: `/api/tradeupload/Tradeupload/getList`,
|
|
|
|
url: `/api/tradeupload/Tradeupload/getList`,
|
|
|
|
method: 'post',
|
|
|
|
method: 'post',
|
|
|
|
data: _query
|
|
|
|
data: _query
|
|
|
|
}).then(res => {
|
|
|
|
}).then(res => {
|
|
|
|
var _list =[];
|
|
|
|
var _list = []
|
|
|
|
for(let i=0;i<res.data.list.length;i++){
|
|
|
|
for (let i = 0; i < res.data.list.length; i++) {
|
|
|
|
let _data = res.data.list[i];
|
|
|
|
res.data.list[i].creatorTime = res.data.list[i].creatorTime ? res.data.list[i].creatorTime.substring(0, 10) : '';
|
|
|
|
|
|
|
|
let _data = res.data.list[i]
|
|
|
|
_list.push(_data)
|
|
|
|
_list.push(_data)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
this.list = _list
|
|
|
|
this.list = _list
|
|
|
|
@ -220,10 +231,10 @@ width="150" >
|
|
|
|
onClose: () => {
|
|
|
|
onClose: () => {
|
|
|
|
this.initData()
|
|
|
|
this.initData()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
})
|
|
|
|
})
|
|
|
|
})
|
|
|
|
}).catch(() => {
|
|
|
|
}).catch(() => {
|
|
|
|
});
|
|
|
|
})
|
|
|
|
},
|
|
|
|
},
|
|
|
|
handleSelectionChange(val) {
|
|
|
|
handleSelectionChange(val) {
|
|
|
|
const res = val.map(item => item.id)
|
|
|
|
const res = val.map(item => item.id)
|
|
|
|
@ -234,7 +245,7 @@ width="150" >
|
|
|
|
this.$message({
|
|
|
|
this.$message({
|
|
|
|
type: 'error',
|
|
|
|
type: 'error',
|
|
|
|
message: '请选择一条数据',
|
|
|
|
message: '请选择一条数据',
|
|
|
|
duration: 1500,
|
|
|
|
duration: 1500
|
|
|
|
})
|
|
|
|
})
|
|
|
|
return
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -252,7 +263,7 @@ width="150" >
|
|
|
|
onClose: () => {
|
|
|
|
onClose: () => {
|
|
|
|
this.initData()
|
|
|
|
this.initData()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
})
|
|
|
|
})
|
|
|
|
})
|
|
|
|
}).catch(() => {
|
|
|
|
}).catch(() => {
|
|
|
|
})
|
|
|
|
})
|
|
|
|
@ -270,7 +281,7 @@ width="150" >
|
|
|
|
})
|
|
|
|
})
|
|
|
|
},
|
|
|
|
},
|
|
|
|
download(data) {
|
|
|
|
download(data) {
|
|
|
|
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
|
|
|
|
let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
|
|
|
|
request({
|
|
|
|
request({
|
|
|
|
url: `/api/tradeupload/Tradeupload/Actions/Export`,
|
|
|
|
url: `/api/tradeupload/Tradeupload/Actions/Export`,
|
|
|
|
method: 'GET',
|
|
|
|
method: 'GET',
|
|
|
|
@ -286,8 +297,8 @@ width="150" >
|
|
|
|
this.listQuery = {
|
|
|
|
this.listQuery = {
|
|
|
|
currentPage: 1,
|
|
|
|
currentPage: 1,
|
|
|
|
pageSize: 20,
|
|
|
|
pageSize: 20,
|
|
|
|
sort: "desc",
|
|
|
|
sort: 'desc',
|
|
|
|
sidx: "",
|
|
|
|
sidx: ''
|
|
|
|
}
|
|
|
|
}
|
|
|
|
this.initData()
|
|
|
|
this.initData()
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
tengxi
2 years ago