diff --git a/src/App.vue b/src/App.vue
index 1605650..a089008 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -79,7 +79,7 @@
line-height: 35px;
}
-
diff --git a/src/components/SimpleForm/src/components/SimpleFormItem.vue b/src/components/SimpleForm/src/components/SimpleFormItem.vue
index ec7ae10..9e16f5c 100644
--- a/src/components/SimpleForm/src/components/SimpleFormItem.vue
+++ b/src/components/SimpleForm/src/components/SimpleFormItem.vue
@@ -491,4 +491,14 @@
display: none;
}
}
+ .ant-input-number-disabled {
+ border: none !important;
+ background-color: transparent !important;
+ padding-left: 0 !important;
+ color: rgb(0 0 0 / 85%) !important;
+ }
+
+ .ant-input-disabled {
+ color: rgb(0 0 0 / 85%) !important;
+ }
diff --git a/src/views/mdm/Bank/components/Form.vue b/src/views/mdm/Bank/components/Form.vue
index 616c970..ecf17b7 100644
--- a/src/views/mdm/Bank/components/Form.vue
+++ b/src/views/mdm/Bank/components/Form.vue
@@ -24,7 +24,7 @@
const { filterFormSchemaAuth } = usePermission();
const { mergeFormSchemas,mergeFormEventConfigs } = useFormConfig();
const { currentRoute } = useRouter();
-
+ const isView = currentRoute.value.query.isView
const RowKey = 'id';
const emits = defineEmits(['changeUploadComponentIds','loadingCompleted', 'form-mounted']);
const props = defineProps({
@@ -44,6 +44,11 @@
let customFormEventConfigs=[];
onMounted(async () => {
+ formProps.schemas?.forEach(v => {
+ if (v.field === 'code') {
+ v.component = 'Input'
+ }
+ })
try {
// 合并渲染覆盖配置中的字段配置、表单事件配置
await mergeCustomFormRenderConfig();
diff --git a/src/views/mdm/Bank/components/config.ts b/src/views/mdm/Bank/components/config.ts
index 3ce3596..6a37d7a 100644
--- a/src/views/mdm/Bank/components/config.ts
+++ b/src/views/mdm/Bank/components/config.ts
@@ -15,11 +15,6 @@ export const searchFormSchema: FormSchema[] = [
label: '银行名称/简称',
component: 'Input',
},
- {
- field: 'code',
- label: '编码',
- component: 'Input',
- },
{
field: 'bankCode',
label: '联行号',
@@ -38,6 +33,11 @@ export const searchFormSchema: FormSchema[] = [
getPopupContainer: () => document.body,
},
},
+ {
+ field: 'code',
+ label: '编码',
+ component: 'Input',
+ },
// {
// field: 'fullName',
// label: '银行名称',
diff --git a/src/views/mdm/Bank/index.vue b/src/views/mdm/Bank/index.vue
index 8a357f4..53364e6 100644
--- a/src/views/mdm/Bank/index.vue
+++ b/src/views/mdm/Bank/index.vue
@@ -1,5 +1,5 @@
-
+
@@ -215,7 +215,8 @@ const logPath = ref('/mdm/bank/datalog');
query: {
formPath: 'mdm/Bank',
formName: formName,
- formId:currentRoute.value.meta.formId
+ formId:currentRoute.value.meta.formId,
+ isView: true
}
});
}
@@ -374,6 +375,9 @@ const logPath = ref('/mdm/bank/datalog');
.cusFormStyle .cusSearchForm .advanceRow> div:nth-of-type(3){
display: none;
}
+ .bankStyle .w-full .advanceRow> div:nth-of-type(4){
+ display: none;
+ }
diff --git a/src/views/mdm/Category/components/Form.vue b/src/views/mdm/Category/components/Form.vue
index c28742e..e9e278c 100644
--- a/src/views/mdm/Category/components/Form.vue
+++ b/src/views/mdm/Category/components/Form.vue
@@ -24,7 +24,7 @@
const { filterFormSchemaAuth } = usePermission();
const { mergeFormSchemas,mergeFormEventConfigs } = useFormConfig();
const { currentRoute } = useRouter();
-
+ const isView = currentRoute.value.query.isView
const RowKey = 'id';
const emits = defineEmits(['changeUploadComponentIds','loadingCompleted', 'form-mounted']);
const props = defineProps({
@@ -44,6 +44,11 @@
let customFormEventConfigs=[];
onMounted(async () => {
+ formProps.schemas?.forEach(v => {
+ if (v.field === 'code') {
+ v.componentProps.disabled = (isView ? true : false)
+ }
+ })
try {
// 合并渲染覆盖配置中的字段配置、表单事件配置
await mergeCustomFormRenderConfig();
diff --git a/src/views/mdm/Category/components/config.ts b/src/views/mdm/Category/components/config.ts
index 269e053..1e784e3 100644
--- a/src/views/mdm/Category/components/config.ts
+++ b/src/views/mdm/Category/components/config.ts
@@ -281,29 +281,24 @@ export const formProps: FormProps = {
colProps: { span: 24 },
defaultValue: '',
componentProps: {
- width: '100%',
- span: '',
- defaultValue: '',
labelWidthMode: 'fix',
labelFixWidth: 120,
responsive: false,
- respNewRow: false,
+ width: '100%',
+ span: '',
+ defaultValue: null,
+ min: 0,
+ max: null,
placeholder: '请输入车/数量单位',
maxlength: null,
- prefix: '',
- suffix: '',
- min:0,
- addonBefore: '',
- addonAfter: '',
disabled: false,
- allowClear: false,
showLabel: true,
+ controls: true,
required: false,
+ subTotal: false,
+ isShow: true,
rules: [],
events: {},
- isSave: false,
- isShow: true,
- scan: false,
style: { width: '100%' }
}
},
diff --git a/src/views/mdm/Category/index.vue b/src/views/mdm/Category/index.vue
index e17b06d..13c8f63 100644
--- a/src/views/mdm/Category/index.vue
+++ b/src/views/mdm/Category/index.vue
@@ -202,7 +202,8 @@
query: {
formPath: 'mdm/Category',
formName: formName,
- formId: currentRoute.value.meta.formId
+ formId: currentRoute.value.meta.formId,
+ isView: true
}
});
}
diff --git a/src/views/mdm/CountryRegion/components/Form.vue b/src/views/mdm/CountryRegion/components/Form.vue
index 34a91a4..cf74a2b 100644
--- a/src/views/mdm/CountryRegion/components/Form.vue
+++ b/src/views/mdm/CountryRegion/components/Form.vue
@@ -24,7 +24,7 @@
const { filterFormSchemaAuth } = usePermission();
const { mergeFormSchemas,mergeFormEventConfigs } = useFormConfig();
const { currentRoute } = useRouter();
-
+ const isView = currentRoute.value.query.isView
const RowKey = 'id';
const emits = defineEmits(['changeUploadComponentIds','loadingCompleted', 'form-mounted']);
const props = defineProps({
@@ -44,6 +44,11 @@
let customFormEventConfigs=[];
onMounted(async () => {
+ formProps.schemas?.forEach(v => {
+ if (v.field === 'code') {
+ v.componentProps.disabled = (isView ? true : false)
+ }
+ })
try {
let curParentId=currentRoute.value.query.id;
diff --git a/src/views/mdm/CountryRegion/index.vue b/src/views/mdm/CountryRegion/index.vue
index 5ca86f2..d551be4 100644
--- a/src/views/mdm/CountryRegion/index.vue
+++ b/src/views/mdm/CountryRegion/index.vue
@@ -7,6 +7,7 @@
search
show-line
:show-icon="false"
+ :selectedKeys="selectedKeysTree"
:clickRowToExpand="true"
:treeData="treeData"
:fieldNames="{ key: 'id', title: 'fullName' }"
@@ -84,6 +85,7 @@
const customConfigColums =ref(filterColumns);
const customSearchFormSchema =ref(searchFormSchema);
const selectedKeys = ref([]);
+ const selectedKeysTree = ref(['0']);
const tableRef = ref();
//所有按钮
const buttons = ref([{"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"isUse":true,"name":"启用","code":"enable","icon":"ant-design:form-outlined","isDefault":true,"type":"primary"},{"isUse":true,"name":"作废","code":"disable","icon":"ant-design:stop-outlined","isDefault":true,"type":"dashed"},{"name":"刷新","code":"refresh","icon":"ant-design:reload-outlined","isDefault":true,"isUse":true},{"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"name":"数据日志","code":"datalog","icon":"ant-design:profile-outlined","isDefault":true,"isUse":true},{"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]);
@@ -128,7 +130,7 @@
showResetButton: true,
},
beforeFetch: (params) => {
- return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
+ return { ...params, pid:selectId.value||'0', FormId: formIdComputedRef.value, PK: 'id' };
},
afterFetch: (res) => {
tableRef.value.setToolBarWidth();
@@ -226,7 +228,8 @@
query: {
formPath: 'mdm/CountryRegion',
formName: formName,
- formId:currentRoute.value.meta.formId
+ formId:currentRoute.value.meta.formId,
+ isView: true
}
});
}
@@ -311,7 +314,7 @@
}
function handleRefresh() {
// reload();
- reload({ searchInfo: { pid: selectId.value=='0'?'': selectId.value } });
+ reload({ searchInfo: { pid: selectId.value } });
fetchTree()
}
function handleSuccess() {
diff --git a/src/views/mdm/Currency/components/Form.vue b/src/views/mdm/Currency/components/Form.vue
index 290109f..ebbe948 100644
--- a/src/views/mdm/Currency/components/Form.vue
+++ b/src/views/mdm/Currency/components/Form.vue
@@ -24,7 +24,7 @@
const { filterFormSchemaAuth } = usePermission();
const { mergeFormSchemas,mergeFormEventConfigs } = useFormConfig();
const { currentRoute } = useRouter();
-
+ const isView = currentRoute.value.query.isView
const RowKey = 'id';
const emits = defineEmits(['changeUploadComponentIds','loadingCompleted', 'form-mounted']);
const props = defineProps({
@@ -44,6 +44,11 @@
let customFormEventConfigs=[];
onMounted(async () => {
+ formProps.schemas?.forEach(v => {
+ if (v.field === 'code') {
+ v.componentProps.disabled = (isView ? true : false)
+ }
+ })
try {
// 合并渲染覆盖配置中的字段配置、表单事件配置
await mergeCustomFormRenderConfig();
diff --git a/src/views/mdm/Currency/index.vue b/src/views/mdm/Currency/index.vue
index f8f9156..61bbafa 100644
--- a/src/views/mdm/Currency/index.vue
+++ b/src/views/mdm/Currency/index.vue
@@ -204,7 +204,8 @@
query: {
formPath: 'mdm/Currency',
formName: formName,
- formId: currentRoute.value.meta.formId
+ formId: currentRoute.value.meta.formId,
+ isView: true
}
});
}
diff --git a/src/views/mdm/DocCp/components/Form.vue b/src/views/mdm/DocCp/components/Form.vue
index 7eef78e..0c6bdef 100644
--- a/src/views/mdm/DocCp/components/Form.vue
+++ b/src/views/mdm/DocCp/components/Form.vue
@@ -19,7 +19,7 @@
const { filterFormSchemaAuth } = usePermission();
const { mergeFormSchemas, mergeFormEventConfigs } = useFormConfig();
const { currentRoute } = useRouter();
-
+ const isView = currentRoute.value.path.includes('viewForm')
const RowKey = 'id';
const emits = defineEmits(['changeUploadComponentIds', 'loadingCompleted', 'form-mounted']);
const props = defineProps({
@@ -38,7 +38,9 @@
console.log(data.formDataProps, 'datadata');
let customFormEventConfigs = [];
-
+ const formObj = ref()
+ let num = 0
+ let num1 = 0
onMounted(async () => {
try {
// 合并渲染覆盖配置中的字段配置、表单事件配置
@@ -108,6 +110,7 @@
}
setFieldsValue(record);
state.formModel = record;
+ formObj.value = record
await getFormDataEvent(customFormEventConfigs, state.formModel, systemFormRef.value, formProps.schemas); //表单事件：获取表单数据
return record;
} catch (error) {}
@@ -183,28 +186,42 @@
return await deleteLngBDocCp([id]);
}
watch(
- () => systemFormRef.value?.formModel,
+ () => systemFormRef.value?.formModel.cuSign,
+ (val) => {
+ let cuNecSignProps = data.formDataProps.schemas?.filter((item) => item.field === 'cuNecSign')[0];
+ let obj = systemFormRef.value?.formModel
+ if (val=='Y' && val == formObj.value?.cuSign && !num)return
+ val&&num++
+ if (val === 'N') {
+ obj.cuNecSign = 'N';
+ cuNecSignProps.componentProps.disabled = true;
+ }
+ if (val === 'Y') {
+ obj.cuNecSign = 'Y';
+ cuNecSignProps.componentProps.disabled = isView ? true: false;
+ }
+ setFieldsValue(obj)
+ },
+ {
+ deep: true
+ }
+ )
+ watch(
+ () => systemFormRef.value?.formModel.suSign,
(val) => {
- let suNecSignProps = data.formDataProps.schemas?.filter((item) => item.field === 'suNecSign')[0];
- let cuNecSignProps = data.formDataProps.schemas?.filter((item) => item.field === 'cuNecSign')[0];
- if (val.suNecSign == 'N' && !suNecSignProps.componentProps.disabled && val.suSign != 'N' && val.cuNecSign != 'N') return
- if (val.suSign === 'N') {
- val.suNecSign = 'N';
- suNecSignProps.componentProps.disabled = true;
+ let suNecSignProps = data.formDataProps.schemas?.filter((item) => item.field === 'suNecSign')[0];
+ let obj = systemFormRef.value?.formModel
+ if (val=='Y' && val == formObj.value?.suSign && !num1)return
+ val&&num1++
+ if (val== 'N') {
+ obj.suNecSign = 'N';
+ suNecSignProps.componentProps.disabled = true;
}
- if (val.suSign === 'Y') {
- suNecSignProps.componentProps.disabled = false;
- val.suNecSign = 'Y';
- }
- if (val.cuNecSign == 'N' && !cuNecSignProps.componentProps.disabled && val.cuSign != 'N') return
- if (val.cuSign === 'N') {
- val.cuNecSign = 'N';
- cuNecSignProps.componentProps.disabled = true;
- }
- if (val.cuSign === 'Y') {
- val.cuNecSign = 'Y';
- cuNecSignProps.componentProps.disabled = false;
+ if (val === 'Y') {
+ suNecSignProps.componentProps.disabled = isView ? true: false;
+ obj.suNecSign = 'Y';
}
+ setFieldsValue(obj)
},
{
deep: true
diff --git a/src/views/mdm/LNGStation/components/config.ts b/src/views/mdm/LNGStation/components/config.ts
index a909648..0b0b844 100644
--- a/src/views/mdm/LNGStation/components/config.ts
+++ b/src/views/mdm/LNGStation/components/config.ts
@@ -367,25 +367,28 @@ export const formProps: FormProps = {
key: '1485b829c80a493bb55f37d1c839ccc9',
field: 'regionCode',
label: '行政区域',
- type: 'area',
- component: 'Area',
+ type: 'areacascader',
+ component: 'AreaCascader',
colProps: { span: 8 },
componentProps: {
- width: '100%',
- span: '',
- labelWidthMode: 'fix',
- labelFixWidth: 120,
- responsive: false,
- respNewRow: false,
- placeholder: '请选择行政区域',
- showLabel: true,
- disabled: false,
- allowClear: false,
- required: false,
- rules: [],
- events: {},
- isShow: true,
- style: { width: '100%' }
+ width: '100%',
+ span: '',
+ labelWidthMode: 'fix',
+ labelFixWidth: 120,
+ responsive: false,
+ respNewRow: false,
+ placeholder: '请选择区域',
+ showLabel: true,
+ disabled: false,
+ allowClear: true,
+ clearable: false,
+ required: false,
+ rules: [],
+ events: {},
+ isShow: true,
+ style: { width: '100%' },
+ fieldNames: {label: 'fullName', value: 'code', children: 'children'},
+ excludeType: 'CONTINENT'
}
},
{
diff --git a/src/views/mdm/PipelineGgasLine/components/Form.vue b/src/views/mdm/PipelineGgasLine/components/Form.vue
index a7a86f5..ff2b36c 100644
--- a/src/views/mdm/PipelineGgasLine/components/Form.vue
+++ b/src/views/mdm/PipelineGgasLine/components/Form.vue
@@ -59,6 +59,7 @@ watch(
} else {
data.formDataProps.schemas?.forEach(v => {
if (v.field === 'staCodeLng') {
+ newVal.staCodeLng = ''
v.componentProps.disabled = true
v.componentProps.required = false
}
diff --git a/src/views/mdm/Port/components/config.ts b/src/views/mdm/Port/components/config.ts
index 4b4e9a5..6304116 100644
--- a/src/views/mdm/Port/components/config.ts
+++ b/src/views/mdm/Port/components/config.ts
@@ -293,31 +293,31 @@ export const formProps: FormProps = {
responsive: false,
width: '100%',
span: '',
- defaultValue: 0.0,
- formatter(value: number) {
- if (!value) return '';
- console.log(value);
+ defaultValue: null,
+ // formatter(value: number) {
+ // if (!value) return '';
+ // console.log(value);
- // 3. 保留4位小数（toFixed会自动四舍五入）
- const fixedNum = parseFloat(value).toFixed(4); // 结果为字符串，如 "12345.6700"、"-1234.5679"
+ // // 3. 保留4位小数（toFixed会自动四舍五入）
+ // const fixedNum = parseFloat(value).toFixed(4); // 结果为字符串，如 "12345.6700"、"-1234.5679"
- // 4. 分割整数部分和小数部分
- const [integerPart, decimalPart] = fixedNum.split('.');
+ // // 4. 分割整数部分和小数部分
+ // const [integerPart, decimalPart] = fixedNum.split('.');
- // 5. 处理整数部分：添加千分位分隔符
- // 正则解释：\B 匹配非单词边界，(?=(\d{3})+(?!\d)) 正向预查每3位数字
- const formattedInteger = integerPart.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+ // // 5. 处理整数部分：添加千分位分隔符
+ // // 正则解释：\B 匹配非单词边界，(?=(\d{3})+(?!\d)) 正向预查每3位数字
+ // const formattedInteger = integerPart.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
- // 6. 拼接整数、小数部分，返回结果
- return `${formattedInteger}.${decimalPart}`;
- // return value.toLocaleString('zh-CN', {
- // minimumFractionDigits: 4,
- // maximumFractionDigits: 4
- // });
- },
+ // // 6. 拼接整数、小数部分，返回结果
+ // return `${formattedInteger}.${decimalPart}`;
+ // // return value.toLocaleString('zh-CN', {
+ // // minimumFractionDigits: 4,
+ // // maximumFractionDigits: 4
+ // // });
+ // },
min: null,
max: null,
- step: 0.0001,
+ // step: 0.0001,
maxlength: '',
disabled: false,
showLabel: true,
@@ -343,12 +343,12 @@ export const formProps: FormProps = {
labelFixWidth: 120,
responsive: false,
width: '100%',
- precision: '6',
+ // precision: '6',
span: '',
defaultValue: null,
min: null,
max: null,
- step: 0.000001,
+ // step: 0.000001,
disabled: false,
showLabel: true,
controls: true,
@@ -372,14 +372,14 @@ export const formProps: FormProps = {
labelWidthMode: 'fix',
labelFixWidth: 120,
responsive: false,
- precision: '6',
+ // precision: '6',
width: '100%',
span: '',
defaultValue: null,
min: null,
max: null,
- step: 0.00001,
+ // step: 0.00001,
disabled: false,
showLabel: true,
controls: true,
@@ -565,7 +565,7 @@ export const formProps: FormProps = {
showSearch: false,
clearable: false,
disabled: true,
- mode: 'multiple',
+ // mode: 'multiple',
staticOptions: [
{ key: 1, label: 'Option 1', value: 'Option 1' },
{ key: 2, label: 'Option 2', value: 'Option 2' },
diff --git a/src/views/mdm/PriceTerms/components/Form.vue b/src/views/mdm/PriceTerms/components/Form.vue
index 96617c7..43c06e8 100644
--- a/src/views/mdm/PriceTerms/components/Form.vue
+++ b/src/views/mdm/PriceTerms/components/Form.vue
@@ -26,6 +26,7 @@
const { currentRoute } = useRouter();
const RowKey = 'id';
+ const isView = currentRoute.value.query.isView
const emits = defineEmits(['changeUploadComponentIds','loadingCompleted', 'form-mounted']);
const props = defineProps({
fromPage: {
@@ -44,6 +45,11 @@
let customFormEventConfigs=[];
onMounted(async () => {
+ formProps.schemas?.forEach(v => {
+ if (v.field === 'code') {
+ v.componentProps.disabled = (isView ? true : false)
+ }
+ })
try {
// 合并渲染覆盖配置中的字段配置、表单事件配置
await mergeCustomFormRenderConfig();
diff --git a/src/views/mdm/PriceTerms/index.vue b/src/views/mdm/PriceTerms/index.vue
index 09d8925..06f2ae4 100644
--- a/src/views/mdm/PriceTerms/index.vue
+++ b/src/views/mdm/PriceTerms/index.vue
@@ -201,7 +201,8 @@
query: {
formPath: 'mdm/PriceTerms',
formName: formName,
- formId: currentRoute.value.meta.formId
+ formId: currentRoute.value.meta.formId,
+ isView:true
}
});
}
diff --git a/src/views/mdm/TaxRate/components/Form.vue b/src/views/mdm/TaxRate/components/Form.vue
index a23005e..5e2e8cb 100644
--- a/src/views/mdm/TaxRate/components/Form.vue
+++ b/src/views/mdm/TaxRate/components/Form.vue
@@ -24,7 +24,7 @@
const { filterFormSchemaAuth } = usePermission();
const { mergeFormSchemas,mergeFormEventConfigs } = useFormConfig();
const { currentRoute } = useRouter();
-
+ const isView = currentRoute.value.query.isView
const RowKey = 'id';
const emits = defineEmits(['changeUploadComponentIds','loadingCompleted', 'form-mounted']);
const props = defineProps({
@@ -44,6 +44,11 @@
let customFormEventConfigs=[];
onMounted(async () => {
+ formProps.schemas?.forEach(v => {
+ if (v.field === 'code') {
+ v.componentProps.disabled = (isView ? true : false)
+ }
+ })
try {
// 合并渲染覆盖配置中的字段配置、表单事件配置
await mergeCustomFormRenderConfig();
diff --git a/src/views/mdm/TaxRate/index.vue b/src/views/mdm/TaxRate/index.vue
index fcc5ceb..ced243a 100644
--- a/src/views/mdm/TaxRate/index.vue
+++ b/src/views/mdm/TaxRate/index.vue
@@ -203,7 +203,8 @@
query: {
formPath: 'mdm/TaxRate',
formName: formName,
- formId:currentRoute.value.meta.formId
+ formId:currentRoute.value.meta.formId,
+ isView: true
}
});
}
diff --git a/src/views/sales/Customer/components/bankListModal.vue b/src/views/sales/Customer/components/bankListModal.vue
index 26f3536..9ae9e54 100644
--- a/src/views/sales/Customer/components/bankListModal.vue
+++ b/src/views/sales/Customer/components/bankListModal.vue
@@ -1,6 +1,6 @@
-
@@ -175,4 +175,7 @@
z-index: 1001 !important;
}
+ .bankListModal .ant-modal-mask {
+ z-index: 1001 !important;
+ }
diff --git a/src/views/sales/Customer/components/certificateModal.vue b/src/views/sales/Customer/components/certificateModal.vue
index 8ab2991..f95f27f 100644
--- a/src/views/sales/Customer/components/certificateModal.vue
+++ b/src/views/sales/Customer/components/certificateModal.vue
@@ -1,6 +1,6 @@
-
+
@@ -28,7 +28,7 @@
-
+
{{ fileTip }}
diff --git a/src/views/sales/Customer/components/createForm.vue b/src/views/sales/Customer/components/createForm.vue
index a77ad52..de901e7 100644
--- a/src/views/sales/Customer/components/createForm.vue
+++ b/src/views/sales/Customer/components/createForm.vue
@@ -1,6 +1,6 @@
-
+
@@ -27,7 +27,7 @@
-
+
@@ -676,18 +676,21 @@
try {
const data = await request(obj);
- if (type) {
- data?.id && (formState.id = data.id)
- data?.cuCode && (formState.cuCode = data.cuCode)
- if (!type) {
- notification.success({
- message: 'Tip',
- description: data?.id ? t('新增成功！') : t('修改成功！')
- }); //提示消息
- }
+ // 新增保存
+ // data?.id && (formState.id = data.id)
+ // data?.cuCode && (Object.assign(formState, {cuCode: data?.cuCode}))
+ if (data?.id) {
+ getList(data?.id)
+ }
+ // 同意保存不提示
+ if (!type) {
+ notification.success({
+ message: 'Tip',
+ description: data?.id ? t('新增成功！') : t('修改成功！')
+ }); //提示消息
}
// formRef.value.resetFields();
- return data?.id ? data : formState
+ return data?.id ? data : obj
// setTimeout(() => {
// bus.emit(FORM_LIST_MODIFIED, { path: formPath });
// close();
@@ -700,7 +703,7 @@
} catch (errorInfo) {
spinning.value = false;
console.log(errorInfo, 'errorInfo')
- errorInfo?.value && notification.warning({
+ errorInfo?.errorFields?.length && notification.warning({
message: 'Tip',
description: '请完善信息'
});
@@ -734,4 +737,9 @@
font-size: 20px;
font-weight: bold;
}
+
+
+
+
+
diff --git a/src/views/sales/Customer/index.vue b/src/views/sales/Customer/index.vue
index 4cfb2d8..fabd341 100644
--- a/src/views/sales/Customer/index.vue
+++ b/src/views/sales/Customer/index.vue
@@ -79,7 +79,7 @@
//所有按钮
const buttons = ref([{"isUse":true,"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"type":"primary"},{"isUse":true,"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"启用","code":"enable","icon":"ant-design:form-outlined","isDefault":true,"type":"primary"},{"isUse":true,"name":"作废","code":"disable","icon":"ant-design:stop-outlined","isDefault":true,"type":"dashed"},{"isUse":true,"name":"刷新","code":"refresh","icon":"ant-design:reload-outlined","isDefault":true},{"isUse":true,"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true},{"isUse":true,"name":"发起审批","code":"startwork","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"查看流转记录","code":"flowRecord","icon":"ant-design:form-outlined","isDefault":true}]);
//展示在列表内的按钮
- const actionButtons = ref(['view', 'edit','datalog', 'copyData', 'enable', 'disable', 'startwork','flowRecord']);
+ const actionButtons = ref(['view', 'edit','datalog', 'copyData', 'startwork','flowRecord']);
const buttonConfigs = computed(()=>{
return filterButtonAuth(buttons.value);
})
@@ -145,13 +145,19 @@
dataIndex: 'action',
slots: { customRender: 'action' },
},
+ rowSelection: {
+ type: 'checkbox',
+ onChange: onSelectChange
+ },
tableSetting: {
size: false,
setting: false,
},
});
-
+ function onSelectChange(rowKeys: string[]) {
+ selectedKeys.value = rowKeys;
+ }
function dbClickRow(record) {
if (!actionButtonConfig?.value.some(element => element.code == 'view')) {
return;
@@ -261,16 +267,16 @@
}
function handleEnable(record: Recordable) {
- // if (!selectedKeys.value.length) {
- // notification.warning({
- // message: 'Tip',
- // description: t('请选择需要启用的数据'),
- // });
- // return;
- // }
+ if (!selectedKeys.value.length) {
+ notification.warning({
+ message: 'Tip',
+ description: t('请选择需要启用的数据'),
+ });
+ return;
+ }
- // let ids = selectedKeys.value;
- let ids = [record.id]
+ let ids = selectedKeys.value;
+ // let ids = [record.id]
Modal.confirm({
title: '提示信息',
icon: createVNode(ExclamationCircleOutlined),
@@ -291,15 +297,15 @@
}
function handleDisable(record: Recordable) {
- let ids = [record.id]
- // if (!selectedKeys.value.length) {
- // notification.warning({
- // message: 'Tip',
- // description: t('请选择需要禁用的数据'),
- // });
- // return;
- // }
- // let ids = selectedKeys.value;
+ // let ids = [record.id]
+ if (!selectedKeys.value.length) {
+ notification.warning({
+ message: 'Tip',
+ description: t('请选择需要禁用的数据'),
+ });
+ return;
+ }
+ let ids = selectedKeys.value;
Modal.confirm({
title: '提示信息',
icon: createVNode(ExclamationCircleOutlined),
@@ -406,13 +412,13 @@
actionsList = actionsList.concat(editAndDelBtn);
}
}
- if (record.approCode === 'YSP') {
- let idx = actionsList.findIndex(v =>v.tooltip == '作废')
- idx>-1 && actionsList.splice(idx, 1)
- } else {
- let idx = actionsList.findIndex(v =>v.tooltip == '启用')
- idx>-1 && actionsList.splice(idx, 1)
- }
+ // if (record.approCode === 'YSP' && record.valid!='有效') {
+ // let idx = actionsList.findIndex(v =>v.tooltip == '作废')
+ // idx>-1 && actionsList.splice(idx, 1)
+ // } else {
+ // let idx = actionsList.findIndex(v =>v.tooltip == '启用')
+ // record.valid=='有效' && idx>-1 && actionsList.splice(idx, 1)
+ // }
return actionsList;
}
diff --git a/src/views/secondDev/createFlow.vue b/src/views/secondDev/createFlow.vue
index f009f65..7c9f4e0 100644
--- a/src/views/secondDev/createFlow.vue
+++ b/src/views/secondDev/createFlow.vue
@@ -358,7 +358,7 @@
let obj = {}
system[key] = false
- let value = await formInformation.value.handleSubmit();
+ let value = await formInformation.value.handleSubmit(true);
obj[key] = value
mainFormModels.value = obj
console.log(mainFormModels.value, 6666)