slowslo 4 жил өмнө
parent
commit
8bb4099385

+ 16 - 7
src/views/enterprise/dept.vue

@@ -89,20 +89,29 @@
               }]
             },
             {
-              label: "备注",
-              prop: "remark",
+              label: "企业",
+              prop: "enterpriseId",
+              type:'select',
+              dicUrl:'/api/cyzh-enterprise/enterprise/list?size=500',
+              props: {
+                label: "enterpriseName",
+                value: "id"
+              },
+              dicFormatter: (res)=>{
+                return res.data.records;
+              },
               rules: [{
                 required: true,
-                message: "请输入备注",
+                message: "请输入企业id",
                 trigger: "blur"
               }]
             },
             {
-              label: "企业id",
-              prop: "enterpriseId",
+              label: "备注",
+              prop: "remark",
               rules: [{
-                required: true,
-                message: "请输入企业id",
+                required: false,
+                message: "请输入备注",
                 trigger: "blur"
               }]
             },

+ 3 - 1
src/views/enterprise/enterprise.vue

@@ -157,7 +157,7 @@
               },
               rules: [{
                 required: true,
-                message: "请选择所属小区",
+                message: "请选择",
                 trigger: "blur"
               }]
             },
@@ -224,6 +224,8 @@
               label: "成立日期",
               prop: "registeredDate",
               type: 'date',
+              format:'yyyy-MM-dd',
+              valueFormat:'yyyy-MM-dd',
               rules: [{
                 required: false,
                 message: "请输入成立日期",

+ 10 - 11
src/views/enterprise/project.vue

@@ -69,18 +69,17 @@
               }]
             },
             {
-              label: "企业id",
+              label: "企业",
               prop: "enterpriseId",
-              hide:true,
-              // type:'select',
-              // dicUrl:'/api/cyzh-enterprise/enterprise/list?',
-              // props: {
-              //   label: "dictValue",
-              //   value: "dictKey"
-              // },
-              // dicFormatter: (res)=>{
-              //   return res.data.records;
-              // },
+              type:'select',
+              dicUrl:'/api/cyzh-enterprise/enterprise/list?size=500',
+              props: {
+                label: "enterpriseName",
+                value: "id"
+              },
+              dicFormatter: (res)=>{
+                return res.data.records;
+              },
               rules: [{
                 required: true,
                 message: "请输入企业id",

+ 2 - 2
src/views/enterprise/staff.vue

@@ -74,13 +74,13 @@
               overHidden: true,
               searchFilterable: true,
               filterable: true,
-              dicUrl: '/api/cyzh-enterprise/staff/list?size=9999',
+              dicUrl: '/api/cyzh-enterprise/enterprise/list?size=500',
               dicFormatter: (res)=>{
                 return res.data.records;
               },
               props: {
                 label: "enterpriseName",
-                value: "enterpriseId"
+                value: "id"
               },
               rules: [{
                 required: true,

+ 4 - 3
src/views/party/activity.vue

@@ -170,7 +170,7 @@
               type: "datetimerange",
               format: "yyyy-MM-dd hh:mm:ss",
               valueFormat: "yyyy-MM-dd HH:mm:ss",
-              width: 290,
+              width: 320,
               row: true,
               slot: true,
               change: ({value, column}) => {
@@ -187,7 +187,7 @@
               label: "报名截止时间",
               prop: "deadlineTime",
               type: "datetime",
-              width: 160,
+              width: 140,
               row: true,
               valueFormat: "yyyy-MM-dd HH:mm:ss",
               rules: [{
@@ -233,7 +233,7 @@
               label: "活动状态",
               prop: "activityStatus",
               type: "select",
-              width: 150,
+              // width: 150,
               row: true,
               search: true,
               slot: true,
@@ -254,6 +254,7 @@
               label: "排序",
               prop: "sort",
               row: true,
+              hide:true,
               width: 100,
               rules: [{
                 required: true,

+ 1 - 1
src/views/person/basicinfo.vue

@@ -312,7 +312,7 @@
               // slot:true,
               search: true,
               cascaderItem: ['roomId'],
-              dicUrl: "/api/cyzh-community/floor/list?unitId={{key}}",
+              dicUrl: "/api/cyzh-community/floor/list?unitId={{key}}&size=100",
               dicFormatter:(res)=>{
                 return res.data.records;//返回字典的层级结构
               },