|
|
@@ -11,34 +11,6 @@
|
|
|
v-show="showSearch"
|
|
|
label-width="68px"
|
|
|
>
|
|
|
- <el-form-item label="货权方" prop="fCorpid">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.fCorpid"
|
|
|
- filterable
|
|
|
- remote
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- :remote-method="corpsRemoteMethod"
|
|
|
- placeholder="请选择货权方"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(dict, index) in fMblnoOptions"
|
|
|
- :key="index.fId"
|
|
|
- :label="dict.fName"
|
|
|
- :value="dict.fId"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="提单号" prop="fMblno">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.fMblno"
|
|
|
- placeholder="请输入提单号"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
<el-form-item label="结算单位" prop="fToCorpid">
|
|
|
<el-select
|
|
|
v-model="queryParams.fToCorpid"
|
|
|
@@ -58,55 +30,16 @@
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="货物名称" prop="fProductName">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.fProductName"
|
|
|
- filterable
|
|
|
- remote
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- :remote-method="goodsRemoteMethod"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- placeholder="请选择货物名称"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(dict, index) in goodsOptions"
|
|
|
- :key="index.fId"
|
|
|
- :label="dict.fName"
|
|
|
- :value="dict.fName"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="品牌" prop="fMarks">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.fMarks"
|
|
|
- placeholder="请输入品牌"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="结算状态" prop="fReconciliation">
|
|
|
+ <el-form-item label="费用状态" prop="isReviewed">
|
|
|
<el-select
|
|
|
- v-model="queryParams.fReconciliation"
|
|
|
+ v-model="queryParams.isReviewed"
|
|
|
clearable
|
|
|
size="small"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
+ @change="reviewedChange"
|
|
|
>
|
|
|
- <el-option label="未收" value="0" />
|
|
|
- <el-option label="全部" value="1" />
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
-
|
|
|
- <el-form-item label="费用状态" prop="fBillstatus">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.fBillstatus"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- >
|
|
|
- <el-option label="录入" value="0" />
|
|
|
- <el-option label="审核通过" value="1" />
|
|
|
+ <el-option label="录入" :value="0" />
|
|
|
+ <el-option label="审核通过" :value="1" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="审核日期" prop="timeExamine">
|
|
|
@@ -114,29 +47,16 @@
|
|
|
v-model="queryParams.timeExamine"
|
|
|
type="daterange"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
- clearable
|
|
|
range-separator="至"
|
|
|
start-placeholder="开始日期"
|
|
|
end-placeholder="结束日期"
|
|
|
+ :clearable="false"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
:picker-options="pickerOptions"
|
|
|
unlink-panels
|
|
|
>
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="审核状态">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.warehouseStatus"
|
|
|
- placeholder="请选择状态"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- filterable
|
|
|
- >
|
|
|
- <el-option label="全部" :value="1"></el-option>
|
|
|
- <el-option label="待审" :value="5"></el-option>
|
|
|
- <el-option label="审核通过" :value="6"></el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
|
|
|
<el-form-item>
|
|
|
<el-button
|
|
|
@@ -258,44 +178,18 @@
|
|
|
:show-overflow-tooltip="true"
|
|
|
sortable
|
|
|
:fixed="item.fixed"
|
|
|
- />
|
|
|
- <!-- <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="货物名称"
|
|
|
- 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>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="应收金额" align="center" prop="fAmount" />
|
|
|
- <el-table-column label="实收金额" align="center" prop="fStlamount" />
|
|
|
- <el-table-column label="未收金额" align="center" prop="nnfinished" /> -->
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span v-if="item.label == 'ffeesName'">
|
|
|
+ <el-link :underline="false" type="primary"
|
|
|
+ ><div @click="goDetail(scope.row)">
|
|
|
+ {{ scope.row.ffeesName }}
|
|
|
+ </div></el-link
|
|
|
+ >
|
|
|
+ </span>
|
|
|
+ <span v-else>{{ scope.row[item.label] }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
</el-table>
|
|
|
|
|
|
<pagination
|
|
|
@@ -484,62 +378,27 @@ export default {
|
|
|
tableDate: [
|
|
|
{
|
|
|
surface: "1",
|
|
|
- label: "fName",
|
|
|
- name: "货权方",
|
|
|
- checked: 0,
|
|
|
- width: 130,
|
|
|
- },
|
|
|
- {
|
|
|
- surface: "2",
|
|
|
- label: "fFeesName",
|
|
|
+ label: "ffeesName",
|
|
|
name: "结算单位",
|
|
|
checked: 0,
|
|
|
- width: 130,
|
|
|
- },
|
|
|
- {
|
|
|
- surface: "3",
|
|
|
- label: "fMblno",
|
|
|
- name: "提单号",
|
|
|
- checked: 0,
|
|
|
- width: 130,
|
|
|
- },
|
|
|
- {
|
|
|
- surface: "4",
|
|
|
- label: "fProductName",
|
|
|
- name: "货物名称",
|
|
|
- checked: 0,
|
|
|
- width: 130,
|
|
|
+ width: 180,
|
|
|
},
|
|
|
{
|
|
|
- surface: "5",
|
|
|
- label: "fMarks",
|
|
|
- name: "品牌",
|
|
|
- checked: 0,
|
|
|
- width: 130,
|
|
|
- },
|
|
|
- {
|
|
|
- surface: "6",
|
|
|
- label: "fReviewDate",
|
|
|
- name: "审核日期",
|
|
|
- checked: 0,
|
|
|
- width: 130,
|
|
|
- },
|
|
|
- {
|
|
|
- surface: "7",
|
|
|
- label: "fAmount",
|
|
|
+ surface: "2",
|
|
|
+ label: "famount",
|
|
|
name: "应收金额",
|
|
|
checked: 0,
|
|
|
width: 130,
|
|
|
},
|
|
|
{
|
|
|
- surface: "8",
|
|
|
- label: "fStlamount",
|
|
|
+ surface: "3",
|
|
|
+ label: "fstlamount",
|
|
|
name: "实收金额",
|
|
|
checked: 0,
|
|
|
width: 130,
|
|
|
},
|
|
|
{
|
|
|
- surface: "9",
|
|
|
+ surface: "4",
|
|
|
label: "nnfinished",
|
|
|
name: "未收金额",
|
|
|
checked: 0,
|
|
|
@@ -547,22 +406,27 @@ export default {
|
|
|
},
|
|
|
],
|
|
|
allCheck: false,
|
|
|
+ defaultTime: null,
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
- // let date = new Date();
|
|
|
- // let year = parseInt(date.getFullYear())
|
|
|
- // let month = parseInt(date.getMonth() + 1)
|
|
|
- // let currentMonth = date.getMonth()
|
|
|
- // let nextMonth = ++currentMonth
|
|
|
- // let nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1) // 下个月的第一天
|
|
|
- // let oneDay = 1000*60*60*24
|
|
|
- // let lastTime = new Date(nextMonthFirstDay - oneDay) // 下个月的第一天减去一天，就是上个月的最后一天
|
|
|
- // let day = lastTime.getDate()
|
|
|
- // if (day < 10) {
|
|
|
- // day = '0' + day
|
|
|
- // }
|
|
|
- // this.queryParams.timeExamine = [year + '-' + month + '-' + '01 00:00:00', year + '-' + month + '-' + day + ' 23:59:59']
|
|
|
+ let date = new Date();
|
|
|
+ let year = parseInt(date.getFullYear());
|
|
|
+ let month = parseInt(date.getMonth() + 1);
|
|
|
+ let currentMonth = date.getMonth();
|
|
|
+ let nextMonth = ++currentMonth;
|
|
|
+ let nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1); // 下个月的第一天
|
|
|
+ let oneDay = 1000 * 60 * 60 * 24;
|
|
|
+ let lastTime = new Date(nextMonthFirstDay - oneDay); // 下个月的第一天减去一天，就是上个月的最后一天
|
|
|
+ let day = lastTime.getDate();
|
|
|
+ if (day < 10) {
|
|
|
+ day = "0" + day;
|
|
|
+ }
|
|
|
+ this.defaultTime = [
|
|
|
+ year + "-" + month + "-" + "01 00:00:00",
|
|
|
+ year + "-" + month + "-" + day + " 23:59:59",
|
|
|
+ ];
|
|
|
+ this.queryParams.timeExamine = this.defaultTime;
|
|
|
|
|
|
this.setRowList = this.tableDate;
|
|
|
this.getRowList = this.tableDate;
|
|
|
@@ -661,15 +525,15 @@ export default {
|
|
|
columns.forEach((column, index) => {
|
|
|
if (index === 0) {
|
|
|
sums[index] = "总计";
|
|
|
- } else if (index === 7 || index === 8 || index === 9) {
|
|
|
+ } else if (index === 2 || index === 3 || index === 4) {
|
|
|
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;
|
|
|
+ return (Number(prev) + Number(curr)).toFixed(2);
|
|
|
} else {
|
|
|
- return prev;
|
|
|
+ return Number(prev).toFixed(2);
|
|
|
}
|
|
|
}, 0);
|
|
|
}
|
|
|
@@ -811,7 +675,7 @@ export default {
|
|
|
pageSize: 50,
|
|
|
fCorpid: null,
|
|
|
fMblno: null,
|
|
|
- timeExamine: null,
|
|
|
+ timeExamine: this.defaultTime,
|
|
|
fToCorpid: null,
|
|
|
fProductName: null,
|
|
|
fMarks: null,
|
|
|
@@ -860,6 +724,20 @@ export default {
|
|
|
this.download(response.msg);
|
|
|
});
|
|
|
},
|
|
|
+ reviewedChange() {
|
|
|
+ this.getList();
|
|
|
+ },
|
|
|
+ goDetail(row) {
|
|
|
+ this.$router.push({
|
|
|
+ path: "/analysis/DrDetail",
|
|
|
+ query: {
|
|
|
+ fCorpId: row.fCorpid,
|
|
|
+ // fMblNo: row.fmblno,
|
|
|
+ fAuditList: this.queryParams.timeExamine,
|
|
|
+ isReviewed: this.queryParams.isReviewed,
|
|
|
+ },
|
|
|
+ });
|
|
|
+ },
|
|
|
},
|
|
|
};
|
|
|
</script>
|
QuKatie