|
|
@@ -7,40 +7,250 @@
|
|
|
<el-form
|
|
|
:model="queryParams"
|
|
|
ref="queryForm"
|
|
|
- :inline="true"
|
|
|
v-show="showSearch"
|
|
|
- label-width="68px"
|
|
|
+ label-width="80px"
|
|
|
>
|
|
|
- <el-form-item label="客户" prop="fCorpid">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.fCorpid"
|
|
|
- filterable
|
|
|
- remote
|
|
|
- clearable
|
|
|
- style="width: 200px"
|
|
|
- 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
|
|
|
- style="width: 200px"
|
|
|
- size="small"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
+ <el-row>
|
|
|
+ <el-col :span="6">
|
|
|
+ <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-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="提单号" prop="fMblno">
|
|
|
+ <el-input
|
|
|
+ v-model="queryParams.fMblno"
|
|
|
+ placeholder="请输入提单号"
|
|
|
+ clearable
|
|
|
+ size="small"
|
|
|
+ style="width: 200px"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="审核区间" prop="timeExamine">
|
|
|
+ <!-- 如果需要固定某一年加 :picker-options="pickerOptions0"-->
|
|
|
+ <el-date-picker
|
|
|
+ type="monthrange"
|
|
|
+ range-separator="至"
|
|
|
+ start-placeholder="开始月份"
|
|
|
+ end-placeholder="结束月份"
|
|
|
+ v-model="queryParams.timeExamine"
|
|
|
+ value-format="yyyy-MM"
|
|
|
+ unlink-panels
|
|
|
+ :clearable="false"
|
|
|
+ style="width: 200px"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ ></el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <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-col>
|
|
|
+ </el-row>
|
|
|
+ <el-collapse-transition>
|
|
|
+ <div v-show="show">
|
|
|
+ <el-row>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="品牌" prop="fMarks">
|
|
|
+ <el-input
|
|
|
+ v-model="queryParams.fMarks"
|
|
|
+ placeholder="请输入品牌"
|
|
|
+ clearable
|
|
|
+ size="small"
|
|
|
+ style="width: 200px"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="结算状态" prop="fReconciliation">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.fReconciliation"
|
|
|
+ clearable
|
|
|
+ size="small"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ >
|
|
|
+ <el-option label="未收" value="0" />
|
|
|
+ <el-option label="全部" value="1" />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <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-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="作业类型" prop="fBusinessType">
|
|
|
+ <el-select
|
|
|
+ multiple
|
|
|
+ v-model="queryParams.fBusinessType"
|
|
|
+ filterable
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in businessTypeOption"
|
|
|
+ :key="index.dictValue"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="dict.dictValue"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="费用名称" prop="fFeeid">
|
|
|
+ <el-select
|
|
|
+ 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-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="审核状态">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.fBillProfits"
|
|
|
+ placeholder="请选择状态"
|
|
|
+ clearable
|
|
|
+ size="small"
|
|
|
+ filterable
|
|
|
+ >
|
|
|
+ <el-option label="全部" :value="1"></el-option>
|
|
|
+ <el-option label="待审" :value="4"></el-option>
|
|
|
+ <el-option label="审核通过" :value="6"></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="业务员" prop="fSalesmanId">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.fSalesmanId"
|
|
|
+ clearable
|
|
|
+ filterable
|
|
|
+ placeholder="请选择业务员"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(item, index) in fSalesmanOption"
|
|
|
+ :key="index.userId"
|
|
|
+ :label="item.userName"
|
|
|
+ :value="item.userId"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="客户分组">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.groupBy"
|
|
|
+ clearable
|
|
|
+ filterable
|
|
|
+ placeholder="请选择"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ label="是"
|
|
|
+ :value="1"
|
|
|
+ ></el-option>
|
|
|
+ <el-option
|
|
|
+ label="否"
|
|
|
+ :value="0"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="船名" prop="fVslid" v-if="sysType == 3">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.fVslid"
|
|
|
+ placeholder="请选择船名"
|
|
|
+ clearable
|
|
|
+ size="small"
|
|
|
+ filterable
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in vesselOptions"
|
|
|
+ :key="item.fId"
|
|
|
+ :label="item.fName"
|
|
|
+ :value="item.fId"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="航次" prop="fVoyid" v-if="sysType == 3">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.fVoyid"
|
|
|
+ placeholder="请选择航次"
|
|
|
+ clearable
|
|
|
+ size="small"
|
|
|
+ filterable
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in voyageOptions"
|
|
|
+ :key="item.fId"
|
|
|
+ :label="item.fNo"
|
|
|
+ :value="item.fId"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ </div>
|
|
|
+ </el-collapse-transition>
|
|
|
<!-- <el-form-item label="结算单位" prop="fToCorpid">-->
|
|
|
<!-- <el-select-->
|
|
|
<!-- v-model="queryParams.fToCorpid"-->
|
|
|
@@ -61,196 +271,48 @@
|
|
|
<!-- ></el-option>-->
|
|
|
<!-- </el-select>-->
|
|
|
<!-- </el-form-item>-->
|
|
|
- <el-form-item label="货物名称" prop="fProductName">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.fProductName"
|
|
|
- filterable
|
|
|
- remote
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- style="width: 200px"
|
|
|
- :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
|
|
|
- style="width: 200px"
|
|
|
- size="small"
|
|
|
- @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"
|
|
|
- >
|
|
|
- <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
|
|
|
- style="width: 200px"
|
|
|
- size="small"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- >
|
|
|
- <el-option label="录入" value="0" />
|
|
|
- <el-option label="审核通过" value="1" />
|
|
|
- </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="index.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"
|
|
|
- :picker-options="pickerOptions"
|
|
|
- unlink-panels
|
|
|
- >
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="审核状态">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.fBillProfits"
|
|
|
- placeholder="请选择状态"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- filterable
|
|
|
- >
|
|
|
- <el-option label="全部" :value="1"></el-option>
|
|
|
- <el-option label="待审" :value="4"></el-option>
|
|
|
- <el-option label="审核通过" :value="6"></el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="船名" prop="fVslid" v-if="sysType == 3">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.fVslid"
|
|
|
- placeholder="请选择船名"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- filterable
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in vesselOptions"
|
|
|
- :key="item.fId"
|
|
|
- :label="item.fName"
|
|
|
- :value="item.fId"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="航次" prop="fVoyid" v-if="sysType == 3">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.fVoyid"
|
|
|
- placeholder="请选择航次"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- filterable
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in voyageOptions"
|
|
|
- :key="item.fId"
|
|
|
- :label="item.fNo"
|
|
|
- :value="item.fId"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="业务员" prop="fSalesmanId">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.fSalesmanId"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- placeholder="请选择业务员"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in fSalesmanOption"
|
|
|
- :key="index.userId"
|
|
|
- :label="item.userName"
|
|
|
- :value="item.userId"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
+ </el-form>
|
|
|
|
|
|
- <el-form-item>
|
|
|
+ <el-row :gutter="10" class="mb8">
|
|
|
+ <el-col :span="1.5">
|
|
|
<el-button
|
|
|
- type="cyan"
|
|
|
- icon="el-icon-search"
|
|
|
+ type="warning"
|
|
|
+ icon="el-icon-download"
|
|
|
size="mini"
|
|
|
- @click="handleQuery"
|
|
|
+ @click="handleExport"
|
|
|
+ v-hasPermi="['warehouseBusiness:profit:export']"
|
|
|
+ >导出
|
|
|
+ </el-button>
|
|
|
+ </el-col>
|
|
|
+ <div class="tabSetting">
|
|
|
+ <div style="margin-right: 20px">
|
|
|
+ <el-button
|
|
|
+ type="cyan"
|
|
|
+ icon="el-icon-search"
|
|
|
+ size="mini"
|
|
|
+ @click="handleQuery"
|
|
|
>搜索</el-button
|
|
|
- >
|
|
|
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
|
|
|
+ >
|
|
|
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
|
|
|
>重置</el-button
|
|
|
- >
|
|
|
- </el-form-item>
|
|
|
- </el-form>
|
|
|
-
|
|
|
- <el-row :gutter="10" class="mb8">
|
|
|
- <div class="tabSetting">
|
|
|
- <el-col :span="1.5">
|
|
|
+ >
|
|
|
<el-button
|
|
|
- type="warning"
|
|
|
- icon="el-icon-download"
|
|
|
+ v-show="show"
|
|
|
+ @click="show = !show"
|
|
|
+ icon="el-icon-arrow-up"
|
|
|
size="mini"
|
|
|
- @click="handleExport"
|
|
|
- v-hasPermi="['warehouseBusiness:profit:export']"
|
|
|
- >导出
|
|
|
- </el-button>
|
|
|
- </el-col>
|
|
|
+ style="border: 1px dashed #afaeae"
|
|
|
+ >展开</el-button
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
+ v-show="!show"
|
|
|
+ @click="show = !show"
|
|
|
+ icon="el-icon-arrow-down"
|
|
|
+ size="mini"
|
|
|
+ style="border: 1px dashed #afaeae"
|
|
|
+ >展开</el-button
|
|
|
+ >
|
|
|
+ </div>
|
|
|
<right-toolbar
|
|
|
:showSearch.sync="showSearch"
|
|
|
@queryTable="getList"
|
|
|
@@ -477,6 +539,7 @@ export default {
|
|
|
components: { draggable, kaiheProfitGeneralLedger },
|
|
|
data() {
|
|
|
return {
|
|
|
+ show: false,
|
|
|
login: Cookies.get("sysType"),
|
|
|
pickerOptions: {
|
|
|
shortcuts: [
|
|
|
@@ -509,6 +572,24 @@ export default {
|
|
|
},
|
|
|
],
|
|
|
},
|
|
|
+ selectDate: null, // 时间选择后
|
|
|
+ pickerOptions0: {
|
|
|
+ disabledDate: time => {
|
|
|
+ if (this.selectDate == null) {
|
|
|
+ return false
|
|
|
+ } else {
|
|
|
+ return (this.selectDate.getFullYear() != time.getFullYear())
|
|
|
+ }
|
|
|
+ },
|
|
|
+ onPick: date => {
|
|
|
+ // 如果只选择一个则保存至selectDate 否则selectDate 为空
|
|
|
+ if (date.minDate && !date.maxDate) {
|
|
|
+ this.selectDate = date.minDate
|
|
|
+ } else {
|
|
|
+ this.selectDate = null
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
tableHeight: "0",
|
|
|
//费用名称
|
|
|
fWbuOptions: [],
|
|
|
@@ -586,6 +667,13 @@ export default {
|
|
|
width: 150,
|
|
|
},
|
|
|
{
|
|
|
+ surface: "3",
|
|
|
+ label: "reviewDate",
|
|
|
+ name: "年月",
|
|
|
+ checked: 0,
|
|
|
+ width: 150,
|
|
|
+ },
|
|
|
+ {
|
|
|
surface: "4",
|
|
|
label: "fProductName",
|
|
|
name: "货物名称",
|
|
|
@@ -679,20 +767,7 @@ export default {
|
|
|
},
|
|
|
},
|
|
|
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']
|
|
|
-
|
|
|
+ this.$set(this.queryParams, 'groupBy', 1)
|
|
|
this.sysType = Cookies.get("sysType");
|
|
|
this.setRowList = this.tableDate;
|
|
|
this.getRowList = this.tableDate;
|
lichao