diff --git a/.vscode/settings.json b/.vscode/settings.json
index 571f5982..040f8ba2 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -143,7 +143,7 @@
},
"debug.onTaskErrors": "debugAnyway",
- "diffEditor.ignoreTrimWhitespace": false,
+ "diffEditor.ignoreTrimWhitespace": true,
"npm.packageManager": "pnpm",
"css.validate": false,
diff --git a/apps/web-contract/src/views/contract/approval/signing-basis/index.vue b/apps/web-contract/src/views/contract/approval/signing-basis/index.vue
index 8e933260..1f636006 100644
--- a/apps/web-contract/src/views/contract/approval/signing-basis/index.vue
+++ b/apps/web-contract/src/views/contract/approval/signing-basis/index.vue
@@ -27,8 +27,6 @@ const searchRef = ref();
const { xGridRef, triggerProxy, gridProps } = useVxeTable({ ref: 'xGridRef' });
-const treeData = ref([]);
-
/** Hooks - 表格 */
const gridOptions = reactive(
gridProps({
@@ -74,9 +72,6 @@ function handleDelete(row) {
message.success('删除成功');
triggerProxy('reload');
},
- onCancel() {
- console.log('Cancel');
- },
});
}
@@ -115,8 +110,7 @@ onMounted(() => {
const searchForm = ref({
...getFormSchema(),
- onSearch(context: any) {
- console.log(searchRef.value);
+ onSearch(_context: any) {
triggerProxy('reload');
},
});
diff --git a/apps/web-contract/src/views/contract/declaration/edit/basic-info-curd.tsx b/apps/web-contract/src/views/contract/declaration/edit/basic-info-curd.tsx
index fcc724b7..69c3202e 100644
--- a/apps/web-contract/src/views/contract/declaration/edit/basic-info-curd.tsx
+++ b/apps/web-contract/src/views/contract/declaration/edit/basic-info-curd.tsx
@@ -28,14 +28,7 @@ export function getFormSchema(params: any = {}) {
name: 'a-input',
vModel: 'value',
allowClear: false,
- },
- conditionalRender: {
- match({ form }) {
- return true;
- },
- render({ form }) {
- return {form.contractName};
- },
+ disabled: true,
},
},
reportNo: {
@@ -46,14 +39,7 @@ export function getFormSchema(params: any = {}) {
name: 'a-input',
vModel: 'value',
allowClear: false,
- },
- conditionalRender: {
- match({ form }) {
- return true;
- },
- render({ form }) {
- return {form.reportNo};
- },
+ disabled: true,
},
},
ctrType: {
@@ -63,26 +49,13 @@ export function getFormSchema(params: any = {}) {
component: {
name: 'fs-dict-select',
vModel: 'value',
- class: 'min-w-[200px]',
+ class: 'min-w-[180px]',
dict: dict({
async getData({ form = {}, getComponentRef }) {
return filterContractTypes(contractTypeData, '-1');
},
}),
- },
- conditionalRender: {
- match({ form }) {
- return true;
- },
- render({ form }) {
- const data = filterContractTypes(contractTypeData, '-1');
- for (const item of data) {
- if (item.value === form.ctrType) {
- return {item.label};
- }
- }
- return ;
- },
+ disabled: true,
},
},
ctrTwoType: {
@@ -92,7 +65,7 @@ export function getFormSchema(params: any = {}) {
component: {
name: 'fs-dict-select',
vModel: 'value',
- class: 'min-w-[200px]',
+ class: 'min-w-[180px]',
dict: dict({
async getData({ form = {} }) {
if (form.ctrType) {
@@ -101,28 +74,18 @@ export function getFormSchema(params: any = {}) {
return contractTypeData;
},
}),
- },
- conditionalRender: {
- match({ form }) {
- return true;
- },
- render({ form }) {
- const data = filterContractTypes(contractTypeData, form.ctrType);
- for (const item of data) {
- if (item.value === form.ctrTwoType) {
- return {item.label};
- }
- }
- return ;
- },
+ disabled: true,
},
},
ctrThreeType: {
title: '三级类别',
key: 'ctrTwoType',
col: { span: 8 },
- render({ form }) {
- return ;
+ component: {
+ name: 'a-input',
+ vModel: 'value',
+ class: 'min-w-[180px]',
+ disabled: true,
},
},
budgetSum: {
@@ -136,14 +99,7 @@ export function getFormSchema(params: any = {}) {
class: 'w-full',
min: 0,
max: 9999,
- },
- conditionalRender: {
- match({ form }) {
- return true;
- },
- render({ form }) {
- return {form.budgetSum};
- },
+ disabled: true,
},
},
priceType: {
@@ -158,21 +114,7 @@ export function getFormSchema(params: any = {}) {
dict: dict({
data: getDictOptions(DICT_TYPE.contract_currency_unit),
}),
- },
- conditionalRender: {
- match({ form }) {
- return true;
- },
- render({ form }) {
- return (
-
- {
- getDictObj(DICT_TYPE.contract_currency_unit, form.priceType)
- ?.label
- }
-
- );
- },
+ disabled: true,
},
},
fundAllocation: {
@@ -183,25 +125,11 @@ export function getFormSchema(params: any = {}) {
name: 'fs-dict-select',
vModel: 'value',
allowClear: false,
- class: 'min-w-[200px]',
+ class: 'min-w-[180px]',
dict: dict({
data: getDictOptions(DICT_TYPE.contract_fund_flow),
}),
- },
- conditionalRender: {
- match({ form }) {
- return true;
- },
- render({ form }) {
- return (
-
- {
- getDictObj(DICT_TYPE.contract_fund_flow, form.fundAllocation)
- ?.label
- }
-
- );
- },
+ disabled: true,
},
},
fundDitch: {
@@ -212,28 +140,13 @@ export function getFormSchema(params: any = {}) {
name: 'fs-dict-select',
vModel: 'value',
allowClear: false,
- class: 'min-w-[200px]',
+ class: 'min-w-[180px]',
dict: dict({
data: getDictOptions(DICT_TYPE.contract_funding_source),
}),
- },
- conditionalRender: {
- match({ form }) {
- return true;
- },
- render({ form }) {
- return (
-
- {
- getDictObj(DICT_TYPE.contract_funding_source, form.fundDitch)
- ?.label
- }
-
- );
- },
+ disabled: true,
},
},
-
frameProtocol: {
title: '框架协议',
key: 'frameProtocol',
@@ -244,18 +157,7 @@ export function getFormSchema(params: any = {}) {
dict: dict({
data: getDictOptions(DICT_TYPE.common_whether),
}),
- },
- conditionalRender: {
- match({ form }) {
- return true;
- },
- render({ form }) {
- return (
-
- {getDictObj(DICT_TYPE.common_whether, form.frameProtocol)?.label}
-
- );
- },
+ disabled: true,
},
},
frameProtocolCtr: {
@@ -269,21 +171,7 @@ export function getFormSchema(params: any = {}) {
dict: dict({
data: getDictOptions(DICT_TYPE.common_whether),
}),
- },
- conditionalRender: {
- match({ form }) {
- return true;
- },
- render({ form }) {
- return (
-
- {
- getDictObj(DICT_TYPE.common_whether, form.frameProtocolCtr)
- ?.label
- }
-
- );
- },
+ disabled: true,
},
},
organiza: {
@@ -294,7 +182,7 @@ export function getFormSchema(params: any = {}) {
name: 'fs-dict-radio',
vModel: 'value',
allowClear: false,
- class: 'min-w-[200px]',
+ class: 'min-w-[180px]',
dict: dict({
data: getDictOptions(DICT_TYPE.contract_organization_form),
}),
diff --git a/apps/web-contract/src/views/contract/declaration/list/index.vue b/apps/web-contract/src/views/contract/declaration/list/index.vue
index 59b8f736..ccbbd73f 100644
--- a/apps/web-contract/src/views/contract/declaration/list/index.vue
+++ b/apps/web-contract/src/views/contract/declaration/list/index.vue
@@ -162,6 +162,16 @@ const searchForm = ref({
{{ row.ctrName }}
+
+
+
{{ row.unit }} (共{{ row.children.length || 0 }}人用餐)
++ {{ row.unit }} + + ({{ row.children.length }}人) + +
{{ row.unit }} (共{{ row.children.length || 0 }}人用餐)
++ {{ row.unit }} + + ({{ row.children.length }}人) + +
diff --git a/apps/web-office/src/views/meeting/config/components/addressor-sort-setting/addressor-sort-edit-modal.vue b/apps/web-office/src/views/meeting/config/components/addressor-sort-setting/addressor-sort-edit-modal.vue new file mode 100644 index 00000000..8fda8dbc --- /dev/null +++ b/apps/web-office/src/views/meeting/config/components/addressor-sort-setting/addressor-sort-edit-modal.vue @@ -0,0 +1,144 @@ + + +