|
@@ -82,7 +82,7 @@
|
|
</el-select>
|
|
</el-select>
|
|
</div>
|
|
</div>
|
|
<div class="form form-time-range">
|
|
<div class="form form-time-range">
|
|
- <span class="formSpan">拿回时间:</span>
|
|
|
|
|
|
+ <span class="formSpan">签订时间:</span>
|
|
<el-date-picker
|
|
<el-date-picker
|
|
v-model="lxsjObj"
|
|
v-model="lxsjObj"
|
|
type="daterange"
|
|
type="daterange"
|
|
@@ -92,6 +92,17 @@
|
|
end-placeholder="结束日期"
|
|
end-placeholder="结束日期"
|
|
/>
|
|
/>
|
|
</div>
|
|
</div>
|
|
|
|
+ <div class="form form-time-range">
|
|
|
|
+ <span class="formSpan">履约到期时间:</span>
|
|
|
|
+ <el-date-picker
|
|
|
|
+ v-model="dueTimeObj"
|
|
|
|
+ type="daterange"
|
|
|
|
+ unlink-panels
|
|
|
|
+ range-separator="To"
|
|
|
|
+ start-placeholder="开始日期"
|
|
|
|
+ end-placeholder="结束日期"
|
|
|
|
+ />
|
|
|
|
+ </div>
|
|
<div class="from">
|
|
<div class="from">
|
|
<div class="btnBox">
|
|
<div class="btnBox">
|
|
<el-button type="primary" style="background: #3485ff" @click="searchHandle">
|
|
<el-button type="primary" style="background: #3485ff" @click="searchHandle">
|
|
@@ -166,8 +177,8 @@
|
|
<el-table-column prop="contractBalance" label="合同余额" width="100" align="center">
|
|
<el-table-column prop="contractBalance" label="合同余额" width="100" align="center">
|
|
<template #default="scope">{{ scope.row.contractBalance ?? 0 }}</template>
|
|
<template #default="scope">{{ scope.row.contractBalance ?? 0 }}</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column prop="contractOn" label="拿出日期" width="120" />
|
|
|
|
- <el-table-column prop="contractOff" label="拿回日期" width="120" />
|
|
|
|
|
|
+ <el-table-column prop="signTime" label="签订时间" width="120" />
|
|
|
|
+ <el-table-column prop="dueTime" label="履约到期时间" width="120" />
|
|
<el-table-column label="操作" fixed="right" width="80">
|
|
<el-table-column label="操作" fixed="right" width="80">
|
|
<template #default="scope">
|
|
<template #default="scope">
|
|
<div class="operateBtn" @click="operateClick(scope.row)">
|
|
<div class="operateBtn" @click="operateClick(scope.row)">
|
|
@@ -222,6 +233,10 @@ const queryParams = reactive<{
|
|
secondType: any
|
|
secondType: any
|
|
contractOn: string
|
|
contractOn: string
|
|
contractOff: string
|
|
contractOff: string
|
|
|
|
+ signTimeStart: string
|
|
|
|
+ signTimeEnd: string
|
|
|
|
+ dueTimeStart: string
|
|
|
|
+ dueTimeEnd: string
|
|
deptId: string
|
|
deptId: string
|
|
}>({
|
|
}>({
|
|
contractNumber: '',
|
|
contractNumber: '',
|
|
@@ -234,9 +249,14 @@ const queryParams = reactive<{
|
|
secondType: '',
|
|
secondType: '',
|
|
contractOn: '',
|
|
contractOn: '',
|
|
contractOff: '',
|
|
contractOff: '',
|
|
|
|
+ signTimeStart: '',
|
|
|
|
+ signTimeEnd: '',
|
|
|
|
+ dueTimeStart: '',
|
|
|
|
+ dueTimeEnd: '',
|
|
deptId: deptId
|
|
deptId: deptId
|
|
})
|
|
})
|
|
const lxsjObj = ref()
|
|
const lxsjObj = ref()
|
|
|
|
+const dueTimeObj = ref()
|
|
const infoList: any = ref([
|
|
const infoList: any = ref([
|
|
{
|
|
{
|
|
icon: 'xmzx/xmzcz',
|
|
icon: 'xmzx/xmzcz',
|
|
@@ -284,11 +304,18 @@ const searchHandle: () => void = () => {
|
|
const queryContractListAjax = async (): Promise<void> => {
|
|
const queryContractListAjax = async (): Promise<void> => {
|
|
const urlApi = `/contract/page`
|
|
const urlApi = `/contract/page`
|
|
if (lxsjObj.value && lxsjObj.value.length > 0) {
|
|
if (lxsjObj.value && lxsjObj.value.length > 0) {
|
|
- queryParams.contractOn = moment(lxsjObj.value[0]).format('YYYY-MM-DD')
|
|
|
|
- queryParams.contractOff = moment(lxsjObj.value[1]).format('YYYY-MM-DD')
|
|
|
|
|
|
+ queryParams.signTimeStart = moment(lxsjObj.value[0]).format('YYYY-MM-DD')
|
|
|
|
+ queryParams.signTimeEnd = moment(lxsjObj.value[1]).format('YYYY-MM-DD')
|
|
|
|
+ } else {
|
|
|
|
+ queryParams.signTimeStart = ''
|
|
|
|
+ queryParams.signTimeEnd = ''
|
|
|
|
+ }
|
|
|
|
+ if (dueTimeObj.value && dueTimeObj.value.length > 0) {
|
|
|
|
+ queryParams.dueTimeStart = moment(dueTimeObj.value[0]).format('YYYY-MM-DD')
|
|
|
|
+ queryParams.dueTimeEnd = moment(dueTimeObj.value[1]).format('YYYY-MM-DD')
|
|
} else {
|
|
} else {
|
|
- queryParams.contractOn = ''
|
|
|
|
- queryParams.contractOff = ''
|
|
|
|
|
|
+ queryParams.dueTimeStart = ''
|
|
|
|
+ queryParams.dueTimeEnd = ''
|
|
}
|
|
}
|
|
const sendData = {
|
|
const sendData = {
|
|
...queryParams,
|
|
...queryParams,
|
|
@@ -313,11 +340,18 @@ const contractListCalc = ref({
|
|
const queryContractListCalc = async (): Promise<void> => {
|
|
const queryContractListCalc = async (): Promise<void> => {
|
|
const urlApi = `/contract/list/calc`
|
|
const urlApi = `/contract/list/calc`
|
|
if (lxsjObj.value && lxsjObj.value.length > 0) {
|
|
if (lxsjObj.value && lxsjObj.value.length > 0) {
|
|
- queryParams.contractOn = moment(lxsjObj.value[0]).format('YYYY-MM-DD')
|
|
|
|
- queryParams.contractOff = moment(lxsjObj.value[1]).format('YYYY-MM-DD')
|
|
|
|
|
|
+ queryParams.signTimeStart = moment(lxsjObj.value[0]).format('YYYY-MM-DD')
|
|
|
|
+ queryParams.signTimeEnd = moment(lxsjObj.value[1]).format('YYYY-MM-DD')
|
|
|
|
+ } else {
|
|
|
|
+ queryParams.signTimeStart = ''
|
|
|
|
+ queryParams.signTimeEnd = ''
|
|
|
|
+ }
|
|
|
|
+ if (dueTimeObj.value && dueTimeObj.value.length > 0) {
|
|
|
|
+ queryParams.dueTimeStart = moment(dueTimeObj.value[0]).format('YYYY-MM-DD')
|
|
|
|
+ queryParams.dueTimeEnd = moment(dueTimeObj.value[1]).format('YYYY-MM-DD')
|
|
} else {
|
|
} else {
|
|
- queryParams.contractOn = ''
|
|
|
|
- queryParams.contractOff = ''
|
|
|
|
|
|
+ queryParams.dueTimeStart = ''
|
|
|
|
+ queryParams.dueTimeEnd = ''
|
|
}
|
|
}
|
|
const sendData = {
|
|
const sendData = {
|
|
...queryParams,
|
|
...queryParams,
|