From 92005c9d1c4e6cb475c09639afc3c3c7c6cf968a Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 09 Mar 2021 10:17:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
src/views/clientManagement/clientManagement.vue | 77 ++++++++++++++++++++++----------------
1 files changed, 44 insertions(+), 33 deletions(-)
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index a4da94f..97d5f48 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -152,10 +152,10 @@
label: "到期时间",
prop: "releaseTimeRange",
type: "datetime",
- format: "yyyy-MM-dd HH:mm:ss",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
searchRange: true,
- searchSpan: 5,
+ searchSpan: 6,
hide: true,
addDisplay: false,
editDisplay: false,
@@ -173,13 +173,39 @@
label: "设备编号",
prop: "deviceNumber",
width: 130
+ }, {
+ label: "布撤防状态",
+ prop: "devicestate",
+ type: "select",
+ slot: true,
+ width: 100,
+ rules: [{
+ required: true,
+ trigger: "blur"
+ }],
+ dicData: [
+ {
+ label: "撤防",
+ value: "0"
+ },
+ {
+ label: "布防",
+ value: "1"
+ }
+ ]
+ }, {
+ label: "设备状态",
+ prop: "dxzt",
+ slot: true,
+ addDisplay: false,
+ editDisplay: false,
},
{
label: "省份",
prop: "province",
search: true,
searchSpan: 3,
- searchLabelWidth: 60,
+ searchLabelWidth: 45,
placeholder: "省份",
type: "select",
props: {
@@ -227,40 +253,25 @@
labelWidth: "0",
className: "cityClass3"
}, {
- label: "布撤防状态",
- prop: "devicestate",
- type: "select",
- slot: true,
- width: 100,
- rules: [{
- required: true,
- trigger: "blur"
- }],
- dicData: [
- {
- label: "撤防",
- value: "0"
- },
- {
- label: "布防",
- value: "1"
- }
- ]
- }, {
- label: "设备状态",
- prop: "dxzt",
- slot: true,
- addDisplay: false,
- editDisplay: false,
- }, {
label: "缴费信息",
prop: "pay",
- }, {
+ },
+ {
label: "设备类型",
prop: "deviceType",
- width: 150,
+ width: 160,
search: true,
- }, {
+ searchSpan: 3,
+ searchLabelWidth: 80,
+ searchPlaceholder: "请选择",
+ type: "select",
+ props: {
+ label: "dictValue",
+ value: "dictValue"
+ },
+ dicUrl: "/api/blade-system/dict-biz/child-list?parentId=1357568691367661569",
+ },
+ {
label: "权属",
prop: "ownership",
}, {
--
Gitblit v1.9.3