对账单汇总和所有查询时间修改

jg-waiwang-pro
XI_TENG\xixi_ 4 months ago
parent c058cb56eb
commit 0004cee5fb

@ -164,7 +164,8 @@
IFNULL(j.price_rate,0) contractPrice,
f.unit settlementUnit,
k.name productName,
IFNULL(ROUND(c.sale_amount / f.net_weight, 6),0) settlementPrice
IFNULL(ROUND(c.sale_amount / f.net_weight, 6),0) settlementPrice,
c.business_order_id businessOrderId
from jg_warehousing_storage_poundlist a
LEFT JOIN jg_warehousing_storage b on a.warehousing_storage_id = b.id
LEFT JOIN jg_voucher c on a.voucher_id = c.id
@ -208,7 +209,8 @@
IFNULL(j.price_rate,0) contractPrice,
f.unit settlementUnit,
k.name productName,
IFNULL(ROUND(c.sale_amount / f.net_weight, 6),0) settlementPrice
IFNULL(ROUND(c.sale_amount / f.net_weight, 6),0) settlementPrice,
c.business_order_id businessOrderId
from jg_warehousing_storage_poundlist a
LEFT JOIN jg_warehousing_storage b on a.warehousing_storage_id = b.id
LEFT JOIN jg_voucher c on a.voucher_id = c.id
@ -295,7 +297,8 @@
IFNULL(j.price_rate,0) contractPrice,
f.unit settlementUnit,
k.name productName,
IFNULL(ROUND(c.sale_amount / f.net_weight, 6),0) settlementPrice
IFNULL(ROUND(c.sale_amount / f.net_weight, 6),0) settlementPrice,
c.business_order_id businessOrderId
from jg_warehousing_outbound_poundlist a
LEFT JOIN jg_warehousing_outbound b on a.warehousing_outbound_id = b.id
LEFT JOIN jg_voucher c on a.voucher_id = c.id
@ -382,7 +385,8 @@
IFNULL(j.price_rate,0) contractPrice,
f.unit settlementUnit,
k.name productName,
IFNULL(ROUND(c.sale_amount / f.net_weight, 6),0) settlementPrice
IFNULL(ROUND(c.sale_amount / f.net_weight, 6),0) settlementPrice,
c.business_order_id businessOrderId
from jg_warehousing_outbound_poundlist a
LEFT JOIN jg_warehousing_outbound b on a.warehousing_outbound_id = b.id
LEFT JOIN jg_voucher c on a.voucher_id = c.id

@ -126,4 +126,6 @@ public class CwaccountvoucherEntity {
private String departmentId;
@TableField("ORGANIZE_JSON_ID")
private String organizeJsonId;
@TableField(exist = false)
private String businessOrderId;
}

@ -1801,7 +1801,8 @@ export default {
settlementTotalNoOptions: [],
remark: '',
remarkOptions: [],
enabledmark: undefined
enabledmark: undefined,
businessOrderId: undefined
},
cwaccountsummaryList: {
productId: '',
@ -2956,8 +2957,12 @@ export default {
},
sameReduce(arr) {
let result = arr.reduce((acc, cur) => {
// let found = acc.find((item) => {
// return item.productId === cur.productId
// })
debugger
let found = acc.find((item) => {
return item.productId === cur.productId
return item.businessOrderId === cur.businessOrderId && item.productId === cur.productId
})
if (found) {
found.settlementSum = this.jnpf.floatAdd(Number(found.settlementSum), Number(cur.settlementSum)).toFixed(4);
@ -2971,7 +2976,7 @@ export default {
found.otherExpenses = this.jnpf.floatSub(Number(found.otherExpenses), Number(cur.otherExpenses)).toFixed(2);
}
} else {
acc.push({ productId: cur.productId, productName: cur.productName, spec: cur.spec, rate: cur.rate, settlementSum: cur.settlementSum, settlementTotal: cur.settlementTotal, settlementUnit: cur.unit, settlementPrice: cur.settlementPrice, settlementSubtotal: cur.settlementSubtotal, settlementPriceNo: cur.settlementPriceNo, settlementSubtotalNo: cur.settlementSubtotalNo, otherType: cur.otherType, otherExpenses: cur.otherExpenses, settlementTotal: cur.settlementTotal, settlementTotalNo: cur.settlementTotalNo })
acc.push({ productId: cur.productId, productName: cur.productName, spec: cur.spec, rate: cur.rate, settlementSum: cur.settlementSum, settlementTotal: cur.settlementTotal, settlementUnit: cur.unit, settlementPrice: cur.settlementPrice, settlementSubtotal: cur.settlementSubtotal, settlementPriceNo: cur.settlementPriceNo, settlementSubtotalNo: cur.settlementSubtotalNo, otherType: cur.otherType, otherExpenses: cur.otherExpenses, settlementTotal: cur.settlementTotal, settlementTotalNo: cur.settlementTotalNo, businessOrderId: cur.businessOrderId })
}
return acc
}, [])
@ -2986,32 +2991,32 @@ export default {
})
return
}
debugger
var data = JSON.parse(JSON.stringify(this.dataForm.cwaccountstorageList))
var order = this.dataForm.cwaccountstorageList[0].orderCode
console.log(order);
var dataProduct = JSON.parse(JSON.stringify(this.dataForm.cwaccountvoucherList))
var productid = this.dataForm.cwaccountvoucherList[0].productId
// var data = JSON.parse(JSON.stringify(this.dataForm.cwaccountstorageList))
// var order = this.dataForm.cwaccountstorageList[0].orderCode
// console.log(order);
// var dataProduct = JSON.parse(JSON.stringify(this.dataForm.cwaccountvoucherList))
// var productid = this.dataForm.cwaccountvoucherList[0].productId
// data.forEach(item => {
// dataProduct.forEach(item1 => {
// // const flag = this.dataForm.cwaccountstorageList.find(e => e.orderCode == order)
// // if (item.orderCode == order && item1.productId == productid) {
// if (item.orderCode == order) {
// this.dataForm.cwaccountsummaryList = this.sameReduce(this.dataForm.cwaccountvoucherList);
// } else {
// this.dataForm.cwaccountsummaryList = this.dataForm.cwaccountvoucherList;
// return
// }
// })
// })
data.forEach(item => {
dataProduct.forEach(item1 => {
debugger
// const flag = this.dataForm.cwaccountstorageList.find(e => e.orderCode == order)
if (item.orderCode == order && item1.productId == productid) {
this.dataForm.cwaccountsummaryList = this.sameReduce(this.dataForm.cwaccountvoucherList);
} else {
this.dataForm.cwaccountsummaryList = this.dataForm.cwaccountvoucherList;
return
}
})
this.dataForm.cwaccountsummaryList.forEach(item => {
item.settlementPrice = this.jnpf.floatDiv(item.settlementSubtotal, item.settlementSum);
item.settlementPriceNo = this.jnpf.floatDiv(item.settlementSubtotalNo, item.settlementSum);
console.log(item.settlementPriceNo + "111");
})
// this.dataForm.cwaccountsummaryList = this.sameReduce(this.dataForm.cwaccountvoucherList);
// this.dataForm.cwaccountsummaryList.forEach(item => {
// item.settlementPrice = this.jnpf.floatDiv(item.settlementSubtotal, item.settlementSum);
// item.settlementPriceNo = this.jnpf.floatDiv(item.settlementSubtotalNo, item.settlementSum);
// console.log(item.settlementPriceNo + "111");
// })
// console.log(this.dataForm.cwaccountsummaryList + "111");
/* let item = {
productId: undefined,

@ -3,6 +3,13 @@
<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="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据编号">
<el-input v-model="query.code" placeholder="请输入" clearable> </el-input>
@ -28,13 +35,7 @@
</el-form-item>
</el-col>
</template>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>

@ -3,6 +3,13 @@
<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="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据编号">
<el-input v-model="query.code" placeholder="请输入" clearable> </el-input>
@ -10,17 +17,12 @@
</el-col>
<el-col :span="6">
<el-form-item label="类型">
<JnpfSelect v-model="query.type" placeholder="请选择" clearable :options="typeOptions" :props="typeProps">
<JnpfSelect v-model="query.type" placeholder="请选择" clearable :options="typeOptions"
:props="typeProps">
</JnpfSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="收款方">
<el-input v-model="query.payee" placeholder="请输入" clearable> </el-input>
@ -37,7 +39,8 @@
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
v-if="!showAll">
展开
</el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
@ -52,7 +55,8 @@
<div>
<!-- <el-button type="primary" icon="el-icon-download" @click="downPayment()">
</el-button> -->
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
</el-button>
</div>
<div class="JNPF-common-head-right">
@ -61,12 +65,13 @@
@click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod"
show-summary :summary-method="getTableSummaries" border>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" show-summary :summary-method="getTableSummaries" border>
<el-table-column label="类型" prop="type" align="center" width="150" fixed="left">
<template slot-scope="scope">
{{ scope.row.type}}
@ -122,33 +127,36 @@
</el-button> -->
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
<el-button size="mini" type="text" :disabled="scope.row.flowState !=2 && ((scope.row.businessType == 1 && scope.row.type == 1) || (scope.row.businessType == 4 && scope.row.type == 2))"
<el-button size="mini" type="text"
:disabled="scope.row.flowState !=2 && ((scope.row.businessType == 1 && scope.row.type == 1) || (scope.row.businessType == 4 && scope.row.type == 2))"
@click="downPayment(scope.row.id)">下载</el-button>
</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" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
:visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
lock-scroll width="400px">
<el-scrollbar class="template-list">
<div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{item.fullName}}
<div class="template-item" v-for="item in flowList" :key="item.id"
@click="selectFlow(item)">{{item.fullName}}
</div>
</el-scrollbar>
</el-dialog>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
@close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
</div>
</template>

@ -3,6 +3,13 @@
<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="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据编号">
<el-input v-model="query.code" placeholder="请输入" clearable> </el-input>
@ -21,13 +28,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
@ -86,13 +87,19 @@
</el-table-column>
<el-table-column prop="paymentState" label="付款状态" width="100" align="center">
<template slot-scope="scope">
<el-tag type="warning" v-if="scope.row.paymentState==1 && (scope.row.businessType==1 || scope.row.businessType==4)"></el-tag>
<el-tag type="success" v-if="scope.row.paymentState==2 && (scope.row.businessType==1 || scope.row.businessType==4)"></el-tag>
<el-tag type="danger" v-if="scope.row.paymentState==3 && (scope.row.businessType==1 || scope.row.businessType==4)"></el-tag>
<el-tag type="warning"
v-if="scope.row.paymentState==1 && (scope.row.businessType==1 || scope.row.businessType==4)">未付款</el-tag>
<el-tag type="success"
v-if="scope.row.paymentState==2 && (scope.row.businessType==1 || scope.row.businessType==4)">部分付款</el-tag>
<el-tag type="danger"
v-if="scope.row.paymentState==3 && (scope.row.businessType==1 || scope.row.businessType==4)">已付款</el-tag>
<el-tag type="warning" v-if="scope.row.paymentState==1 && (scope.row.businessType==2 || scope.row.businessType==3)"></el-tag>
<el-tag type="success" v-if="scope.row.paymentState==2 && (scope.row.businessType==2 || scope.row.businessType==3)"></el-tag>
<el-tag type="danger" v-if="scope.row.paymentState==3 && (scope.row.businessType==2 || scope.row.businessType==3)"></el-tag>
<el-tag type="warning"
v-if="scope.row.paymentState==1 && (scope.row.businessType==2 || scope.row.businessType==3)">未收款</el-tag>
<el-tag type="success"
v-if="scope.row.paymentState==2 && (scope.row.businessType==2 || scope.row.businessType==3)">部分收款</el-tag>
<el-tag type="danger"
v-if="scope.row.paymentState==3 && (scope.row.businessType==2 || scope.row.businessType==3)">已收款</el-tag>
</template>
</el-table-column>
<el-table-column prop="settlementSubjectName" label="结算主体名称" align="center" width="250">

@ -3,6 +3,13 @@
<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="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据编号">
<el-input v-model="query.code" placeholder="请输入" clearable> </el-input>
@ -18,13 +25,6 @@
<el-input v-model="query.payer" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
@ -36,7 +36,8 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
</el-button>
</div>
<div class="JNPF-common-head-right">
@ -45,11 +46,13 @@
@click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod" border>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" border>
<el-table-column label="类型" prop="type" align="center" width="150" fixed="left">
<template slot-scope="scope">
{{ scope.row.type}}
@ -87,40 +90,42 @@
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
@click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" :disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1"
v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
<el-button type="text" class="JNPF-table-delBtn"
:disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
</el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
<el-button size="mini" type="text"
@click="downPayment(scope.row.id)">下载</el-button>
<el-button size="mini" type="text" @click="downPayment(scope.row.id)"></el-button>
<el-button type="text" @click="closeCaseHandle(scope.row)" v-has="'btn_edit'">
</el-button>
</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" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
:visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
lock-scroll width="400px">
<el-scrollbar class="template-list">
<div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{item.fullName}}
<div class="template-item" v-for="item in flowList" :key="item.id"
@click="selectFlow(item)">{{item.fullName}}
</div>
</el-scrollbar>
</el-dialog>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
@close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
</div>
</template>

@ -3,6 +3,13 @@
<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="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据编号">
<el-input v-model="query.code" placeholder="请输入" clearable> </el-input>
@ -14,13 +21,7 @@
" clearable multiple />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="费用发生时间">
<JnpfDateRangePicker v-model="query.costTime" format="yyyy-MM-dd"

@ -3,6 +3,12 @@
<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="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="订单编号">
<el-input v-model="query.deliveryCode" placeholder="请输入" clearable> </el-input>
@ -15,12 +21,6 @@
</JnpfSelect>
</el-form-item>
</el-col> -->
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>

@ -3,6 +3,13 @@
<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="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="凭证编号">
<el-input v-model="query.voucherCode" placeholder="请输入" clearable> </el-input>
@ -15,13 +22,7 @@
</JnpfSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="磅单编号">

@ -3,6 +3,14 @@
<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="制单时间">
<JnpfDateRangePicker v-model="query.createOrderDate" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据类型">
<JnpfSelect v-model="query.orderType" placeholder="请选择" clearable
@ -36,12 +44,7 @@
</el-form-item>
</el-col>
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.createOrderDate" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="配送方式">
<JnpfSelect v-model="query.deliveryType" placeholder="请选择" clearable

@ -3,6 +3,12 @@
<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="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="订单编号">
<el-input v-model="query.receiptCode" placeholder="请输入" clearable> </el-input>
@ -15,12 +21,6 @@
</JnpfSelect>
</el-form-item>
</el-col> -->
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>

@ -3,6 +3,13 @@
<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="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="凭证编号">
<el-input v-model="query.voucherCode" placeholder="请输入" clearable> </el-input>
@ -30,13 +37,7 @@
</JnpfSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="磅单编号">

@ -3,6 +3,12 @@
<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="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="订单编号">
<el-input v-model="query.returnCargoCode" placeholder="请输入" clearable> </el-input>
@ -15,12 +21,6 @@
</JnpfSelect>
</el-form-item>
</el-col> -->
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>

@ -3,6 +3,12 @@
<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="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="订单编号">
<el-input v-model="query.deliveryCode" placeholder="请输入" clearable> </el-input>
@ -15,12 +21,7 @@
</JnpfSelect>
</el-form-item>
</el-col> -->
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>

@ -3,6 +3,13 @@
<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="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="凭证编号">
<el-input v-model="query.voucherCode" placeholder="请输入" clearable> </el-input>
@ -15,13 +22,6 @@
</JnpfSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="磅单编号">

@ -3,6 +3,12 @@
<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="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="订单编号">
<el-input v-model="query.receiptCode" placeholder="请输入" clearable> </el-input>
@ -15,12 +21,6 @@
</JnpfSelect>
</el-form-item>
</el-col> -->
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>

@ -3,6 +3,13 @@
<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="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="凭证编号">
<el-input v-model="query.voucherCode" placeholder="请输入" clearable> </el-input>
@ -15,13 +22,7 @@
</JnpfSelect>
</el-form-item>
</el-col> -->
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="磅单编号">

@ -3,11 +3,6 @@
<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.redeliveryOrderCode" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
@ -15,6 +10,12 @@
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="补送订单编号">
<el-input v-model="query.redeliveryOrderCode" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>

@ -3,6 +3,12 @@
<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="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="订单编号">
<el-input v-model="query.returnCargoCode" placeholder="请输入" clearable> </el-input>
@ -15,12 +21,7 @@
</JnpfSelect>
</el-form-item>
</el-col> -->
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>

@ -3,6 +3,12 @@
<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="制单时间">
<JnpfDateRangePicker v-model="query.createOrderDate" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据类型">
<JnpfSelect v-model="query.orderType" placeholder="请选择" clearable
@ -23,12 +29,7 @@
</el-form-item>
</el-col>
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.createOrderDate" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="是否紧急">
<JnpfSelect v-model="query.urgentOrder" placeholder="请选择" clearable

@ -3,17 +3,18 @@
<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.inspectionCode" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="质检单编号">
<el-input v-model="query.inspectionCode" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="质检类型">
<JnpfSelect v-model="query.inspectionType" placeholder="请选择" clearable

@ -3,6 +3,13 @@
<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="制单时间">
<JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据编号">
<el-input v-model="query.code" placeholder="请输入" clearable> </el-input>
@ -13,21 +20,12 @@
<el-input v-model="query.businessCode" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col> -->
<el-col :span="6">
<el-form-item label="商品名称">
<el-input v-model="query.productName" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据类型">
<JnpfSelect v-model="query.type" placeholder="请选择" clearable :options="typeOptions"

Loading…
Cancel
Save