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

feat(front):前端样式调整;

Browse Source
master
jiyufei 3 months ago
parent fd8611c9c7
commit b7eced58af
25 changed files with 1042 additions and 949 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.setMerchantName(merchantName);
entity.setContractNumber(contract.getContractNumber()); 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) { if (isSave) {
//获取当前年月日 //获取当前年月日
String currentDate = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")); String currentDate = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
@ -695,7 +689,7 @@ public class BillTableServiceImpl extends ServiceImpl<BillTableMapper, BillTable
entity.setBillStatus("20"); entity.setBillStatus("20");
entity.setUpdateBy(userProvider.get().getUserId()); entity.setUpdateBy(userProvider.get().getUserId());
entity.setUpdateTime(DateUtil.getNowDate()); entity.setUpdateTime(DateUtil.getNowDate());
entity.setConfirmPersonnel(userProvider.get().getUserId()); entity.setConfirmPersonnel(userProvider.get().getUserName());
entity.setConfirmTime(DateUtil.getNowDate()); entity.setConfirmTime(DateUtil.getNowDate());
boolean result = this.updateById(entity); boolean result = this.updateById(entity);
if (result) { if (result) {
@ -711,11 +705,13 @@ public class BillTableServiceImpl extends ServiceImpl<BillTableMapper, BillTable
if (ObjectUtil.isNull(entity)) { if (ObjectUtil.isNull(entity)) {
return "账单不存在"; return "账单不存在";
} }
if (ObjectUtil.isNotNull(billTableForm.getBillAttachment())){
entity.setBillAttachment(billTableForm.getBillAttachment().toString()); entity.setBillAttachment(billTableForm.getBillAttachment().toString());
}
entity.setPayStatus(billTableForm.getPayStatus().toString()); entity.setPayStatus(billTableForm.getPayStatus().toString());
entity.setUpdateBy(userProvider.get().getUserId()); entity.setUpdateBy(userProvider.get().getUserId());
entity.setUpdateTime(DateUtil.getNowDate()); entity.setUpdateTime(DateUtil.getNowDate());
if (entity.getBillAmount().compareTo(entity.getPayAmount()) == 0) { if (entity.getBillAmount().compareTo(billTableForm.getPayAmount()) == 0) {
entity.setBillStatus("50"); entity.setBillStatus("50");
} else { } 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)) { if (StringUtils.isNoneBlank(keyword)) {
entityQueryWrapper.lambda().like(EquipmentRentalRecordsEntity::getEquipmentName, keyword); entityQueryWrapper.lambda().like(EquipmentRentalRecordsEntity::getEquipmentName, keyword);
} }
entityQueryWrapper.lambda().orderByDesc(EquipmentRentalRecordsEntity::getStartTime);
List<EquipmentRentalRecordsEntity> list = this.list(entityQueryWrapper); List<EquipmentRentalRecordsEntity> list = this.list(entityQueryWrapper);
if (CollectionUtils.isEmpty(list)) { if (CollectionUtils.isEmpty(list)) {
return Collections.emptyList(); return Collections.emptyList();

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

@ -105,14 +105,14 @@
/> />
</el-row> </el-row>
<span slot="footer" class="dialog-footer"> <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 @click="prev" :disabled="prevDis">
{{ "上一条" }} {{ "上一条" }}
</el-button> </el-button>
<el-button @click="next" :disabled="nextDis"> <el-button @click="next" :disabled="nextDis">
{{ "下一条" }} {{ "下一条" }}
</el-button> </el-button>
</div> </div> -->
<!-- <el-button <!-- <el-button
type="primary" type="primary"
@click="dataFormSubmit(2)" @click="dataFormSubmit(2)"

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

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

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

@ -79,7 +79,10 @@ export default {
methods: { methods: {
formatTimestamp(timestamp) { formatTimestamp(timestamp) {
const date = new Date(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) { init(excludeIdList, contractId) {
this.visible = true 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" <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
label-position="right"> label-position="right">
<template v-if="!loading"> <template v-if="!loading">
<!-- 具体表单 --> <el-col :span="8">
<el-col :span="24">
<jnpf-form-tip-item label="账单号" prop="billNumbe"> <jnpf-form-tip-item label="账单号" prop="billNumbe">
<JnpfInput v-model="dataForm.billNumbe" @change="changeData('billNumbe', -1)" <JnpfInput v-model="dataForm.billNumbe" @change="changeData('billNumbe', -1)"
placeholder="自动生成" disabled clearable :style='{ "width": "100%" }'> placeholder="自动生成" disabled clearable :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </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"> <jnpf-form-tip-item label="账单状态" prop="billStatus">
<JnpfSelect v-model="dataForm.billStatus" @change="changeData('billStatus', -1)" <JnpfSelect v-model="dataForm.billStatus" @change="changeData('billStatus', -1)"
placeholder="请选择账单状态" clearable :style='{ "width": "100%" }' placeholder="请选择账单状态" clearable :style='{ "width": "100%" }'
@ -29,7 +39,69 @@
</JnpfSelect> </JnpfSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </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"> <jnpf-form-tip-item label="支付方式" prop="payStatus">
<JnpfSelect v-model="dataForm.payStatus" @change="changeData('payStatus', -1)" <JnpfSelect v-model="dataForm.payStatus" @change="changeData('payStatus', -1)"
placeholder="请选择支付方式" clearable :style='{ "width": "100%" }' placeholder="请选择支付方式" clearable :style='{ "width": "100%" }'
@ -37,14 +109,32 @@
</JnpfSelect> </JnpfSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="8">
<jnpf-form-tip-item label="支付金额" prop="payAmount"> <jnpf-form-tip-item label="支付金额" prop="payAmount">
<JnpfInputNumber v-model="dataForm.payAmount" @change="changeData('payAmount', -1)" <JnpfInputNumber v-model="dataForm.payAmount" @change="changeData('payAmount', -1)"
placeholder="支付金额" :step="1"> placeholder="支付金额" :step="1" :min="0">
</JnpfInputNumber> </JnpfInputNumber>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </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"> <jnpf-form-tip-item label="相关附件" prop="billAttachment">
<JnpfUploadFile v-model="dataForm.billAttachment" <JnpfUploadFile v-model="dataForm.billAttachment"
@change="changeData('billAttachment', -1)" :fileSize="10" sizeUnit="MB" :limit="9" @change="changeData('billAttachment', -1)" :fileSize="10" sizeUnit="MB" :limit="9"
@ -52,6 +142,301 @@
</JnpfUploadFile> </JnpfUploadFile>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </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> </template>
</el-form> </el-form>
@ -176,7 +561,7 @@ export default {
version: 0, version: 0,
}, },
tableRequiredData: {}, tableRequiredData: {},
activegecbmb: '3KzarC2', activegecbmb: '1',
dataRule: dataRule:
{ {
contractId: [ contractId: [
@ -434,7 +819,7 @@ export default {
}, },
//初始化默认数据 //初始化默认数据
initDefaultData() { initDefaultData() {
this.dataForm.confirmTime = new Date().getTime() // this.dataForm.confirmTime = new Date().getTime()
}, },
// 表单提交 // 表单提交
@ -451,6 +836,15 @@ export default {
}, },
request() { request() {
let _data = this.dataList() 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({ request({
url: '/api/example/BillTable/entry/' + this.dataForm.id, url: '/api/example/BillTable/entry/' + this.dataForm.id,
method: 'PUT', 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"> <div class="JNPF-common-page-header">
<el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" /> <el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" />
<div class="options"> <div class="options">
<el-dropdown class="dropdown" placement="bottom"> <!-- <el-dropdown class="dropdown" placement="bottom">
<el-button style="width:70px"> <el-button style="width:70px">
更 多<i class="el-icon-arrow-down el-icon--right"></i> 更 多<i class="el-icon-arrow-down el-icon--right"></i>
</el-button> </el-button>
@ -21,7 +21,7 @@
:loading="continueBtnLoading" :disabled='btnLoading'> :loading="continueBtnLoading" :disabled='btnLoading'>
{{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-dropdown-item> {{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown> -->
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"
:disabled='continueBtnLoading'> 保 :disabled='continueBtnLoading'> 保
存</el-button> 存</el-button>
@ -568,12 +568,12 @@ export default {
merchantId: undefined, merchantId: undefined,
startTime: undefined, startTime: undefined,
endTime: undefined, endTime: undefined,
billAmount: undefined, billAmount: "0",
notificationMethod: undefined, notificationMethod: undefined,
noticeTime: undefined, noticeTime: undefined,
notificationState: "2", notificationState: "2",
payStatus: "1", payStatus: "1",
payAmount: undefined, payAmount: "0",
confirmPersonnel: undefined, confirmPersonnel: undefined,
confirmTime: undefined, confirmTime: undefined,
billAttachment: [], billAttachment: [],

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

@ -72,7 +72,7 @@
@change="handleSelectionChange"> @change="handleSelectionChange">
</template> </template>
</el-table-column> </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>
<el-table-column prop="contractId" label="合同名称" align="center"width="200"fixed="left" > <el-table-column prop="contractId" label="合同名称" align="center"width="200"fixed="left" >
</el-table-column> </el-table-column>

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

@ -24,7 +24,7 @@
</div> </div>
</el-row> </el-row>
<JNPF-table v-loading="listLoading" :data="list" hasC @selection-change="handleSelectionChange" :border="false"> <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>
<el-table-column prop="spaceId" label="空间名称" align="center"> <el-table-column prop="spaceId" label="空间名称" align="center">
</el-table-column> </el-table-column>
@ -77,7 +77,10 @@ export default {
methods: { methods: {
formatTimestamp(timestamp) { formatTimestamp(timestamp) {
const date = new Date(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) { init(excludeIdList, contractId) {
this.visible = true 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"> <div class="JNPF-common-page-header">
<el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" /> <el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" />
<div class="options"> <div class="options">
<el-dropdown class="dropdown" placement="bottom"> <!-- <el-dropdown class="dropdown" placement="bottom">
<el-button style="width:70px"> <el-button style="width:70px">
更 多<i class="el-icon-arrow-down el-icon--right"></i> 更 多<i class="el-icon-arrow-down el-icon--right"></i>
</el-button> </el-button>
@ -21,7 +21,7 @@
:loading="continueBtnLoading" :disabled='btnLoading'> :loading="continueBtnLoading" :disabled='btnLoading'>
{{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-dropdown-item> {{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown> -->
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"
:disabled='continueBtnLoading'> 保 :disabled='continueBtnLoading'> 保
存</el-button> 存</el-button>

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

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

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

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

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

@ -1,5 +1,5 @@
<template> <template>
<el-dialog :title="!dataForm.id ? '新建' :'编辑'" :close-on-click-modal="false" append-to-body :visible.sync="visible" <el-dialog :title="!dataForm.id ? '新建' : '编辑'" :close-on-click-modal="false" append-to-body :visible.sync="visible"
class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px"> class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
<el-row :gutter="15" class=""> <el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
@ -8,96 +8,96 @@
<!-- 具体表单 --> <!-- 具体表单 -->
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="设备编码" prop="code"> <jnpf-form-tip-item label="设备编码" prop="code">
<JnpfInput v-model="dataForm.code" @change="changeData('code',-1)" placeholder="请输入" clearable <JnpfInput v-model="dataForm.code" :disabled="!changeId" @change="changeData('code', -1)" placeholder="请输入"
:style='{"width":"100%"}'> clearable :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="设备名称" prop="name"> <jnpf-form-tip-item label="设备名称" prop="name">
<JnpfInput v-model="dataForm.name" @change="changeData('name',-1)" placeholder="请输入" clearable <JnpfInput v-model="dataForm.name" @change="changeData('name', -1)" placeholder="请输入" clearable
:style='{"width":"100%"}'> :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="设备类型" prop="type"> <jnpf-form-tip-item label="设备类型" prop="type">
<JnpfSelect v-model="dataForm.type" @change="changeData('type',-1)" placeholder="请选择" clearable <JnpfSelect v-model="dataForm.type" @change="changeData('type', -1)" placeholder="请选择" clearable
:style='{"width":"100%"}' :options="typeOptions" :props="typeProps"> :style='{ "width": "100%" }' :options="typeOptions" :props="typeProps">
</JnpfSelect> </JnpfSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="设备品牌" prop="brand"> <jnpf-form-tip-item label="设备品牌" prop="brand">
<JnpfInput v-model="dataForm.brand" @change="changeData('brand',-1)" placeholder="请输入" clearable <JnpfInput v-model="dataForm.brand" @change="changeData('brand', -1)" placeholder="请输入" clearable
:style='{"width":"100%"}'> :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="设备型号" prop="model"> <jnpf-form-tip-item label="设备型号" prop="model">
<JnpfInput v-model="dataForm.model" @change="changeData('model',-1)" placeholder="请输入" clearable <JnpfInput v-model="dataForm.model" @change="changeData('model', -1)" placeholder="请输入" clearable
:style='{"width":"100%"}'> :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="批次号" prop="batchNumber"> <jnpf-form-tip-item label="批次号" prop="batchNumber">
<JnpfInput v-model="dataForm.batchNumber" @change="changeData('batchNumber',-1)" placeholder="请输入" <JnpfInput v-model="dataForm.batchNumber" @change="changeData('batchNumber', -1)" placeholder="请输入"
clearable :style='{"width":"100%"}'> clearable :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="供应商" prop="supplier"> <jnpf-form-tip-item label="供应商" prop="supplier">
<JnpfInput v-model="dataForm.supplier" @change="changeData('supplier',-1)" placeholder="请输入" clearable <JnpfInput v-model="dataForm.supplier" @change="changeData('supplier', -1)" placeholder="请输入" clearable
:style='{"width":"100%"}'> :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="联系电话" prop="supplierPhone"> <jnpf-form-tip-item label="联系电话" prop="supplierPhone">
<JnpfInput v-model="dataForm.supplierPhone" @change="changeData('supplierPhone',-1)" placeholder="请输入" <JnpfInput v-model="dataForm.supplierPhone" @change="changeData('supplierPhone', -1)" placeholder="请输入"
clearable :style='{"width":"100%"}'> clearable :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="设备状态" prop="status"> <jnpf-form-tip-item label="设备状态" prop="status">
<JnpfSelect v-model="dataForm.status" @change="changeData('status',-1)" placeholder="请选择" clearable <JnpfSelect v-model="dataForm.status" @change="changeData('status', -1)" placeholder="请选择" clearable
:style='{"width":"100%"}' :options="statusOptions" :props="statusProps"> :style='{ "width": "100%" }' :options="statusOptions" :props="statusProps">
</JnpfSelect> </JnpfSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="保修期" prop="defectsLiabilityPeriod"> <jnpf-form-tip-item label="保修期" prop="defectsLiabilityPeriod">
<JnpfInput v-model="dataForm.defectsLiabilityPeriod" @change="changeData('defectsLiabilityPeriod',-1)" <JnpfInput v-model="dataForm.defectsLiabilityPeriod" @change="changeData('defectsLiabilityPeriod', -1)"
placeholder="请输入" clearable :style='{"width":"100%"}'> placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="开始时间" prop="warrantyStartTime"> <jnpf-form-tip-item label="开始时间" prop="warrantyStartTime">
<JnpfDatePicker v-model="dataForm.warrantyStartTime" @change="changeData('warrantyStartTime',-1)" <JnpfDatePicker v-model="dataForm.warrantyStartTime" @change="changeData('warrantyStartTime', -1)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择" clearable :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择" clearable
:style='{"width":"100%"}' type="date" format="yyyy-MM-dd"> :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
</JnpfDatePicker> </JnpfDatePicker>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="结束时间" prop="warrantyEndTime"> <jnpf-form-tip-item label="结束时间" prop="warrantyEndTime">
<JnpfDatePicker v-model="dataForm.warrantyEndTime" @change="changeData('warrantyEndTime',-1)" <JnpfDatePicker v-model="dataForm.warrantyEndTime" @change="changeData('warrantyEndTime', -1)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择" clearable :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择" clearable
:style='{"width":"100%"}' type="date" format="yyyy-MM-dd"> :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
</JnpfDatePicker> </JnpfDatePicker>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<jnpf-form-tip-item label="设备描述" prop="description"> <jnpf-form-tip-item label="设备描述" prop="description">
<JnpfTextarea v-model="dataForm.description" @change="changeData('description',-1)" placeholder="请输入" <JnpfTextarea v-model="dataForm.description" @change="changeData('description', -1)" placeholder="请输入"
:style='{"width":"100%"}' true type="textarea" :autosize='{"minRows":4,"maxRows":4}'> :style='{ "width": "100%" }' true type="textarea" :autosize='{ "minRows": 4, "maxRows": 4 }'>
</JnpfTextarea> </JnpfTextarea>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
@ -105,55 +105,56 @@
</template> </template>
</el-form> </el-form>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog" <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
@select="addForSelect" @close="selectDialogVisible=false" /> @select="addForSelect" @close="selectDialogVisible = false" />
</el-row> </el-row>
<span slot="footer" class="dialog-footer"> <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 @click="prev" :disabled='prevDis'>
{{'上一条'}} {{'上一条'}}
</el-button> </el-button>
<el-button @click="next" :disabled='nextDis'> <el-button @click="next" :disabled='nextDis'>
{{'下一条'}} {{'下一条'}}
</el-button> </el-button>
</div> </div> -->
<el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading"> <!-- <el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
{{!dataForm.id ?'确定并新增':'确定并继续'}}</el-button> {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-button> -->
<el-button @click="visible = false"> 取 消</el-button>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> 确 定</el-button> <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> 确 定</el-button>
<el-button @click="visible = false"> 取 消</el-button>
</span> </span>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { import {
mapGetters mapGetters
} from "vuex"; } from "vuex";
import { import {
getDataInterfaceRes getDataInterfaceRes
} from '@/api/systemData/dataInterface' } from '@/api/systemData/dataInterface'
import { import {
getDictionaryDataSelector getDictionaryDataSelector
} from '@/api/systemData/dictionary' } from '@/api/systemData/dictionary'
import { import {
getDefaultCurrentValueUserId getDefaultCurrentValueUserId
} from '@/api/permission/user' } from '@/api/permission/user'
import { import {
getDefaultCurrentValueDepartmentId getDefaultCurrentValueDepartmentId
} from '@/api/permission/organize' } from '@/api/permission/organize'
import { import {
getDateDay, getDateDay,
getLaterData, getLaterData,
getBeforeData, getBeforeData,
getBeforeTime, getBeforeTime,
getLaterTime getLaterTime
} from '@/components/Generator/utils/index.js' } from '@/components/Generator/utils/index.js'
import { import {
thousandsFormat thousandsFormat
} from "@/components/Generator/utils/index" } from "@/components/Generator/utils/index"
export default { export default {
components: {}, components: {
},
props: [], props: [],
data() { data() {
return { return {
@ -201,27 +202,27 @@
required: true, required: true,
message: '请选择', message: '请选择',
trigger: 'change' trigger: 'change'
}, ], },],
brand: [{ brand: [{
required: true, required: true,
message: '请输入', message: '请输入',
trigger: 'blur' trigger: 'blur'
}, ], },],
model: [{ model: [{
required: true, required: true,
message: '请输入', message: '请输入',
trigger: 'blur' trigger: 'blur'
}, ], },],
batchNumber: [{ batchNumber: [{
required: true, required: true,
message: '请输入', message: '请输入',
trigger: 'blur' trigger: 'blur'
}, ], },],
supplier: [{ supplier: [{
required: true, required: true,
message: '请输入', message: '请输入',
trigger: 'blur' trigger: 'blur'
}, ], },],
supplierPhone: [{ supplierPhone: [{
required: true, required: true,
message: '请输入', message: '请输入',
@ -248,12 +249,12 @@
required: true, required: true,
message: '请选择', message: '请选择',
trigger: 'change' trigger: 'change'
}, ], },],
warrantyEndTime: [{ warrantyEndTime: [{
required: true, required: true,
message: '请选择', message: '请选择',
trigger: 'change' trigger: 'change'
}, ], },],
}, },
typeOptions: [{ typeOptions: [{
"fullName": "类型1", "fullName": "类型1",
@ -300,6 +301,9 @@
} }
}, },
computed: { computed: {
changeId() {
return !this.dataForm.id;
},
...mapGetters(['userInfo']) ...mapGetters(['userInfo'])
}, },
watch: {}, watch: {},
@ -308,7 +312,7 @@
this.initDefaultData() this.initDefaultData()
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm)) this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
}, },
mounted() {}, mounted() { },
methods: { methods: {
prev() { prev() {
this.index-- this.index--
@ -386,7 +390,7 @@
} }
} }
}, },
dataAll() {}, dataAll() { },
clearData() { clearData() {
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll)) this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
}, },
@ -587,5 +591,5 @@
this.childIndex = -1 this.childIndex = -1
}, },
}, },
} }
</script> </script>

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

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

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

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

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

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

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

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

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

@ -81,14 +81,14 @@
/> />
</el-row> </el-row>
<span slot="footer" class="dialog-footer"> <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 @click="prev" :disabled="prevDis">
{{ "上一条" }} {{ "上一条" }}
</el-button> </el-button>
<el-button @click="next" :disabled="nextDis"> <el-button @click="next" :disabled="nextDis">
{{ "下一条" }} {{ "下一条" }}
</el-button> </el-button>
</div> </div> -->
<!-- <el-button <!-- <el-button
type="primary" type="primary"
@click="dataFormSubmit(2)" @click="dataFormSubmit(2)"

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

@ -11,12 +11,8 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()" <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
>查询</el-button <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
>
<el-button icon="el-icon-refresh-right" @click="reset()"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form> </el-form>
@ -24,129 +20,57 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button <el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">新增
type="primary"
icon="icon-ym icon-ym-btn-add"
@click="addOrUpdateHandle()"
>新增
</el-button> </el-button>
<el-button <el-button type="success" icon="icon-ym icon-ym-btn-upload" @click="exportData()">导出
type="text"
icon="icon-ym icon-ym-btn-download"
@click="exportData()"
>导出
</el-button> </el-button>
<el-button <el-button type="danger" icon="icon-ym icon-ym-btn-download" @click="handelUpload()">导入
type="text"
icon="icon-ym icon-ym-btn-upload"
@click="handelUpload()"
>导入
</el-button> </el-button>
<el-button <el-button type="warning" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()">批量删除
type="text"
icon="icon-ym icon-ym-btn-clearn"
@click="handleBatchRemoveDel()"
>批量删除
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">
<el-link <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
icon="icon-ym icon-ym-filter JNPF-common-head-icon" @click="openSuperQuery()" />
:underline="false"
@click="openSuperQuery()"
/>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
effect="dark" <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
:content="$t('common.refresh')"
placement="top"
>
<el-link
icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
:underline="false"
@click="initData()"
/>
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table <JNPF-table v-loading="listLoading" :data="list" @sort-change="sortChange" has-c
v-loading="listLoading" @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border>
:data="list" <el-table-column prop="code" label="园区编码" align="center" width="400">
@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>
<el-table-column <el-table-column prop="name" label="园区名称" align="center" width="400">
prop="name"
label="园区名称"
align="center"
width="400"
>
</el-table-column> </el-table-column>
<el-table-column prop="description" label="园区描述" align="center"> <el-table-column prop="description" label="园区描述" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="remark" label="备注" align="center"> <el-table-column prop="remark" label="备注" align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="操作" fixed="right" width="150" align="center">
label="操作"
fixed="right"
width="150"
align="center"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)" <el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
>编辑
</el-button> </el-button>
<el-button <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
type="text"
class="JNPF-table-delBtn"
@click="handleDel(scope.row.id)"
>删除
</el-button> </el-button>
<el-button type="text" @click="goDetail(scope.row.id)" <el-button type="text" @click="goDetail(scope.row.id)">详情
>详情
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
:total="total" @pagination="initData" />
:page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize"
@pagination="initData"
/>
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" /> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" /> <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" /> <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
v-if="detailVisible" <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
ref="Detail" <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
@refresh="detailVisible = false"
/>
<ToFormDetail
v-if="toFormDetailVisible"
ref="toFormDetail"
@close="toFormDetailVisible = false"
/>
<SuperQuery
v-if="superQueryVisible"
ref="SuperQuery"
:columnOptions="superQueryJson"
@superQuery="superQuery"
/>
</div> </div>
</template> </template>
@ -168,7 +92,7 @@ import SuperQuery from "@/components/SuperQuery";
import superQueryJson from "./superQueryJson"; import superQueryJson from "./superQueryJson";
export default { export default {
name:"parkManageList", name: "parkManageList",
components: { components: {
JNPFForm, JNPFForm,
Detail, Detail,
@ -403,7 +327,7 @@ export default {
// this.initData(); // this.initData();
}, },
//初始化查询的默认数据 //初始化查询的默认数据
async initSearchData() {}, async initSearchData() { },
initData() { initData() {
this.listLoading = true; this.listLoading = true;
let _query = { let _query = {
@ -447,7 +371,7 @@ export default {
}); });
}); });
}) })
.catch(() => {}); .catch(() => { });
}, },
handelUpload() { handelUpload() {
this.uploadBoxVisible = true; this.uploadBoxVisible = true;
@ -487,7 +411,7 @@ export default {
}); });
}); });
}) })
.catch(() => {}); .catch(() => { });
}, },
openSuperQuery() { openSuperQuery() {
this.superQueryVisible = true; this.superQueryVisible = true;

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

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

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

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

@ -133,14 +133,14 @@
/> />
</el-row> </el-row>
<span slot="footer" class="dialog-footer"> <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 @click="prev" :disabled="prevDis">
{{ "上一条" }} {{ "上一条" }}
</el-button> </el-button>
<el-button @click="next" :disabled="nextDis"> <el-button @click="next" :disabled="nextDis">
{{ "下一条" }} {{ "下一条" }}
</el-button> </el-button>
</div> </div> -->
<!-- <el-button <!-- <el-button
type="primary" type="primary"
@click="dataFormSubmit(2)" @click="dataFormSubmit(2)"

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

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

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

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

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

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

Write Preview
Loading…
Cancel
Save