|
|
@@ -7,6 +7,7 @@
|
|
|
filterable
|
|
|
remote
|
|
|
clearable
|
|
|
+ style="width: 200px"
|
|
|
size="small"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
:remote-method="corpsRemoteMethod"
|
|
|
@@ -25,6 +26,7 @@
|
|
|
v-model="queryParams.fMblno"
|
|
|
placeholder="请输入提单号"
|
|
|
clearable
|
|
|
+ style="width: 200px"
|
|
|
size="small"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
@@ -37,6 +39,7 @@
|
|
|
remote
|
|
|
clearable
|
|
|
style="width: 200px"
|
|
|
+ size="small"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
:remote-method="corpsRemoteMethod"
|
|
|
>
|
|
|
@@ -55,6 +58,7 @@
|
|
|
remote
|
|
|
clearable
|
|
|
size="small"
|
|
|
+ style="width: 200px"
|
|
|
:remote-method="goodsRemoteMethod"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
placeholder="请选择货物名称"
|
|
|
@@ -72,13 +76,16 @@
|
|
|
v-model="queryParams.fMarks"
|
|
|
placeholder="请输入品牌"
|
|
|
clearable
|
|
|
+ style="width: 200px"
|
|
|
size="small"
|
|
|
- @keyup.enter.native="handleQuery"/>
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="结算状态" prop="fReconciliation">
|
|
|
<el-select
|
|
|
v-model="queryParams.fReconciliation"
|
|
|
clearable
|
|
|
+ style="width: 200px"
|
|
|
size="small"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
>
|
|
|
@@ -91,6 +98,7 @@
|
|
|
<el-select
|
|
|
v-model="queryParams.fBillstatus"
|
|
|
clearable
|
|
|
+ style="width: 200px"
|
|
|
size="small"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
>
|
|
|
@@ -99,16 +107,50 @@
|
|
|
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="作业类型" prop="fBusinessType">
|
|
|
+ <el-select
|
|
|
+ style="width: 200px"
|
|
|
+ multiple
|
|
|
+ v-model="queryParams.fBusinessType"
|
|
|
+ filterable
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in businessTypeOption"
|
|
|
+ :key="dict.dictValue"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="dict.dictValue"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="费用名称" prop="fFeeid">
|
|
|
+ <el-select
|
|
|
+ style="width: 200px"
|
|
|
+ multiple
|
|
|
+ :remote-method="fWRemoteMethod"
|
|
|
+ v-model="queryParams.fFeeid"
|
|
|
+ filterable
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in fWbuOptions"
|
|
|
+ :key="index.fId"
|
|
|
+ :label="dict.fName"
|
|
|
+ :value="dict.fId"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
<el-form-item label="审核日期" prop="timeExamine">
|
|
|
<el-date-picker
|
|
|
v-model="queryParams.timeExamine"
|
|
|
type="daterange"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
clearable
|
|
|
+ style="width: 280px"
|
|
|
range-separator="至"
|
|
|
start-placeholder="开始日期"
|
|
|
end-placeholder="结束日期"
|
|
|
- @keyup.enter.native="handleQuery">
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ >
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
|
|
|
@@ -126,25 +168,26 @@
|
|
|
size="mini"
|
|
|
@click="handleExport"
|
|
|
v-hasPermi="['warehouseBusiness:whgenleg:export']"
|
|
|
- >导出</el-button>
|
|
|
+ >导出
|
|
|
+ </el-button>
|
|
|
</el-col>
|
|
|
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
</el-row>
|
|
|
|
|
|
<el-table v-loading="loading" :data="receivableList" show-summary :summary-method="getSum">
|
|
|
<!-- <el-table-column type="selection" width="55" align="center" /> -->
|
|
|
<el-table-column type="index" label="行号" align="center" width="100"/>
|
|
|
<el-table-column label="货权方" sortable align="center" prop="fName" width="220"/>
|
|
|
- <el-table-column label="结算单位" sortable align="center" prop="fFeesName" width="220" />
|
|
|
- <el-table-column label="提单号" sortable align="center" prop="fMblno" width="216" show-overflow-tooltip />
|
|
|
+ <el-table-column label="结算单位" sortable align="center" prop="fFeesName" width="220"/>
|
|
|
+ <el-table-column label="提单号" sortable align="center" prop="fMblno" width="216" show-overflow-tooltip/>
|
|
|
<el-table-column label="货物名称" align="center" prop="fProductName" show-overflow-tooltip/>
|
|
|
<el-table-column label="品牌" align="center" prop="fMarks" width="120"/>
|
|
|
<el-table-column label="审核日期" align="center" prop="fReviewDate">
|
|
|
<template slot-scope="scope">
|
|
|
- <span>{{ parseTime(scope.row.fReviewDate, "{y}-{m}-{d}") }}</span>
|
|
|
+ <span>{{ parseTime(scope.row.fReviewDate, '{y}-{m}-{d}') }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="应收金额" align="center" prop="fAmount" />
|
|
|
+ <el-table-column label="应收金额" align="center" prop="fAmount"/>
|
|
|
<el-table-column label="应付金额" align="center" prop="fStlamount"/>
|
|
|
<el-table-column label="利润" align="center" prop="nnfinished"/>
|
|
|
</el-table>
|
|
|
@@ -161,18 +204,32 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { listpayable,listWhgenleg, getWhgenleg, delWhgenleg, addWhgenleg, updateWhgenleg, exportWhgenleg } from "@/api/reportManagement/profit";
|
|
|
-import {listWarehouse} from "@/api/basicdata/warehouse";
|
|
|
-import {listArea} from "@/api/basicdata/area";
|
|
|
-import {listGoods} from "@/api/basicdata/goods";
|
|
|
-import {listCorps} from "@/api/basicdata/corps";
|
|
|
+import {
|
|
|
+ listpayable,
|
|
|
+ listWhgenleg,
|
|
|
+ getWhgenleg,
|
|
|
+ delWhgenleg,
|
|
|
+ addWhgenleg,
|
|
|
+ updateWhgenleg,
|
|
|
+ exportWhgenleg
|
|
|
+} from '@/api/reportManagement/profit'
|
|
|
+import { listWarehouse } from '@/api/basicdata/warehouse'
|
|
|
+import { listArea } from '@/api/basicdata/area'
|
|
|
+import { listGoods } from '@/api/basicdata/goods'
|
|
|
+import { listCorps } from '@/api/basicdata/corps'
|
|
|
+import { listFees } from '@/api/basicdata/fees'
|
|
|
|
|
|
export default {
|
|
|
- name: "generalLedgerDr",
|
|
|
- components: {
|
|
|
- },
|
|
|
+ name: 'generalLedgerDr',
|
|
|
+ components: {},
|
|
|
data() {
|
|
|
return {
|
|
|
+ //费用名称
|
|
|
+ fWbuOptions:[],
|
|
|
+ businessInTypeOption:[],
|
|
|
+ businessOutTypeOption:[],
|
|
|
+ businessTransTypeOption:[],
|
|
|
+ businessTypeOption: [],
|
|
|
// 货权方(客户数据)
|
|
|
fMblnoOptions: [],
|
|
|
// 贸易方式(数据字典),对应t_trademodels 字典
|
|
|
@@ -191,7 +248,7 @@ export default {
|
|
|
// 库存总账表格数据
|
|
|
receivableList: [],
|
|
|
// 弹出层标题
|
|
|
- title: "",
|
|
|
+ title: '',
|
|
|
// 是否显示弹出层
|
|
|
open: false,
|
|
|
// 查询参数
|
|
|
@@ -206,119 +263,150 @@ export default {
|
|
|
fMarks: null,
|
|
|
fReconciliation: null,
|
|
|
fBillstatus: null,
|
|
|
+ fBusinessType:null,
|
|
|
+ fFeeid:null
|
|
|
},
|
|
|
// 表单参数
|
|
|
form: {},
|
|
|
// 表单校验
|
|
|
rules: {
|
|
|
fMarks: [
|
|
|
- { required: true, message: "唛头不能为空", trigger: "blur" }
|
|
|
- ],
|
|
|
+ { required: true, message: '唛头不能为空', trigger: 'blur' }
|
|
|
+ ]
|
|
|
}
|
|
|
- };
|
|
|
+ }
|
|
|
},
|
|
|
created() {
|
|
|
- this.getList();
|
|
|
- this.getDicts("data_trademodes").then((response) => {
|
|
|
- this.fTrademodeidOptions = response.data;
|
|
|
- });
|
|
|
+ /* 远程模糊查询费用名称 */
|
|
|
+ this.fWRemoteMethod()
|
|
|
+ let this_ = this
|
|
|
+ this_.getList()
|
|
|
+ this_.getDicts('data_trademodes').then((response) => {
|
|
|
+ this_.fTrademodeidOptions = response.data
|
|
|
+ })
|
|
|
+ this_.getDicts('st_in_type').then((response) => {
|
|
|
+ this_.businessInTypeOption = response.data
|
|
|
+ this_.getDicts('st_out_type').then((response) => {
|
|
|
+ this_.businessOutTypeOption = response.data
|
|
|
+ this_.getDicts('st_trans_type').then((response) => {
|
|
|
+ this_.businessTransTypeOption = response.data
|
|
|
+ this_.merge(this_.businessOutTypeOption,this_.businessInTypeOption,this_.businessTransTypeOption)
|
|
|
+ })
|
|
|
+ })
|
|
|
+ })
|
|
|
+
|
|
|
},
|
|
|
methods: {
|
|
|
- getSum(param){
|
|
|
- const { columns, data } = param
|
|
|
- const sums = []
|
|
|
- columns.forEach((column, index) => {
|
|
|
- if (index === 0) {
|
|
|
- sums[index] = '总计'
|
|
|
- } else if (index ===7 || index ===8 || index ===9 ) {
|
|
|
- const values = data.map(item => Number(item[column.property]))
|
|
|
- if (!values.every(value => isNaN(value))) {
|
|
|
- sums[index] = values.reduce((prev, curr) => {
|
|
|
- const value = Number(curr)
|
|
|
- if (!isNaN(value)) {
|
|
|
- return prev + curr
|
|
|
- } else {
|
|
|
- return prev
|
|
|
- }
|
|
|
- }, 0)
|
|
|
- }
|
|
|
+ getSum(param) {
|
|
|
+ const { columns, data } = param
|
|
|
+ const sums = []
|
|
|
+ columns.forEach((column, index) => {
|
|
|
+ if (index === 0) {
|
|
|
+ sums[index] = '总计'
|
|
|
+ } else if (index === 7 || index === 8 || index === 9) {
|
|
|
+ const values = data.map(item => Number(item[column.property]))
|
|
|
+ if (!values.every(value => isNaN(value))) {
|
|
|
+ sums[index] = values.reduce((prev, curr) => {
|
|
|
+ const value = Number(curr)
|
|
|
+ if (!isNaN(value)) {
|
|
|
+ return prev + curr
|
|
|
+ } else {
|
|
|
+ return prev
|
|
|
+ }
|
|
|
+ }, 0)
|
|
|
}
|
|
|
- })
|
|
|
- return sums
|
|
|
- },
|
|
|
+ }
|
|
|
+ })
|
|
|
+ return sums
|
|
|
+ },
|
|
|
|
|
|
// 贸易方式(数据字典),对���t_trademodels 字典翻译
|
|
|
fTrademodeidFormat(row, column) {
|
|
|
- return this.selectDictLabel(this.fTrademodeidOptions, row.fTrademodeid);
|
|
|
+ return this.selectDictLabel(this.fTrademodeidOptions, row.fTrademodeid)
|
|
|
},
|
|
|
/* 远程模糊查询仓库 */
|
|
|
warehouseRemoteMethod(name) {
|
|
|
- if (name == null || name === "") {
|
|
|
- return false;
|
|
|
+ if (name == null || name === '') {
|
|
|
+ return false
|
|
|
}
|
|
|
- let queryParams = { pageNum: 1, pageSize: 10, fName: name };
|
|
|
+ let queryParams = { pageNum: 1, pageSize: 10, fName: name }
|
|
|
listWarehouse(queryParams).then((response) => {
|
|
|
- this.warehouseOptions = response.rows;
|
|
|
+ this.warehouseOptions = response.rows
|
|
|
+ })
|
|
|
+ },
|
|
|
+ /* 远程模糊查询费用名称 */
|
|
|
+ fWRemoteMethod(name) {
|
|
|
+ // if (name == null || name === "") {
|
|
|
+ // return false;
|
|
|
+ // }
|
|
|
+ let queryParams = { pageNum: 1, fName: name };
|
|
|
+ console.log(queryParams)
|
|
|
+ listFees(queryParams).then((response) => {
|
|
|
+ this.fWbuOptions = response.rows
|
|
|
+ console.log(response)
|
|
|
});
|
|
|
},
|
|
|
/* 远程模糊查询库区 */
|
|
|
kqhouseRemoteMethod(name) {
|
|
|
- if (name == null || name === "") {
|
|
|
- return false;
|
|
|
+ if (name == null || name === '') {
|
|
|
+ return false
|
|
|
}
|
|
|
if (!this.queryParams.fWarehouseid) {
|
|
|
- this.$message.error("请输入仓库!");
|
|
|
- return false;
|
|
|
+ this.$message.error('请输入仓库!')
|
|
|
+ return false
|
|
|
}
|
|
|
|
|
|
let queryParams = {
|
|
|
pageNum: 1,
|
|
|
pageSize: 10,
|
|
|
fWarehouseid: this.queryParams.fWarehouseid,
|
|
|
- fName: name,
|
|
|
- };
|
|
|
+ fName: name
|
|
|
+ }
|
|
|
listArea(queryParams).then((response) => {
|
|
|
- this.kqhouseOptions = response.rows;
|
|
|
- });
|
|
|
+ this.kqhouseOptions = response.rows
|
|
|
+ })
|
|
|
},
|
|
|
/* 远程模糊查询商品 */
|
|
|
goodsRemoteMethod(name) {
|
|
|
- if (name == null || name === "") {
|
|
|
- return false;
|
|
|
+ if (name == null || name === '') {
|
|
|
+ return false
|
|
|
}
|
|
|
- let queryParams = { pageNum: 1, pageSize: 10, fName: name };
|
|
|
+ let queryParams = { pageNum: 1, pageSize: 10, fName: name }
|
|
|
listGoods(queryParams).then((response) => {
|
|
|
- this.goodsOptions = response.rows;
|
|
|
- });
|
|
|
+ this.goodsOptions = response.rows
|
|
|
+ })
|
|
|
},
|
|
|
/* 远程模糊查询用户 */
|
|
|
corpsRemoteMethod(name) {
|
|
|
- if (name == null || name === "") {
|
|
|
- return false;
|
|
|
+ if (name == null || name === '') {
|
|
|
+ return false
|
|
|
}
|
|
|
- let queryParams = { pageNum: 1, pageSize: 10, fName: name };
|
|
|
+ let queryParams = { pageNum: 1, pageSize: 10, fName: name }
|
|
|
listCorps(queryParams).then((response) => {
|
|
|
- this.fMblnoOptions = response.rows;
|
|
|
- this.KHblnoOptions = response.rows;
|
|
|
- });
|
|
|
+ this.fMblnoOptions = response.rows
|
|
|
+ this.KHblnoOptions = response.rows
|
|
|
+ })
|
|
|
+ },
|
|
|
+ merge(index,list,err){
|
|
|
+ this.businessTypeOption = this.businessTypeOption.concat(index,list,err)
|
|
|
},
|
|
|
/** 查询库存总账列表 */
|
|
|
getList() {
|
|
|
- this.loading = true;
|
|
|
+ this.loading = true
|
|
|
this.getDicts('approval_process').then((response) => {
|
|
|
this.options = response.data
|
|
|
})
|
|
|
listpayable(this.queryParams).then(response => {
|
|
|
- console.log(response)
|
|
|
- this.receivableList = response.rows;
|
|
|
- this.total = response.total;
|
|
|
- this.loading = false;
|
|
|
- });
|
|
|
+ this.receivableList = response.rows
|
|
|
+ this.total = response.total
|
|
|
+ this.loading = false
|
|
|
+ })
|
|
|
},
|
|
|
+
|
|
|
// 取消按钮
|
|
|
cancel() {
|
|
|
- this.open = false;
|
|
|
- this.reset();
|
|
|
+ this.open = false
|
|
|
+ this.reset()
|
|
|
},
|
|
|
// 表单重置
|
|
|
reset() {
|
|
|
@@ -347,7 +435,7 @@ export default {
|
|
|
fGrossweightblc: null,
|
|
|
fNetweightblc: null,
|
|
|
fCntrno: null,
|
|
|
- fStatus: "0",
|
|
|
+ fStatus: '0',
|
|
|
delFlag: null,
|
|
|
createBy: null,
|
|
|
fMarks: null,
|
|
|
@@ -355,58 +443,58 @@ export default {
|
|
|
updateBy: null,
|
|
|
updateTime: null,
|
|
|
remark: null
|
|
|
- };
|
|
|
- this.resetForm("form");
|
|
|
+ }
|
|
|
+ this.resetForm('form')
|
|
|
},
|
|
|
/** 搜索按钮操作 */
|
|
|
handleQuery() {
|
|
|
- this.queryParams.pageNum = 1;
|
|
|
- this.getList();
|
|
|
+ this.queryParams.pageNum = 1
|
|
|
+ this.getList()
|
|
|
},
|
|
|
/** 重置按钮操作 */
|
|
|
resetQuery() {
|
|
|
- this.resetForm("queryForm");
|
|
|
- this.handleQuery();
|
|
|
+ this.resetForm('queryForm')
|
|
|
+ this.handleQuery()
|
|
|
},
|
|
|
/** 新增按钮操作 */
|
|
|
handleAdd() {
|
|
|
- this.reset();
|
|
|
- this.open = true;
|
|
|
- this.title = "添加库存总账";
|
|
|
+ this.reset()
|
|
|
+ this.open = true
|
|
|
+ this.title = '添加库存总账'
|
|
|
},
|
|
|
/** 提交按钮 */
|
|
|
submitForm() {
|
|
|
- this.$refs["form"].validate(valid => {
|
|
|
+ this.$refs['form'].validate(valid => {
|
|
|
if (valid) {
|
|
|
if (this.form.fAccyear != null) {
|
|
|
updateWhgenleg(this.form).then(response => {
|
|
|
- this.msgSuccess("修改成功");
|
|
|
- this.open = false;
|
|
|
- this.getList();
|
|
|
- });
|
|
|
+ this.msgSuccess('修改成功')
|
|
|
+ this.open = false
|
|
|
+ this.getList()
|
|
|
+ })
|
|
|
} else {
|
|
|
addWhgenleg(this.form).then(response => {
|
|
|
- this.msgSuccess("新增成功");
|
|
|
- this.open = false;
|
|
|
- this.getList();
|
|
|
- });
|
|
|
+ this.msgSuccess('新增成功')
|
|
|
+ this.open = false
|
|
|
+ this.getList()
|
|
|
+ })
|
|
|
}
|
|
|
}
|
|
|
- });
|
|
|
+ })
|
|
|
},
|
|
|
/** 导出按钮操作 */
|
|
|
handleExport() {
|
|
|
- const queryParams = this.queryParams;
|
|
|
- this.$confirm('是否确认导出所有库存总账数据项?', "警告", {
|
|
|
- confirmButtonText: "确定",
|
|
|
- cancelButtonText: "取消",
|
|
|
- type: "warning"
|
|
|
- }).then(function() {
|
|
|
- return exportWhgenleg(queryParams);
|
|
|
- }).then(response => {
|
|
|
- this.download(response.msg);
|
|
|
- })
|
|
|
+ const queryParams = this.queryParams
|
|
|
+ this.$confirm('是否确认导出所有库存总账数据项?', '警告', {
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ type: 'warning'
|
|
|
+ }).then(function() {
|
|
|
+ return exportWhgenleg(queryParams)
|
|
|
+ }).then(response => {
|
|
|
+ this.download(response.msg)
|
|
|
+ })
|
|
|
}
|
|
|
}
|
|
|
-};
|
|
|
+}
|
|
|
</script>
|
wengyuwen