@@ -138,10 +154,12 @@
icon="Edit"
@click="handleEdit2(scope.row)"
class="text-blue-600 hover:text-blue-800 transition-colors"
+ v-hasPermi="['cailiaoshebei:physicalsupplySon:edit']"
>
diff --git a/src/views/materials/usageMaterials/purchase/index.vue b/src/views/materials/usageMaterials/purchase/index.vue
index 580da40..2d078e1 100644
--- a/src/views/materials/usageMaterials/purchase/index.vue
+++ b/src/views/materials/usageMaterials/purchase/index.vue
@@ -1,19 +1,36 @@
-
+
-
+
新增
- 刷新
+
+ 刷新
-
+ :row-class-name="tableRowClassName"
+ >
@@ -38,14 +55,34 @@
-
-
-
-
+
+
+
+
@@ -53,17 +90,27 @@
- 共 {{ total }} 条记录，当前显示第 {{ (currentPage - 1) * pageSize + 1 }} 至 {{ Math.min(currentPage * pageSize, total)
- }} 条
+ 共 {{ total }} 条记录，当前显示第 {{ (currentPage - 1) * pageSize + 1 }} 至 {{ Math.min(currentPage * pageSize, total) }} 条
-
+
-
+
@@ -107,8 +154,12 @@
-
+
@@ -121,8 +172,7 @@
-
+
@@ -143,7 +193,6 @@
-
\ No newline at end of file
+ routeParams.value = proxy.$route.query;
+ console.log('routeParams.value', routeParams.value);
+ materialsUsageDetails1();
+});
+
diff --git a/src/views/out/constructionValue/index.vue b/src/views/out/constructionValue/index.vue
index 555c353..ff6efb9 100644
--- a/src/views/out/constructionValue/index.vue
+++ b/src/views/out/constructionValue/index.vue
@@ -208,7 +208,20 @@ const data = reactive
>({
artificialNum: [{ required: true, message: '人工填报数量不能为空', trigger: 'blur' }],
reportDateId: [{ required: true, message: '上报日期不能为空', trigger: 'blur' }],
uavNum: [{ required: true, message: '无人机识别数量不能为空', trigger: 'blur' }],
- confirmNum: [{ required: true, message: '确认数量不能为空', trigger: 'blur' }],
+ confirmNum: [
+ { required: true, message: '确认数量不能为空', trigger: 'blur' },
+ {
+ validator: (rule: any, value: any, callback: any) => {
+ // 判断是否整数
+ if (!/^\d+$/.test(value)) {
+ callback(new Error('请输入整数'));
+ } else {
+ callback();
+ }
+ },
+ trigger: 'blur'
+ }
+ ],
outValue: [{ required: true, message: '产值不能为空', trigger: 'blur' }]
}
});
diff --git a/src/views/progress/progressCategory/index.vue b/src/views/progress/progressCategory/index.vue
index 7e92e55..6ff7948 100644
--- a/src/views/progress/progressCategory/index.vue
+++ b/src/views/progress/progressCategory/index.vue
@@ -73,7 +73,7 @@
-
+
修改
@@ -88,6 +88,21 @@
+
+
+
+
+
+
+
+
@@ -100,7 +115,14 @@
-
+
+
+
+
+
+
+
+
@@ -128,7 +150,7 @@ import { ProgressCategoryVO, ProgressCategoryQuery, ProgressCategoryForm } from
import { useUserStoreHook } from '@/store/modules/user';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { progress_unit_type, progress_status } = toRefs(proxy?.useDict('progress_unit_type', 'progress_status'));
+const { progress_unit_type, progress_work_type } = toRefs(proxy?.useDict('progress_unit_type', 'progress_work_type'));
// 获取用户 store
const userStore = useUserStoreHook();
@@ -161,7 +183,7 @@ const dialog = reactive({
const initFormData: ProgressCategoryForm = {
id: undefined,
parentId: undefined,
- projectId: currentProject.value?.id,
+ projectId: '',
matrixId: undefined,
matrixName: undefined,
name: undefined,
@@ -183,6 +205,7 @@ const data = reactive>({
queryParams: {
parentId: undefined,
projectId: currentProject.value?.id,
+
matrixId: undefined,
matrixName: undefined,
name: undefined,
@@ -229,7 +252,10 @@ const getList = async () => {
});
if (!matrixValue.value) matrixValue.value = matrixList[0].id;
matrixOptions.value = matrixList;
+ console.log('🚀 ~ getList ~ matrixList:', matrixList);
queryParams.value.matrixId = matrixList[0].children[0].matrixId;
+ form.value.projectId = matrixList[0].projectId;
+ form.value.matrixId = matrixList[0].children[0].matrixId;
}
}
loading.value = true;
@@ -262,12 +288,19 @@ const cancel = () => {
// 表单重置
const reset = () => {
- form.value = { ...initFormData };
+ const projectId = form.value.projectId;
+ const matrixId = form.value.matrixId;
+
+ form.value = { ...initFormData, projectId, matrixId };
+
isDisabled.value = false;
progressCategoryFormRef.value?.resetFields();
};
/** 级联选择器改变事件 */
const handleChange = (value: number) => {
+ form.value.matrixId = value[1];
+ form.value.projectId = value[0];
+
queryParams.value.matrixId = value[1];
getList();
diff --git a/src/views/progress/progressCategorySystemTemplate/index.vue b/src/views/progress/progressCategorySystemTemplate/index.vue
index 9bffeb7..12900fa 100644
--- a/src/views/progress/progressCategorySystemTemplate/index.vue
+++ b/src/views/progress/progressCategorySystemTemplate/index.vue
@@ -9,7 +9,7 @@
-
+
@@ -89,7 +89,7 @@
-
+
@@ -141,8 +141,8 @@ type ProgressCategoryTemplateOption = {
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { progress_work_type, progress_unit_type, project_category_type } = toRefs(
- proxy?.useDict('progress_work_type', 'progress_unit_type', 'project_category_type')
+const { progress_work_type, progress_unit_type, project_type } = toRefs(
+ proxy?.useDict('progress_work_type', 'progress_unit_type', 'project_type')
);
const progressCategoryTemplateList = ref([]);
const progressCategoryTemplateOptions = ref([]);
diff --git a/src/views/progress/progressCategoryTemplate/index.vue b/src/views/progress/progressCategoryTemplate/index.vue
index 8ccbc33..0b29e10 100644
--- a/src/views/progress/progressCategoryTemplate/index.vue
+++ b/src/views/progress/progressCategoryTemplate/index.vue
@@ -77,13 +77,13 @@
-
+
@@ -138,9 +138,7 @@ type ProgressCategoryTemplateOption = {
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { progress_work_type, progress_unit_type, project_category_type } = toRefs(
- proxy?.useDict('progress_work_type', 'progress_unit_type', 'project_category_type')
-);
+const { progress_work_type, progress_unit_type } = toRefs(proxy?.useDict('progress_work_type', 'progress_unit_type'));
// 获取用户 store
const userStore = useUserStoreHook();
// 从 store 中获取项目列表和当前选中的项目
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 05630f4..6c2f1ae 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -324,6 +324,7 @@ const getList = async () => {
if (data) {
menuList.value = data;
}
+
loading.value = false;
};
/** 查询菜单下拉树结构 */