diff --git a/app/components/lazy-load/data-entry/MainList.vue b/app/components/lazy-load/data-entry/MainList.vue index 0a8b2d5..e9e4777 100644 --- a/app/components/lazy-load/data-entry/MainList.vue +++ b/app/components/lazy-load/data-entry/MainList.vue @@ -190,15 +190,39 @@ const headerTools = computed(() => [ placeholder: "انتخاب کنید", items: [ { label: " همه", value: "all" }, - { label: " تعارض مستقر", value: "stable" }, - { label: "تعارض مشروط", value: "conditional" }, - { label: "تکرار حکم", value: "duplicate" }, + { label: "تعارض مستقر", value: "تعارض مستقر" }, + { label: "مطلق مقدم، مقید موخر", value: "مطلق مقدم، مقید موخر" }, + { label: "مقید مقدم، مطلق موخر", value: "مقید مقدم، مطلق موخر" }, + { label: "تکرار حکم", value: "تکرار حکم" }, + { label: "بدون تعارض", value: "بدون تعارض" }, ], }, }, { key: "label", - label: " وضعیت اعتبار:", + label: "اعتبار داتیک:", + }, + { + type: "dropdown", + key: "dropdown", + name: "state_etebar", + dropdownSchema: { + width: "8em", + modelValue: null, // ✅ اینو بذار + optionAttribute: "title", + valueAttribute: "value", + searchable: false, + placeholder: "انتخاب کنید", + items: [ + { label: " همه", value: "all" }, + { label: "نامعتبر", value: "invalid" }, + { label: "معتبر", value: "valid" }, + ], + }, + }, + { + key: "label", + label: "اعتبار تشخیصی:", }, { type: "dropdown", diff --git a/app/json/data-entry/myContentJson.json b/app/json/data-entry/myContentJson.json index dce93ef..9422df8 100755 --- a/app/json/data-entry/myContentJson.json +++ b/app/json/data-entry/myContentJson.json @@ -21,15 +21,15 @@ "width": "3", "trancate_word": 10 }, - { "key": "next_info.full_path", "title": "ماده موخر", "width": "1" }, + { "key": "next_info.full_path", "title": "ماده موخر", "width": "1" }, { - "key": "subject_unity.main_type", - "title": "وضعیت وحدت موضوع", + "key": "conflict_relation_identification.main_type", + "title": "تعارض- بررسی اول", "width": "2" }, { - "key": "conflict_relation_identification.main_type", - "title": "تعارض", + "key": "conflict_evaluation.main_type", + "title": "تعارض -بررسی نهایی", "width": "2" } ],