diff --git a/jeecgboot-vue3/src/views/cooperationDepart/CooperationDepart.data.ts b/jeecgboot-vue3/src/views/cooperationDepart/CooperationDepart.data.ts
index ec2462e..6366a46 100644
--- a/jeecgboot-vue3/src/views/cooperationDepart/CooperationDepart.data.ts
+++ b/jeecgboot-vue3/src/views/cooperationDepart/CooperationDepart.data.ts
@@ -1,59 +1,55 @@
-import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import { rules} from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-import { getWeekMonthQuarterYear } from '/@/utils';
+import {BasicColumn, FormSchema} from '/@/components/Table';
//列表数据
export const columns: BasicColumn[] = [
- {
- title: '区域',
- align:"center",
- dataIndex: 'area_dictText'
- },
- {
+ {
title: '单位名称 ',
- align:"center",
+ align: "center",
dataIndex: 'cooperationDepartName'
- },
- {
+ },
+ {
title: '主管部门',
- align:"center",
+ align: "center",
dataIndex: 'competentDepartName'
- },
- {
- title: '单位性质',
- align:"center",
- dataIndex: 'category_dictText'
- },
- {
- title: '企业登记注册类型',
- align:"center",
- dataIndex: 'departType_dictText',
- },
+ },
+ {
+ title: '所属区域',
+ align: "center",
+ dataIndex: 'area_dictText'
+ },
+ /*{
+ title: '单位性质',
+ align:"center",
+ dataIndex: 'category_dictText'
+ },
+ {
+ title: '企业登记注册类型',
+ align:"center",
+ dataIndex: 'departType_dictText',
+ },*/
{
title: '统一社会信用代码',
- align:"center",
+ align: "center",
dataIndex: 'creditCode',
+ },
+ /*{
+ title: '注册时间',
+ align:"center",
+ dataIndex: 'registerDate',
+ customRender:({text}) =>{
+ text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
+ return text;
},
- /*{
- title: '注册时间',
- align:"center",
- dataIndex: 'registerDate',
- customRender:({text}) =>{
- text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
- return text;
- },
- },*/
- {
+ },*/
+ {
title: '联系人',
- align:"center",
+ align: "center",
dataIndex: 'linkmanName'
- },
- {
+ },
+ {
title: '手机',
- align:"center",
+ align: "center",
dataIndex: 'linkmanPhone'
- },
+ },
/* {
title: '电子邮箱',
align:"center",
@@ -61,17 +57,16 @@ export const columns: BasicColumn[] = [
},*/
];
//查询数据
-export const searchFormSchema: FormSchema[] = [
-];
+export const searchFormSchema: FormSchema[] = [];
//表单数据
export const formSchema: FormSchema[] = [
{
label: '区域',
field: 'area',
component: 'JDictSelectTag',
- componentProps:{
- dictCode:"cooperation_depart_area"
- },
+ componentProps: {
+ dictCode: "cooperation_depart_area"
+ },
},
{
label: '单位名称 ',
@@ -87,16 +82,16 @@ export const formSchema: FormSchema[] = [
label: '单位性质',
field: 'category',
component: 'JDictSelectTag',
- componentProps:{
- dictCode:"depart_category"
- },
+ componentProps: {
+ dictCode: "depart_category"
+ },
},
{
label: '企业登记注册类型',
- field: 'type',
+ field: 'departType',
component: 'JDictSelectTag',
- componentProps:{
- dictCode:"depart_type"
+ componentProps: {
+ dictCode: "depart_type"
},
},
{
@@ -121,52 +116,64 @@ export const formSchema: FormSchema[] = [
label: '手机',
field: 'linkmanPhone',
component: 'Input',
- dynamicRules: ({model,schema}) => {
- return [
- { required: false},
- { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
- ];
- },
+ dynamicRules: ({model, schema}) => {
+ return [
+ {required: false},
+ {pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
+ ];
+ },
},
{
label: '电子邮箱',
field: 'linkmanEmail',
component: 'Input',
- dynamicRules: ({model,schema}) => {
- return [
- { required: false},
- { pattern: /^([\w]+\.*)([\w]+)@[\w]+\.\w{3}(\.\w{2}|)$/, message: '请输入正确的电子邮件!'},
- ];
- },
- },
- // TODO 主键隐藏字段,目前写死为ID
- {
- label: '',
- field: 'id',
- component: 'Input',
- show: false
- },
+ dynamicRules: ({model, schema}) => {
+ return [
+ {required: false},
+ {pattern: /^([\w]+\.*)([\w]+)@[\w]+\.\w{3}(\.\w{2}|)$/, message: '请输入正确的电子邮件!'},
+ ];
+ },
+ },
+ // TODO 主键隐藏字段,目前写死为ID
+ {
+ label: '',
+ field: 'id',
+ component: 'Input',
+ show: false
+ },
];
// 高级查询数据
export const superQuerySchema = {
- area: {title: '区域',order: 0,view: 'list', type: 'string',dictCode: 'cooperation_depart_area',},
- cooperationDepartName: {title: '单位名称 ',order: 1,view: 'text', type: 'string',},
- competentDepartName: {title: '主管部门',order: 2,view: 'text', type: 'string',},
- category: {title: '单位性质',order: 3,view: 'list', type: 'string',dictCode: 'depart_category',},
- type: {title: '企业登记注册类型',order: 4,view: 'text', type: 'string',},
- creditCode: {title: '统一社会信用代码',order: 4,view: 'text', type: 'string',},
- registerDate: {title: '注册时间',order: 5,view: 'date', type: 'string',},
- linkmanName: {title: '联系人',order: 6,view: 'text', type: 'string',},
- linkmanPhone: {title: '手机',order: 7,view: 'text', type: 'string',},
- linkmanEmail: {title: '电子邮箱',order: 8,view: 'text', type: 'string',},
+ area: {
+ title: '区域',
+ order: 0,
+ view: 'list',
+ type: 'string',
+ dictCode: 'cooperation_depart_area',
+ },
+ cooperationDepartName: {title: '单位名称 ', order: 1, view: 'text', type: 'string',},
+ competentDepartName: {title: '主管部门', order: 2, view: 'text', type: 'string',},
+ category: {
+ title: '单位性质',
+ order: 3,
+ view: 'list',
+ type: 'string',
+ dictCode: 'depart_category',
+ },
+ departType: {title: '企业登记注册类型', order: 4, view: 'text', type: 'string',},
+ creditCode: {title: '统一社会信用代码', order: 4, view: 'text', type: 'string',},
+ registerDate: {title: '注册时间', order: 5, view: 'date', type: 'string',},
+ linkmanName: {title: '联系人', order: 6, view: 'text', type: 'string',},
+ linkmanPhone: {title: '手机', order: 7, view: 'text', type: 'string',},
+ linkmanEmail: {title: '电子邮箱', order: 8, view: 'text', type: 'string',},
};
/**
-* 流程表单调用这个方法获取formSchema
-* @param param
-*/
-export function getBpmFormSchema(_formData): FormSchema[]{
+ * 流程表单调用这个方法获取formSchema
+ * @param param
+ */
+export function getBpmFormSchema(_formData): FormSchema[] {
// 默认和原始表单保持一致 如果流程中配置了权限数据,这里需要单独处理formSchema
return formSchema;
}
diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/HeZuoDanWeiDemo.vue b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/HeZuoDanWeiDemo.vue
new file mode 100644
index 0000000..64920cc
--- /dev/null
+++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/HeZuoDanWeiDemo.vue
@@ -0,0 +1,395 @@
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/index.vue b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/index.vue
index 115e9f5..ec83492 100644
--- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/index.vue
+++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/index.vue
@@ -4,6 +4,7 @@
+
@@ -25,6 +26,7 @@
import JeecgComponents from './JeecgComponents.vue';
import TianBaoShuMingDemo from './TianBaoShuMingDemo.vue';
import YiJianDemo from './YiJianDemo.vue';
+ import HeZuoDanWeiDemo from './HeZuoDanWeiDemo.vue';
import XiangMuHeZuoKaiFaDemo from './XiangMuHeZuoKaiFaDemo.vue';
import ImgDragSort from './ImgDragSort.vue';
import ImgTurnPage from './ImgTurnPage.vue';
@@ -43,6 +45,7 @@
TianBaoShuMingDemo: TianBaoShuMingDemo,
XiangMuHeZuoKaiFaDemo: XiangMuHeZuoKaiFaDemo,
YiJianDemo: YiJianDemo,
+ HeZuoDanWeiDemo: HeZuoDanWeiDemo,
JeecgComponents: JeecgComponents,
JEditorDemo: JEditorDemo,
ImgDragSort: ImgDragSort,