yangshiqiang
/
NX-zhihui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	jnpf-java-boot/jnpf-web/src/views/scm/enterprisemerchants/form.vue
#	jnpf-java-boot/jnpf-web/src/views/scm/vehicle/form.vue
master
zengchenxi 3 months ago
parent 9fbdb6680a b7eced58af
commit f10ddf1c0f
38 changed files with 1109 additions and 980 deletions
Show Stats Download Patch File Download Diff File

12
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/BillTableServiceImpl.java
Unescape View File

@ -595,12 +595,6 @@ public class BillTableServiceImpl extends ServiceImpl<BillTableMapper, BillTable
entity.setMerchantName(merchantName);
entity.setContractNumber(contract.getContractNumber());
//同一个合同只能创建一条
LambdaQueryWrapper<BillTableEntity> wrapper = new LambdaQueryWrapper<>(BillTableEntity.class)
.eq(BillTableEntity::getContractId, billTableForm.getContractId());
if (ObjectUtil.isNotNull(this.getOne(wrapper))) {
return "已存在相同合同数据!";
}
if (isSave) {
//获取当前年月日
String currentDate = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
@ -695,7 +689,7 @@ public class BillTableServiceImpl extends ServiceImpl<BillTableMapper, BillTable
entity.setBillStatus("20");
entity.setUpdateBy(userProvider.get().getUserId());
entity.setUpdateTime(DateUtil.getNowDate());
entity.setConfirmPersonnel(userProvider.get().getUserId());
entity.setConfirmPersonnel(userProvider.get().getUserName());
entity.setConfirmTime(DateUtil.getNowDate());
boolean result = this.updateById(entity);
if (result) {
@ -711,11 +705,13 @@ public class BillTableServiceImpl extends ServiceImpl<BillTableMapper, BillTable
if (ObjectUtil.isNull(entity)) {
return "账单不存在";
}
if (ObjectUtil.isNotNull(billTableForm.getBillAttachment())){
entity.setBillAttachment(billTableForm.getBillAttachment().toString());
}
entity.setPayStatus(billTableForm.getPayStatus().toString());
entity.setUpdateBy(userProvider.get().getUserId());
entity.setUpdateTime(DateUtil.getNowDate());
if (entity.getBillAmount().compareTo(entity.getPayAmount()) == 0) {
if (entity.getBillAmount().compareTo(billTableForm.getPayAmount()) == 0) {
entity.setBillStatus("50");
} else {
//每次相加的支付金额

1
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/EquipmentRentalRecordsServiceImpl.java
Unescape View File

@ -403,6 +403,7 @@ public class EquipmentRentalRecordsServiceImpl extends ServiceImpl<EquipmentRent
if (StringUtils.isNoneBlank(keyword)) {
entityQueryWrapper.lambda().like(EquipmentRentalRecordsEntity::getEquipmentName, keyword);
}
entityQueryWrapper.lambda().orderByDesc(EquipmentRentalRecordsEntity::getStartTime);
List<EquipmentRentalRecordsEntity> list = this.list(entityQueryWrapper);
if (CollectionUtils.isEmpty(list)) {
return Collections.emptyList();

22
jnpf-java-boot/jnpf-web/src/assets/scss/common.scss
Unescape View File

@ -1,5 +1,27 @@
@import "./font.scss";
.el-table__body-wrapper {
z-index: 2;
}
.el-table__fixed-footer-wrapper tbody td.custom-cell {
border-right: 1px solid #dbdfe5 !important;
}
.el-table {
.el-table__fixed {
height: auto !important;
bottom: 0px !important;
}
}
//去掉固定列下方的横线
.el-table__fixed::before,
.el-table__fixed-right::before {
display: none;
}
.JNPF-common-head {
display: flex;
justify-content: space-between;

10
jnpf-java-boot/jnpf-web/src/views/scm/area/form.vue
Unescape View File

@ -105,25 +105,25 @@
/>
</el-row>
<span slot="footer" class="dialog-footer">
<div class="upAndDown-button" v-if="dataForm.id">
<!-- <div class="upAndDown-button" v-if="dataForm.id">
<el-button @click="prev" :disabled="prevDis">
{{ "上一条" }}
</el-button>
<el-button @click="next" :disabled="nextDis">
{{ "下一条" }}
</el-button>
</div>
<el-button
</div> -->
<!-- <el-button
type="primary"
@click="dataFormSubmit(2)"
:loading="continueBtnLoading"
>
{{ !dataForm.id ? "确定并新增" : "确定并继续" }}</el-button
>
<el-button @click="visible = false"> 取 消</el-button>
> -->
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading">
确 定</el-button
>
<el-button @click="visible = false"> 取 消</el-button>
</span>
</el-dialog>
</template>

176
jnpf-java-boot/jnpf-web/src/views/scm/area/index.vue
Unescape View File

@ -6,37 +6,17 @@
<el-dropdown>
<el-link icon="icon-ym icon-ym-mpMenu" :underline="false" />
<el-dropdown-menu slot="dropdown">
<el-dropdown-item @click.native="toggleTreeExpand(true)"
>展开全部</el-dropdown-item
>
<el-dropdown-item @click.native="toggleTreeExpand(false)"
>折叠全部</el-dropdown-item
>
<el-dropdown-item @click.native="toggleTreeExpand(true)">展开全部</el-dropdown-item>
<el-dropdown-item @click.native="toggleTreeExpand(false)">折叠全部</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
<div class="JNPF-common-tree-search-box">
<el-input
placeholder="输入关键字"
v-model="keyword"
suffix-icon="el-icon-search"
clearable
/>
<el-input placeholder="输入关键字" v-model="keyword" suffix-icon="el-icon-search" clearable />
</div>
<el-tree
:data="treeData"
class="JNPF-common-el-tree"
highlight-current
ref="treeBox"
:expand-on-click-node="false"
@node-click="handleNodeClick"
node-key="id"
:props="treeProps"
:default-expand-all="expandsTree"
:filter-node-method="filterNode"
:lazy="false"
v-if="refreshTree"
>
<el-tree :data="treeData" class="JNPF-common-el-tree" highlight-current ref="treeBox"
:expand-on-click-node="false" @node-click="handleNodeClick" node-key="id" :props="treeProps"
:default-expand-all="expandsTree" :filter-node-method="filterNode" :lazy="false" v-if="refreshTree">
<span class="custom-tree-node" slot-scope="{ node, data }">
<i :class="data.icon"></i>
<span class="text">{{ node.label }}</span>
@ -60,12 +40,8 @@
</el-col>
<el-col :span="6">
<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="primary" icon="el-icon-search" @click="search()">查询</el-button>
<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
</el-form-item>
</el-col>
</el-form>
@ -73,151 +49,64 @@
<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"
@click="addOrUpdateHandle()"
>新增
<el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">新增
</el-button>
<el-button
type="text"
icon="icon-ym icon-ym-btn-download"
@click="exportData()"
>导出
<el-button type="success" icon="icon-ym icon-ym-btn-upload" @click="exportData()">导出
</el-button>
<el-button
type="text"
icon="icon-ym icon-ym-btn-upload"
@click="handelUpload()"
>导入
<el-button type="danger" icon="icon-ym icon-ym-btn-download" @click="handelUpload()">导入
</el-button>
<el-button
type="text"
icon="icon-ym icon-ym-btn-clearn"
@click="handleBatchRemoveDel()"
>批量删除
<el-button type="warning" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()">批量删除
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link
icon="icon-ym icon-ym-filter JNPF-common-head-icon"
:underline="false"
@click="openSuperQuery()"
/>
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@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-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-tooltip>
</div>
</div>
<JNPF-table
v-loading="listLoading"
:data="list"
@sort-change="sortChange"
has-c
@selection-change="handleSelectionChange"
:span-method="arraySpanMethod"
border
>
<el-table-column
prop="parkName"
label="园区名称"
align="center"
width="250"
>
<JNPF-table v-loading="listLoading" :data="list" @sort-change="sortChange" has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod" border>
<el-table-column prop="parkName" label="园区名称" align="center" width="250">
</el-table-column>
<el-table-column
prop="code"
label="区域编码"
align="center"
width="200"
>
<el-table-column prop="code" label="区域编码" align="center" width="200">
</el-table-column>
<el-table-column
prop="spaceNum"
label="空间数量"
align="center"
width="100"
>
<el-table-column prop="spaceNum" label="空间数量" align="center" width="100">
<template slot-scope="scope" v-if="scope.row.spaceNum">
<JnpfNumber v-model="scope.row.spaceNum" :thousands="false" />
</template>
</el-table-column>
<el-table-column
prop="name"
label="区域名称"
align="center"
width="250"
>
<el-table-column prop="name" label="区域名称" align="center" width="250">
</el-table-column>
<el-table-column
prop="description"
label="区域描述"
align="center"
width="500"
>
<el-table-column prop="description" label="区域描述" align="center" width="500">
</el-table-column>
<el-table-column prop="remark" label="备注" align="center">
</el-table-column>
<el-table-column
label="操作"
fixed="right"
width="150"
align="center"
>
<el-table-column label="操作" fixed="right" width="150" align="center">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)"
>编辑
<el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
</el-button>
<el-button
type="text"
class="JNPF-table-delBtn"
@click="handleDel(scope.row.id)"
>删除
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button type="text" @click="goDetail(scope.row.id)"
>详情
<el-button type="text" @click="goDetail(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" />
<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"
/>
<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" />
</div>
</template>
@ -239,6 +128,7 @@ import SuperQuery from "@/components/SuperQuery";
import superQueryJson from "./superQueryJson";
export default {
name: "regionalManage",
components: {
JNPFForm,
Detail,

5
jnpf-java-boot/jnpf-web/src/views/scm/billtable/devices.vue
Unescape View File

@ -79,7 +79,10 @@ export default {
methods: {
formatTimestamp(timestamp) {
const date = new Date(timestamp);
return date.toLocaleString();
const year = date.getFullYear();
const month = (date.getMonth() + 1).toString().padStart(2, '0');
const day = date.getDate().toString().padStart(2, '0');
return `${year}-${month}-${day}`;
},
init(excludeIdList, contractId) {
this.visible = true

412
jnpf-java-boot/jnpf-web/src/views/scm/billtable/entry.vue
Unescape View File

@ -13,15 +13,25 @@
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
label-position="right">
<template v-if="!loading">
<!-- 具体表单 -->
<el-col :span="24">
<el-col :span="8">
<jnpf-form-tip-item label="账单号" prop="billNumbe">
<JnpfInput v-model="dataForm.billNumbe" @change="changeData('billNumbe', -1)"
placeholder="自动生成" disabled clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<el-col :span="8">
<jnpf-form-tip-item label="合同名称" prop="contractId">
<JnpfPopupSelect v-model="dataForm.contractId" @change="changeData('contractId', -1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.contractId"
placeholder="请选择合同" propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='contract_name' field='contractId'
interfaceId="585391932604156741" :pageSize="20"
:columnOptions="contractIdcolumnOptions" disabled clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="账单状态" prop="billStatus">
<JnpfSelect v-model="dataForm.billStatus" @change="changeData('billStatus', -1)"
placeholder="请选择账单状态" clearable :style='{ "width": "100%" }'
@ -29,7 +39,69 @@
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<el-col :span="8">
<jnpf-form-tip-item label="商户名称" prop="merchantId">
<JnpfInput v-model="dataForm.merchantName" @change="changeData('merchantId', -1)"
placeholder="选择合同自动生成" disabled clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="开始时间" prop="startTime">
<JnpfDatePicker v-model="dataForm.startTime" @change="changeData('startTime', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
placeholder="请选择开始时间" disabled clearable :style='{ "width": "100%" }' type="date"
format="yyyy-MM-dd">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="结束时间" prop="endTime">
<JnpfDatePicker v-model="dataForm.endTime" @change="changeData('endTime', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
placeholder="请选择结束时间" disabled clearable :style='{ "width": "100%" }' type="date"
format="yyyy-MM-dd">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="账单金额" prop="billAmount">
<JnpfInputNumber v-model="dataForm.billAmount" @change="changeData('billAmount', -1)"
placeholder="账单金额" :step="1" :min="0" disabled>
</JnpfInputNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="通知方式" prop="notificationMethod">
<JnpfSelect v-model="dataForm.notificationMethod"
@change="changeData('notificationMethod', -1)" placeholder="请选择通知方式" disabled clearable
:style='{ "width": "100%" }' :options="notificationMethodOptions"
:props="notificationMethodProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="通知时间" prop="noticeTime">
<JnpfDatePicker v-model="dataForm.noticeTime" @change="changeData('noticeTime', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
placeholder="请选择通知时间" disabled clearable :style='{ "width": "100%" }' type="date"
format="yyyy-MM-dd">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="通知状态" prop="notificationState">
<JnpfSelect v-model="dataForm.notificationState"
@change="changeData('notificationState', -1)" placeholder="请选择通知状态" disabled clearable
:style='{ "width": "100%" }' :options="notificationStateOptions"
:props="notificationStateProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="支付方式" prop="payStatus">
<JnpfSelect v-model="dataForm.payStatus" @change="changeData('payStatus', -1)"
placeholder="请选择支付方式" clearable :style='{ "width": "100%" }'
@ -37,14 +109,32 @@
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<el-col :span="8">
<jnpf-form-tip-item label="支付金额" prop="payAmount">
<JnpfInputNumber v-model="dataForm.payAmount" @change="changeData('payAmount', -1)"
placeholder="支付金额" :step="1">
placeholder="支付金额" :step="1" :min="0">
</JnpfInputNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<el-col :span="8">
<jnpf-form-tip-item label="确认人" prop="confirmPersonnel">
<JnpfInput v-model="dataForm.confirmPersonnel"
@change="changeData('confirmPersonnel', -1)" placeholder="确认时自动带入" disabled disabled
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="确认时间" prop="confirmTime">
<JnpfDatePicker v-model="dataForm.confirmTime" @change="changeData('confirmTime', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
placeholder="此单据确认的时间" disabled clearable :style='{ "width": "100%" }' type="date"
format="yyyy-MM-dd">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="相关附件" prop="billAttachment">
<JnpfUploadFile v-model="dataForm.billAttachment"
@change="changeData('billAttachment', -1)" :fileSize="10" sizeUnit="MB" :limit="9"
@ -52,6 +142,301 @@
</JnpfUploadFile>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<el-tabs v-model="activegecbmb" tab-position="top" class="mb-20">
<el-tab-pane label="空间租金" name="1">
<el-col :span="24">
<jnpf-form-tip-item label-width="0">
<el-table :data="dataForm.billspacedetailList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column label="空间编码" prop="spaceNumber">
<template slot="header" v-if="false">
<span class="required-sign">*</span>空间编码
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.spaceNumber"
@change="changeData('billspacedetail-spaceNumber', scope.$index)"
placeholder="添加自动带入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="空间名称" prop="spaceId">
<template slot="header" v-if="false">
<span class="required-sign">*</span>空间名称
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.spaceId"
@change="changeData('billspacedetail-spaceId', scope.$index)"
placeholder="添加自动带入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="开始时间" prop="startTime">
<template slot="header" v-if="false">
<span class="required-sign">*</span>开始时间
</template>
<template slot-scope="scope">
<JnpfDatePicker v-model="scope.row.startTime"
@change="changeData('billspacedetail-startTime', scope.$index)"
:startTime="dateTime(false, 1, 1, '', '')"
:endTime="dateTime(false, 1, 1, '', '')"
placeholder="添加自动带入" disabled clearable
:style='{ "width": "100%" }' type="date"
format="yyyy-MM-dd">
</JnpfDatePicker>
</template>
</el-table-column>
<el-table-column label="结束时间" prop="endTime">
<template slot="header" v-if="false">
<span class="required-sign">*</span>结束时间
</template>
<template slot-scope="scope">
<JnpfDatePicker v-model="scope.row.endTime"
@change="changeData('billspacedetail-endTime', scope.$index)"
:startTime="dateTime(false, 1, 1, '', '')"
:endTime="dateTime(false, 1, 1, '', '')"
placeholder="请选择结束时间" disabled clearable :style='{ "width": "100%" }'
type="date" format="yyyy-MM-dd">
</JnpfDatePicker>
</template>
</el-table-column>
<el-table-column label="账单金额" prop="billAmount">
<template slot="header" v-if="false">
<span class="required-sign">*</span>账单金额
</template>
<template slot-scope="scope">
<JnpfInputNumber v-model="scope.row.billAmount"
@change="changeData('billspacedetail-billAmount', scope.$index)"
placeholder="账单金额" :step="1" :min="0" disabled>
</JnpfInputNumber>
</template>
</el-table-column>
<el-table-column label="费用说明" prop="costDescription">
<template slot="header" v-if="false">
<span class="required-sign">*</span>费用说明
</template>
<template slot-scope="scope">
<JnpfTextarea v-model="scope.row.costDescription"
@change="changeData('billspacedetail-costDescription', scope.$index)"
placeholder="请输入费用说明" :style='{ "width": "100%" }' true
type="textarea" :autosize='{ "minRows": 4, "maxRows": 4 }' disabled>
</JnpfTextarea>
</template>
</el-table-column>
<!-- <el-table-column label="操作" width="50">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delbillspacedetailList(scope.$index)">删除</el-button>
</template>
</el-table-column> -->
</el-table>
<!-- <div class="table-actions" @click="choiceSpaces()">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div> -->
</jnpf-form-tip-item>
</el-col>
</el-tab-pane>
<el-tab-pane label="设备租金" name="2">
<el-col :span="24">
<jnpf-form-tip-item label-width="0">
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.billdevicedeatialList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column label="租赁单号" prop="leaseNumber">
<template slot="header" v-if="false">
<span class="required-sign">*</span>租赁单号
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.leaseNumber"
@change="changeData('billdevicedeatial-leaseNumber', scope.$index)"
placeholder="添加自动带入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="设备编码" prop="equipmentNumber">
<template slot="header" v-if="false">
<span class="required-sign">*</span>设备编码
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.equipmentNumber"
@change="changeData('billdevicedeatial-equipmentNumber', scope.$index)"
placeholder="添加自动带入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="设备名称" prop="equipmentName">
<template slot="header" v-if="false">
<span class="required-sign">*</span>设备名称
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.equipmentName"
@change="changeData('billdevicedeatial-equipmentName', scope.$index)"
placeholder="添加自动带入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="开始时间" prop="startTime">
<template slot="header" v-if="false">
<span class="required-sign">*</span>开始时间
</template>
<template slot-scope="scope">
<JnpfDatePicker v-model="scope.row.startTime"
@change="changeData('billdevicedeatial-startTime', scope.$index)"
:startTime="dateTime(false, 1, 1, '', '')"
:endTime="dateTime(false, 1, 1, '', '')"
placeholder="请选择开始时间" disabled clearable :style='{ "width": "100%" }'
type="date" format="yyyy-MM-dd">
</JnpfDatePicker>
</template>
</el-table-column>
<el-table-column label="结束时间" prop="endTime">
<template slot="header" v-if="false">
<span class="required-sign">*</span>结束时间
</template>
<template slot-scope="scope">
<JnpfDatePicker v-model="scope.row.endTime"
@change="changeData('billdevicedeatial-endTime', scope.$index)"
:startTime="dateTime(false, 1, 1, '', '')"
:endTime="dateTime(false, 1, 1, '', '')"
placeholder="请选择结束时间" disabled clearable :style='{ "width": "100%" }'
type="date" format="yyyy-MM-dd">
</JnpfDatePicker>
</template>
</el-table-column>
<el-table-column label="账单金额" prop="billAmount">
<template slot="header" v-if="false">
<span class="required-sign">*</span>账单金额
</template>
<template slot-scope="scope">
<JnpfInputNumber v-model="scope.row.billAmount"
@change="changeData('billdevicedeatial-billAmount', scope.$index)"
placeholder="账单金额" :step="1" :min="0" disabled>
</JnpfInputNumber>
</template>
</el-table-column>
<el-table-column label="费用说明" prop="costDescription">
<template slot="header" v-if="false">
<span class="required-sign">*</span>费用说明
</template>
<template slot-scope="scope">
<JnpfTextarea v-model="scope.row.costDescription"
@change="changeData('billdevicedeatial-costDescription', scope.$index)"
placeholder="请输入费用说明" :style='{ "width": "100%" }' true
type="textarea" :autosize='{ "minRows": 4, "maxRows": 4 }' disabled>
</JnpfTextarea>
</template>
</el-table-column>
<!-- <el-table-column label="操作" width="50">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delbilldevicedeatialList(scope.$index)">删除</el-button>
</template>
</el-table-column> -->
</el-table>
<!-- <div class="table-actions" @click="choicedevices()">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div> -->
</jnpf-form-tip-item>
</el-col>
</el-tab-pane>
<el-tab-pane label="其它费用" name="3KzarC2">
<el-col :span="24">
<jnpf-form-tip-item label-width="0">
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.billotherdeatialList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column label="使用量" prop="useAmount">
<template slot="header" v-if="false">
<span class="required-sign">*</span>使用量
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.useAmount"
@change="changeData('billotherdeatial-useAmount', scope.$index)"
placeholder="请输入使用量" disabled clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="开始时间" prop="startTime">
<template slot="header" v-if="false">
<span class="required-sign">*</span>开始时间
</template>
<template slot-scope="scope">
<JnpfDatePicker v-model="scope.row.startTime"
@change="changeData('billotherdeatial-startTime', scope.$index)"
:startTime="dateTime(false, 1, 1, '', '')"
:endTime="dateTime(false, 1, 1, '', '')"
placeholder="请选择开始时间" disabled clearable :style='{ "width": "100%" }'
type="date" format="yyyy-MM-dd">
</JnpfDatePicker>
</template>
</el-table-column>
<el-table-column label="结束时间" prop="endTime">
<template slot="header" v-if="false">
<span class="required-sign">*</span>结束时间
</template>
<template slot-scope="scope">
<JnpfDatePicker v-model="scope.row.endTime"
@change="changeData('billotherdeatial-endTime', scope.$index)"
:startTime="dateTime(false, 1, 1, '', '')"
:endTime="dateTime(false, 1, 1, '', '')"
placeholder="请选择结束时间" disabled clearable :style='{ "width": "100%" }'
type="date" format="yyyy-MM-dd">
</JnpfDatePicker>
</template>
</el-table-column>
<el-table-column label="账单金额" prop="billAmount">
<template slot="header" v-if="false">
<span class="required-sign">*</span>账单金额
</template>
<template slot-scope="scope">
<JnpfInputNumber v-model="scope.row.billAmount"
@change="changeData('billotherdeatial-billAmount', scope.$index)"
placeholder="账单金额" :step="1" :min="0" disabled>
</JnpfInputNumber>
</template>
</el-table-column>
<el-table-column label="费用说明" prop="costDescription">
<template slot="header" v-if="false">
<span class="required-sign">*</span>费用说明
</template>
<template slot-scope="scope">
<JnpfTextarea v-model="scope.row.costDescription"
@change="changeData('billotherdeatial-costDescription', scope.$index)"
placeholder="请输入" :style='{ "width": "100%" }' true
type="textarea" :autosize='{ "minRows": 4, "maxRows": 4 }' disabled>
</JnpfTextarea>
</template>
</el-table-column>
<!-- <el-table-column label="操作" width="50">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delbillotherdeatialList(scope.$index)">删除</el-button>
</template>
</el-table-column> -->
</el-table>
<!-- <div class="table-actions" @click="addbillotherdeatialList()">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div> -->
</jnpf-form-tip-item>
</el-col>
</el-tab-pane>
</el-tabs>
</el-col>
<!-- 表单结束 -->
</template>
</el-form>
@ -176,7 +561,7 @@ export default {
version: 0,
},
tableRequiredData: {},
activegecbmb: '3KzarC2',
activegecbmb: '1',
dataRule:
{
contractId: [
@ -434,7 +819,7 @@ export default {
},
//初始化默认数据
initDefaultData() {
this.dataForm.confirmTime = new Date().getTime()
// this.dataForm.confirmTime = new Date().getTime()
},
// 表单提交
@ -451,6 +836,15 @@ export default {
},
request() {
let _data = this.dataList()
console.log(_data,"_data_data");
if (_data.payAmount == null || _data.payAmount == undefined) {
this.$message.error('请输入支付金额！');
return
}
if (_data.payAmount > _data.billAmount) {
this.$message.error("支付金额不能大于账单金额！");
return;
}
request({
url: '/api/example/BillTable/entry/' + this.dataForm.id,
method: 'PUT',

8
jnpf-java-boot/jnpf-web/src/views/scm/billtable/form.vue
Unescape View File

@ -4,7 +4,7 @@
<div class="JNPF-common-page-header">
<el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" />
<div class="options">
<el-dropdown class="dropdown" placement="bottom">
<!-- <el-dropdown class="dropdown" placement="bottom">
<el-button style="width:70px">
更 多<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
@ -21,7 +21,7 @@
:loading="continueBtnLoading" :disabled='btnLoading'>
{{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</el-dropdown> -->
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"
:disabled='continueBtnLoading'> 保
存</el-button>
@ -568,12 +568,12 @@ export default {
merchantId: undefined,
startTime: undefined,
endTime: undefined,
billAmount: undefined,
billAmount: "0",
notificationMethod: undefined,
noticeTime: undefined,
notificationState: "2",
payStatus: "1",
payAmount: undefined,
payAmount: "0",
confirmPersonnel: undefined,
confirmTime: undefined,
billAttachment: [],

3
jnpf-java-boot/jnpf-web/src/views/scm/billtable/index.vue
Unescape View File

@ -72,7 +72,7 @@
@change="handleSelectionChange">
</template>
</el-table-column>
<el-table-column prop="contractNumber" label="合同编号" align="center"width="150"fixed="left" >
<el-table-column prop="contractNumber" label="账单号" align="center"width="150"fixed="left" >
</el-table-column>
<el-table-column prop="contractId" label="合同名称" align="center"width="200"fixed="left" >
</el-table-column>
@ -161,6 +161,7 @@ import superQueryJson from './superQueryJson'
import Entry from './entry.vue';
export default {
name:"billGenerate",
components: {
JNPFForm,
Entry,

7
jnpf-java-boot/jnpf-web/src/views/scm/billtable/spaces.vue
Unescape View File

@ -24,7 +24,7 @@
</div>
</el-row>
<JNPF-table v-loading="listLoading" :data="list" hasC @selection-change="handleSelectionChange" :border="false">
<el-table-column prop="spaceNumber" label="空间ID" align="center" sortable>
<el-table-column prop="spaceNumber" label="空间编码" align="center" sortable>
</el-table-column>
<el-table-column prop="spaceId" label="空间名称" align="center">
</el-table-column>
@ -77,7 +77,10 @@ export default {
methods: {
formatTimestamp(timestamp) {
const date = new Date(timestamp);
return date.toLocaleString();
const year = date.getFullYear();
const month = (date.getMonth() + 1).toString().padStart(2, '0');
const day = date.getDate().toString().padStart(2, '0');
return `${year}-${month}-${day}`;
},
init(excludeIdList, contractId) {
this.visible = true

4
jnpf-java-boot/jnpf-web/src/views/scm/contract/form.vue
Unescape View File

@ -4,7 +4,7 @@
<div class="JNPF-common-page-header">
<el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" />
<div class="options">
<el-dropdown class="dropdown" placement="bottom">
<!-- <el-dropdown class="dropdown" placement="bottom">
<el-button style="width:70px">
更 多<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
@ -21,7 +21,7 @@
:loading="continueBtnLoading" :disabled='btnLoading'>
{{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</el-dropdown> -->
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"
:disabled='continueBtnLoading'> 保
存</el-button>

2
jnpf-java-boot/jnpf-web/src/views/scm/contract/index.vue
Unescape View File

@ -167,7 +167,6 @@
:onEndSubmit="handleEndSubmit" />
<Change v-if="changeVisible" ref="Change" @refresh="refresh" />
</div>
</div>
</template>
<script>
@ -192,6 +191,7 @@ import DialogComponent from "@/views/scm/contract/DialogComponent.vue";
import DialogEndComponent from "@/views/scm/contract/DialogEndComponent.vue";
export default {
name:"contractManges",
components: {
DialogComponent,
DialogEndComponent,

10
jnpf-java-boot/jnpf-web/src/views/scm/decorationapplicationform/form.vue
Unescape View File

@ -129,18 +129,18 @@
@select="addForSelect" @close="selectDialogVisible = false" />
</el-row>
<span slot="footer" class="dialog-footer">
<div class="upAndDown-button" v-if="dataForm.id">
<!-- <div class="upAndDown-button" v-if="dataForm.id">
<el-button @click="prev" :disabled='prevDis'>
{{ '上一条' }}
</el-button>
<el-button @click="next" :disabled='nextDis'>
{{ '下一条' }}
</el-button>
</div>
<el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
{{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-button>
<el-button @click="visible = false"> 取 消</el-button>
</div> -->
<!-- <el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
{{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-button> -->
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> 确 定</el-button>
<el-button @click="visible = false"> 取 消</el-button>
</span>
</el-dialog>
</template>

1
jnpf-java-boot/jnpf-web/src/views/scm/decorationapplicationform/index.vue
Unescape View File

@ -142,6 +142,7 @@ import SuperQuery from '@/components/SuperQuery'
import superQueryJson from './superQueryJson'
export default {
name:"decorationapplicationform",
components: {
JNPFForm,
Detail,

17
jnpf-java-boot/jnpf-web/src/views/scm/enterprisemerchants/form.vue
Unescape View File

@ -4,8 +4,8 @@
<div class="JNPF-common-page-header">
<el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" />
<div class="options">
<!-- <el-dropdown class="dropdown" placement="bottom"> -->
<!-- <el-button style="width:70px">
<!-- <el-dropdown class="dropdown" placement="bottom">
<el-button style="width:70px">
更 多<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
@ -16,11 +16,11 @@
<el-dropdown-item @click.native="next" :disabled='nextDis'>
{{ '下一条' }}
</el-dropdown-item>
</template> -->
<!-- <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)" :loading="continueBtnLoading"
</template>
<el-dropdown-item type="primary" @click.native="dataFormSubmit(2)" :loading="continueBtnLoading"
:disabled='btnLoading'>
{{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-dropdown-item> -->
<!-- </el-dropdown-menu>
{{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown> -->
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" :disabled='continueBtnLoading'> 保
存</el-button>
@ -130,9 +130,8 @@
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="统一社会信用代码" prop="unifiedSocialCreditCode">
<JnpfInput v-model="dataForm.unifiedSocialCreditCode"
@change="changeData('unifiedSocialCreditCode', -1)" placeholder="请输入" clearable
:style='{ "width": "100%" }'>
<JnpfInput v-model="dataForm.unifiedSocialCreditCode" @change="changeData('unifiedSocialCreditCode', -1)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>

1
jnpf-java-boot/jnpf-web/src/views/scm/enterprisemerchants/index.vue
Unescape View File

@ -176,6 +176,7 @@ import SuperQuery from '@/components/SuperQuery'
import superQueryJson from './superQueryJson'
export default {
name:"yq_enterprise_merchants",
components: {
JNPFForm,
Detail,

20
jnpf-java-boot/jnpf-web/src/views/scm/equipment/form.vue
Unescape View File

@ -8,8 +8,8 @@
<!-- 具体表单 -->
<el-col :span="8">
<jnpf-form-tip-item label="设备编码" prop="code">
<JnpfInput v-model="dataForm.code" @change="changeData('code',-1)" placeholder="请输入" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.code" :disabled="!changeId" @change="changeData('code', -1)" placeholder="请输入"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
@ -108,18 +108,18 @@
@select="addForSelect" @close="selectDialogVisible = false" />
</el-row>
<span slot="footer" class="dialog-footer">
<div class="upAndDown-button" v-if="dataForm.id">
<!-- <div class="upAndDown-button" v-if="dataForm.id">
<el-button @click="prev" :disabled='prevDis'>
{{'上一条'}}
</el-button>
<el-button @click="next" :disabled='nextDis'>
{{'下一条'}}
</el-button>
</div>
<el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
{{!dataForm.id ?'确定并新增':'确定并继续'}}</el-button>
<el-button @click="visible = false"> 取 消</el-button>
</div> -->
<!-- <el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
{{!dataForm.id ?'确定并新增':'确定并继续'}}</el-button> -->
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> 确 定</el-button>
<el-button @click="visible = false"> 取 消</el-button>
</span>
</el-dialog>
</template>
@ -153,7 +153,8 @@
thousandsFormat
} from "@/components/Generator/utils/index"
export default {
components: {},
components: {
},
props: [],
data() {
return {
@ -300,6 +301,9 @@
}
},
computed: {
changeId() {
return !this.dataForm.id;
},
...mapGetters(['userInfo'])
},
watch: {},

1
jnpf-java-boot/jnpf-web/src/views/scm/equipment/index.vue
Unescape View File

@ -153,6 +153,7 @@
import superQueryJson from './superQueryJson'
export default {
name:"equipment",
components: {
JNPFForm,
Detail,

10
jnpf-java-boot/jnpf-web/src/views/scm/equipmentinspectionrecords/form.vue
Unescape View File

@ -76,18 +76,18 @@
@select="addForSelect" @close="selectDialogVisible=false" />
</el-row>
<span slot="footer" class="dialog-footer">
<div class="upAndDown-button" v-if="dataForm.id">
<!-- <div class="upAndDown-button" v-if="dataForm.id">
<el-button @click="prev" :disabled='prevDis'>
{{'上一条'}}
</el-button>
<el-button @click="next" :disabled='nextDis'>
{{'下一条'}}
</el-button>
</div>
<el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
{{!dataForm.id ?'确定并新增':'确定并继续'}}</el-button>
<el-button @click="visible = false"> 取 消</el-button>
</div> -->
<!-- <el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
{{!dataForm.id ?'确定并新增':'确定并继续'}}</el-button> -->
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> 确 定</el-button>
<el-button @click="visible = false"> 取 消</el-button>
</span>
</el-dialog>
</template>

1
jnpf-java-boot/jnpf-web/src/views/scm/equipmentinspectionrecords/index.vue
Unescape View File

@ -129,6 +129,7 @@
import superQueryJson from './superQueryJson'
export default {
name:"yq_equipment_inspection_records",
components: {
JNPFForm,
Detail,

10
jnpf-java-boot/jnpf-web/src/views/scm/equipmentmaintenancerecords/form.vue
Unescape View File

@ -119,18 +119,18 @@
@select="addForSelect" @close="selectDialogVisible = false" />
</el-row>
<span slot="footer" class="dialog-footer">
<div class="upAndDown-button" v-if="dataForm.id">
<!-- <div class="upAndDown-button" v-if="dataForm.id">
<el-button @click="prev" :disabled='prevDis'>
{{ '上一条' }}
</el-button>
<el-button @click="next" :disabled='nextDis'>
{{ '下一条' }}
</el-button>
</div>
<el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
{{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-button>
<el-button @click="visible = false"> 取 消</el-button>
</div> -->
<!-- <el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
{{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-button> -->
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> 确 定</el-button>
<el-button @click="visible = false"> 取 消</el-button>
</span>
</el-dialog>
</template>

1
jnpf-java-boot/jnpf-web/src/views/scm/equipmentmaintenancerecords/index.vue
Unescape View File

@ -147,6 +147,7 @@ import SuperQuery from '@/components/SuperQuery'
import superQueryJson from './superQueryJson'
export default {
name:"yq_equipment_maintenance_records",
components: {
JNPFForm,
Detail,

10
jnpf-java-boot/jnpf-web/src/views/scm/equipmentrentalrecords/form.vue
Unescape View File

@ -140,18 +140,18 @@
@select="addForSelect" @close="selectDialogVisible = false" />
</el-row>
<span slot="footer" class="dialog-footer">
<div class="upAndDown-button" v-if="dataForm.id">
<!-- <div class="upAndDown-button" v-if="dataForm.id">
<el-button @click="prev" :disabled='prevDis'>
{{ '上一条' }}
</el-button>
<el-button @click="next" :disabled='nextDis'>
{{ '下一条' }}
</el-button>
</div>
<el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
{{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-button>
<el-button @click="visible = false"> 取 消</el-button>
</div> -->
<!-- <el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
{{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-button> -->
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> 确 定</el-button>
<el-button @click="visible = false"> 取 消</el-button>
</span>
</el-dialog>
</template>

1
jnpf-java-boot/jnpf-web/src/views/scm/equipmentrentalrecords/index.vue
Unescape View File

@ -153,6 +153,7 @@ import SuperQuery from '@/components/SuperQuery'
import superQueryJson from './superQueryJson'
export default {
name:"equipmentrentalrecords",
components: {
JNPFForm,
Detail,

10
jnpf-java-boot/jnpf-web/src/views/scm/equipmentrepairrecords/form.vue
Unescape View File

@ -91,18 +91,18 @@
@select="addForSelect" @close="selectDialogVisible = false" />
</el-row>
<span slot="footer" class="dialog-footer">
<div class="upAndDown-button" v-if="dataForm.id">
<!-- <div class="upAndDown-button" v-if="dataForm.id">
<el-button @click="prev" :disabled='prevDis'>
{{ '上一条' }}
</el-button>
<el-button @click="next" :disabled='nextDis'>
{{ '下一条' }}
</el-button>
</div>
<el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
{{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-button>
<el-button @click="visible = false"> 取 消</el-button>
</div> -->
<!-- <el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
{{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-button> -->
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> 确 定</el-button>
<el-button @click="visible = false"> 取 消</el-button>
</span>
</el-dialog>
</template>

1
jnpf-java-boot/jnpf-web/src/views/scm/equipmentrepairrecords/index.vue
Unescape View File

@ -144,6 +144,7 @@
import superQueryJson from './superQueryJson'
export default {
name:"yq_equipment_repair_records",
components: {
JNPFForm,
Detail,

10
jnpf-java-boot/jnpf-web/src/views/scm/park/form.vue
Unescape View File

@ -81,25 +81,25 @@
/>
</el-row>
<span slot="footer" class="dialog-footer">
<div class="upAndDown-button" v-if="dataForm.id">
<!-- <div class="upAndDown-button" v-if="dataForm.id">
<el-button @click="prev" :disabled="prevDis">
{{ "上一条" }}
</el-button>
<el-button @click="next" :disabled="nextDis">
{{ "下一条" }}
</el-button>
</div>
<el-button
</div> -->
<!-- <el-button
type="primary"
@click="dataFormSubmit(2)"
:loading="continueBtnLoading"
>
{{ !dataForm.id ? "确定并新增" : "确定并继续" }}</el-button
>
<el-button @click="visible = false"> 取 消</el-button>
> -->
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading">
确 定</el-button
>
<el-button @click="visible = false"> 取 消</el-button>
</span>
</el-dialog>
</template>

123
jnpf-java-boot/jnpf-web/src/views/scm/park/index.vue
Unescape View File

@ -11,12 +11,8 @@
</el-col>
<el-col :span="6">
<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="primary" icon="el-icon-search" @click="search()">查询</el-button>
<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
</el-form-item>
</el-col>
</el-form>
@ -24,129 +20,57 @@
<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"
@click="addOrUpdateHandle()"
>新增
<el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">新增
</el-button>
<el-button
type="text"
icon="icon-ym icon-ym-btn-download"
@click="exportData()"
>导出
<el-button type="success" icon="icon-ym icon-ym-btn-upload" @click="exportData()">导出
</el-button>
<el-button
type="text"
icon="icon-ym icon-ym-btn-upload"
@click="handelUpload()"
>导入
<el-button type="danger" icon="icon-ym icon-ym-btn-download" @click="handelUpload()">导入
</el-button>
<el-button
type="text"
icon="icon-ym icon-ym-btn-clearn"
@click="handleBatchRemoveDel()"
>批量删除
<el-button type="warning" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()">批量删除
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link
icon="icon-ym icon-ym-filter JNPF-common-head-icon"
:underline="false"
@click="openSuperQuery()"
/>
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@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-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-tooltip>
</div>
</div>
<JNPF-table
v-loading="listLoading"
:data="list"
@sort-change="sortChange"
has-c
@selection-change="handleSelectionChange"
:span-method="arraySpanMethod"
border
>
<el-table-column
prop="code"
label="园区编码"
align="center"
width="400"
>
<JNPF-table v-loading="listLoading" :data="list" @sort-change="sortChange" has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod" border>
<el-table-column prop="code" label="园区编码" align="center" width="400">
</el-table-column>
<el-table-column
prop="name"
label="园区名称"
align="center"
width="400"
>
<el-table-column prop="name" label="园区名称" align="center" width="400">
</el-table-column>
<el-table-column prop="description" label="园区描述" align="center">
</el-table-column>
<el-table-column prop="remark" label="备注" align="center">
</el-table-column>
<el-table-column
label="操作"
fixed="right"
width="150"
align="center"
>
<el-table-column label="操作" fixed="right" width="150" align="center">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)"
>编辑
<el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
</el-button>
<el-button
type="text"
class="JNPF-table-delBtn"
@click="handleDel(scope.row.id)"
>删除
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button type="text" @click="goDetail(scope.row.id)"
>详情
<el-button type="text" @click="goDetail(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" />
<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"
/>
<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" />
</div>
</template>
@ -168,6 +92,7 @@ import SuperQuery from "@/components/SuperQuery";
import superQueryJson from "./superQueryJson";
export default {
name: "parkManageList",
components: {
JNPFForm,
Detail,

4
jnpf-java-boot/jnpf-web/src/views/scm/parkequipment/form.vue
Unescape View File

@ -4,7 +4,7 @@
<div class="JNPF-common-page-header">
<el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" />
<div class="options">
<el-dropdown class="dropdown" placement="bottom">
<!-- <el-dropdown class="dropdown" placement="bottom">
<el-button style="width:70px">
更 多<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
@ -21,7 +21,7 @@
:loading="continueBtnLoading" :disabled='btnLoading'>
{{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</el-dropdown> -->
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"
:disabled='continueBtnLoading'> 保
存</el-button>

1
jnpf-java-boot/jnpf-web/src/views/scm/parkequipment/index.vue
Unescape View File

@ -160,6 +160,7 @@ import SuperQuery from '@/components/SuperQuery'
import superQueryJson from './superQueryJson'
export default {
name:"yq_park_equipment",
components: {
JNPFForm,
Detail,

6
jnpf-java-boot/jnpf-web/src/views/scm/person/form.vue
Unescape View File

@ -89,7 +89,7 @@
@select="addForSelect" @close="selectDialogVisible=false" />
</el-row>
<span slot="footer" class="dialog-footer">
<div class="upAndDown-button" v-if="dataForm.id">
<!-- <div class="upAndDown-button" v-if="dataForm.id">
<el-button @click="prev" :disabled='prevDis'>
{{'上一条'}}
</el-button>
@ -98,9 +98,9 @@
</el-button>
</div>
<el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
{{!dataForm.id ?'确定并新增':'确定并继续'}}</el-button>
<el-button @click="visible = false"> 取 消</el-button>
{{!dataForm.id ?'确定并新增':'确定并继续'}}</el-button> -->
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> 确 定</el-button>
<el-button @click="visible = false"> 取 消</el-button>
</span>
</el-dialog>
</template>

1
jnpf-java-boot/jnpf-web/src/views/scm/person/index.vue
Unescape View File

@ -124,6 +124,7 @@
import superQueryJson from './superQueryJson'
export default {
name:"yq_person",
components: {
JNPFForm,
Detail,

10
jnpf-java-boot/jnpf-web/src/views/scm/space/form.vue
Unescape View File

@ -133,25 +133,25 @@
/>
</el-row>
<span slot="footer" class="dialog-footer">
<div class="upAndDown-button" v-if="dataForm.id">
<!-- <div class="upAndDown-button" v-if="dataForm.id">
<el-button @click="prev" :disabled="prevDis">
{{ "上一条" }}
</el-button>
<el-button @click="next" :disabled="nextDis">
{{ "下一条" }}
</el-button>
</div>
<el-button
</div> -->
<!-- <el-button
type="primary"
@click="dataFormSubmit(2)"
:loading="continueBtnLoading"
>
{{ !dataForm.id ? "确定并新增" : "确定并继续" }}</el-button
>
<el-button @click="visible = false"> 取 消</el-button>
> -->
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading">
确 定</el-button
>
<el-button @click="visible = false"> 取 消</el-button>
</span>
</el-dialog>
</template>

190
jnpf-java-boot/jnpf-web/src/views/scm/space/index.vue
Unescape View File

@ -6,37 +6,17 @@
<el-dropdown>
<el-link icon="icon-ym icon-ym-mpMenu" :underline="false" />
<el-dropdown-menu slot="dropdown">
<el-dropdown-item @click.native="toggleTreeExpand(true)"
>展开全部</el-dropdown-item
>
<el-dropdown-item @click.native="toggleTreeExpand(false)"
>折叠全部</el-dropdown-item
>
<el-dropdown-item @click.native="toggleTreeExpand(true)">展开全部</el-dropdown-item>
<el-dropdown-item @click.native="toggleTreeExpand(false)">折叠全部</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
<div class="JNPF-common-tree-search-box">
<el-input
placeholder="输入关键字"
v-model="keyword"
suffix-icon="el-icon-search"
clearable
/>
<el-input placeholder="输入关键字" v-model="keyword" suffix-icon="el-icon-search" clearable />
</div>
<el-tree
:data="treeData"
class="JNPF-common-el-tree"
highlight-current
ref="treeBox"
:expand-on-click-node="false"
@node-click="handleNodeClick"
node-key="id"
:props="treeProps"
:default-expand-all="expandsTree"
:filter-node-method="filterNode"
:lazy="false"
v-if="refreshTree"
>
<el-tree :data="treeData" class="JNPF-common-el-tree" highlight-current ref="treeBox"
:expand-on-click-node="false" @node-click="handleNodeClick" node-key="id" :props="treeProps"
:default-expand-all="expandsTree" :filter-node-method="filterNode" :lazy="false" v-if="refreshTree">
<span class="custom-tree-node" slot-scope="{ node, data }">
<i :class="data.icon"></i>
<span class="text">{{ node.label }}</span>
@ -60,12 +40,8 @@
</el-col>
<el-col :span="6">
<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="primary" icon="el-icon-search" @click="search()">查询</el-button>
<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
</el-form-item>
</el-col>
</el-form>
@ -73,174 +49,77 @@
<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"
@click="addOrUpdateHandle()"
>新增
<el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">新增
</el-button>
<el-button
type="text"
icon="icon-ym icon-ym-btn-download"
@click="exportData()"
>导出
<el-button type="success" icon="icon-ym icon-ym-btn-upload" @click="exportData()">导出
</el-button>
<el-button
type="text"
icon="icon-ym icon-ym-btn-upload"
@click="handelUpload()"
>导入
<el-button type="danger" icon="icon-ym icon-ym-btn-download" @click="handelUpload()">导入
</el-button>
<el-button
type="text"
icon="icon-ym icon-ym-btn-clearn"
@click="handleBatchRemoveDel()"
>批量删除
<el-button type="warning" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()">批量删除
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link
icon="icon-ym icon-ym-filter JNPF-common-head-icon"
:underline="false"
@click="openSuperQuery()"
/>
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@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-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-tooltip>
</div>
</div>
<JNPF-table
v-loading="listLoading"
:data="list"
@sort-change="sortChange"
has-c
@selection-change="handleSelectionChange"
:span-method="arraySpanMethod"
border
>
<el-table-column
prop="areaName"
label="区域名称"
align="center"
width="250"
>
<JNPF-table v-loading="listLoading" :data="list" @sort-change="sortChange" has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod" border>
<el-table-column prop="areaName" label="区域名称" align="center" width="250">
</el-table-column>
<el-table-column
label="状态"
prop="state1"
align="center"
width="100"
>
<el-table-column label="状态" prop="state1" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.state1 }}
</template>
</el-table-column>
<el-table-column
prop="code"
label="空间编码"
align="center"
width="200"
>
<el-table-column prop="code" label="空间编码" align="center" width="200">
</el-table-column>
<el-table-column
prop="name"
label="空间名称"
align="center"
width="250"
>
<el-table-column prop="name" label="空间名称" align="center" width="250">
</el-table-column>
<el-table-column
prop="spaceArea"
label="空间面积"
align="center"
width="120"
>
<el-table-column prop="spaceArea" label="空间面积" align="center" width="120">
<template slot-scope="scope" v-if="scope.row.spaceArea">
<JnpfNumber v-model="scope.row.spaceArea" :thousands="false" />
</template>
</el-table-column>
<el-table-column
label="空间类型"
prop="spaceType1"
align="center"
width="150"
>
<el-table-column label="空间类型" prop="spaceType1" align="center" width="150">
<template slot-scope="scope">
{{ scope.row.spaceType1 }}
</template>
</el-table-column>
<el-table-column
prop="unitPrice"
label="单价"
align="center"
width="120"
>
<el-table-column prop="unitPrice" label="单价" align="center" width="120">
<template slot-scope="scope" v-if="scope.row.unitPrice">
<JnpfNumber v-model="scope.row.unitPrice" :thousands="false" />
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" align="center">
</el-table-column>
<el-table-column
label="操作"
fixed="right"
width="150"
align="center"
>
<el-table-column label="操作" fixed="right" width="150" align="center">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)"
>编辑
<el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
</el-button>
<el-button
type="text"
class="JNPF-table-delBtn"
@click="handleDel(scope.row.id)"
>删除
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button type="text" @click="goDetail(scope.row.id)"
>详情
<el-button type="text" @click="goDetail(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" />
<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"
/>
<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" />
</div>
</template>
@ -262,6 +141,7 @@ import SuperQuery from "@/components/SuperQuery";
import superQueryJson from "./superQueryJson";
export default {
name: "spaceManage",
components: {
JNPFForm,
Detail,

4
jnpf-java-boot/jnpf-web/src/views/scm/vehicle/form.vue
Unescape View File

@ -9,7 +9,7 @@
<el-col :span="8">
<jnpf-form-tip-item label="车牌号" prop="vehicleNumber">
<JnpfInput v-model="dataForm.vehicleNumber" @change="changeData('vehicleNumber',-1)" placeholder="请输入"
:disabled="!changeId" clearable :style='{ "width": "100%" }'>
clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
@ -112,8 +112,8 @@
</div>
<el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
{{!dataForm.id ?'确定并新增':'确定并继续'}}</el-button> -->
<el-button @click="visible = false"> 取 消</el-button>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> 确 定</el-button>
<el-button @click="visible = false"> 取 消</el-button>
</span>
</el-dialog>
</template>

1
jnpf-java-boot/jnpf-web/src/views/scm/vehicle/index.vue
Unescape View File

@ -118,6 +118,7 @@
import superQueryJson from './superQueryJson'
export default {
name:"vehicle",
components: {
JNPFForm,
Detail,

10
jnpf-java-boot/jnpf-web/src/views/scm/venuereservationrecord/form.vue
Unescape View File

@ -100,18 +100,18 @@
@select="addForSelect" @close="selectDialogVisible = false" />
</el-row>
<span slot="footer" class="dialog-footer">
<div class="upAndDown-button" v-if="dataForm.id">
<!-- <div class="upAndDown-button" v-if="dataForm.id">
<el-button @click="prev" :disabled='prevDis'>
{{ '上一条' }}
</el-button>
<el-button @click="next" :disabled='nextDis'>
{{ '下一条' }}
</el-button>
</div>
<el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
{{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-button>
<el-button @click="visible = false"> 取 消</el-button>
</div> -->
<!-- <el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
{{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-button> -->
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> 确 定</el-button>
<el-button @click="visible = false"> 取 消</el-button>
</span>
</el-dialog>
</template>

1
jnpf-java-boot/jnpf-web/src/views/scm/venuereservationrecord/index.vue
Unescape View File

@ -134,6 +134,7 @@ import SuperQuery from '@/components/SuperQuery'
import superQueryJson from './superQueryJson'
export default {
name:"VenueReservationRecord",
components: {
JNPFForm,
Detail,

Write Preview
Loading…
Cancel
Save