From 48d34b0def9f848d1b7f9ddd2cd0861341fb208d Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 04 Dec 2021 17:15:30 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory_ys
---
src/views/licenseApproval/column.js | 85 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 80 insertions(+), 5 deletions(-)
diff --git a/src/views/licenseApproval/column.js b/src/views/licenseApproval/column.js
index c5215dc..b3a43a0 100644
--- a/src/views/licenseApproval/column.js
+++ b/src/views/licenseApproval/column.js
@@ -212,18 +212,33 @@
// value: "deptid",
// },
// },
+ // {
+ // label: "所属辖区",
+ // prop: "jurisdiction",
+ // type: "tree",
+ // dicUrl: "/api/jurisdiction/lazy-trees",
+ // props: {
+ // label: "title",
+ // value: "id",
+ // },
+ // // labelWidth: 160,
+ // // span: 12,
+ // },
{
label: "所属辖区",
+ // prop: "region",
+ // labelWidth: 160,
+ // width: 110,
prop: "jurisdiction",
type: "tree",
- dicUrl: "/api/jurisdiction/lazy-trees",
+ dicUrl: "/api/jurisdiction/lazy-tree",
props: {
label: "title",
value: "id",
},
- // labelWidth: 160,
- // span: 12,
+ // search: true,
},
+
{
label: "许可类型",
// search: true,
@@ -248,9 +263,69 @@
format: "yyyy-MM-dd HH:mm:ss",
valueFormat: "yyyy-MM-dd HH:mm:ss",
},
+ // {
+ // label: "审核状态",
+ // prop: "type",
+ // addDisplay: false,
+ // type: "select",
+ // dicData: [
+ // {
+ // label: "通过",
+ // value: "0",
+ // },
+ // {
+ // label: "不通过",
+ // value: "1",
+ // },
+ // {
+ // label: "待审核",
+ // value: "2",
+ // },
+ // ],
+ // },
{
- label: "审核状态",
- prop: "type",
+ label: "派出所审核",
+ prop: "papprove",
+ addDisplay: false,
+ type: "select",
+ dicData: [
+ {
+ label: "通过",
+ value: "0",
+ },
+ {
+ label: "不通过",
+ value: "1",
+ },
+ {
+ label: "待审核",
+ value: "2",
+ },
+ ],
+ },
+ {
+ label: "分局审核",
+ prop: "xapprove",
+ addDisplay: false,
+ type: "select",
+ dicData: [
+ {
+ label: "通过",
+ value: "0",
+ },
+ {
+ label: "不通过",
+ value: "1",
+ },
+ {
+ label: "待审核",
+ value: "2",
+ },
+ ],
+ },
+ {
+ label: "市局审核",
+ prop: "sapprove",
addDisplay: false,
type: "select",
dicData: [
--
Gitblit v1.9.3