From e2f60c807e967e9b50d00a4fe22c0b015ad6dfff Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 11 Mar 2021 17:05:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
src/views/clientManagement/clientManagement.vue | 55 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 6 deletions(-)
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index f5eb906..130f559 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -110,7 +110,6 @@
<script>
import {getList, remove, update, add, getclient, getDeptLazyTree, getAll} from "@/api/client/client";
import {mapGetters} from "vuex";
-
export default {
created() {
this.payWin();
@@ -120,6 +119,7 @@
form: {},
query: {},
showMap: false,
+ initFlag: true,
loading: true,
page: {
pageSize: 10,
@@ -181,6 +181,23 @@
search: true,
},
{
+ label: "上级菜单",
+ prop: "pid",
+ type: "tree",
+ dicUrl: "/api/blade-jfpts/catalogs/catalogs/tree",
+ hide: true,
+ props: {
+ label: "title"
+ },
+ rules: [
+ {
+ required: false,
+ message: "请选择上级菜单",
+ trigger: "click"
+ }
+ ]
+ },
+ {
label: "到期时间",
prop: "releaseTimeRange",
type: "datetime",
@@ -204,7 +221,31 @@
{
label: "设备编号",
prop: "deviceNumber",
- width: 130
+ width: 130,
+ editDisabled:true,
+ rules: [
+ {
+ required: false,
+ message: "请输入设备编号",
+ trigger: "click"
+ }
+ ]
+ },
+ {
+ label: "序列号",
+ prop: "serialNumber",
+ hide: true,
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
+ },
+ {
+ label: "通道号",
+ prop: "channelNumber",
+ hide: true,
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
}, {
label: "布撤防状态",
prop: "devicestate",
@@ -213,6 +254,7 @@
width: 100,
rules: [{
required: true,
+ message: "请选择布撤防状态",
trigger: "blur"
}],
dicData: [
@@ -231,6 +273,9 @@
slot: true,
addDisplay: false,
editDisplay: false,
+ }, {
+ label: "缴费信息",
+ prop: "pay",
},
{
label: "省份",
@@ -284,9 +329,6 @@
span: 3,
labelWidth: "0",
className: "cityClass3"
- }, {
- label: "缴费信息",
- prop: "pay",
},
{
label: "设备类型",
@@ -326,7 +368,7 @@
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd HH:mm:ss",
width: 150
- }, {
+ },{
label: "最后上传时间",
prop: "heartbeat",
type: "datetime",
@@ -408,6 +450,7 @@
});
},
searchReset() {
+ this.treeDeptId = null;
this.query = {};
this.onLoad(this.page);
},
--
Gitblit v1.9.3