-
+
@@ -30,7 +30,7 @@
查看流程
详情
- 删除
+
diff --git a/src/views/cory/template/indexEdit.vue b/src/views/cory/template/indexEdit.vue
index 91e3fe6..3f75ed3 100644
--- a/src/views/cory/template/indexEdit.vue
+++ b/src/views/cory/template/indexEdit.vue
@@ -36,12 +36,42 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -50,7 +80,7 @@
-
+
@@ -62,27 +92,11 @@
-
-
-
-
-
-
-
-
-
-
- 上传附件
-
-
-
-
-
-
-
-
+
+
+ 上传附件
+
-
@@ -103,7 +117,7 @@
-
+
施工项目部
@@ -177,6 +191,7 @@ import { useUserStoreHook } from '@/store/modules/user';
import { listByIds } from '@/api/system/oss';
import { addContactnotice, getContactnotice, updateContactnotice } from '@/api/cory/contactnotice';
const { des_user_major } = toRefs(proxy?.useDict('des_user_major'));
+import { catalogList } from '@/api/design/designChange';
// 获取用户 store
const userStore = useUserStoreHook();
@@ -221,11 +236,11 @@ const initFormData = {
id: undefined,
projectId: currentProject.value?.id,
projectType: '',
- projectName: '',
+ projectName: currentProject.value?.name,
serialNumber: '',
to: '',
subject: '',
- costEstimation: '',
+ costEstimation: 0,
content: '',
attachments: '',
contractorLeader: '',
@@ -275,13 +290,27 @@ const handleClose = () => {
buttonLoading.value = false;
};
const { form, rules } = toRefs(data);
-
+const volumeCatalogList = ref([]);
+let volumeMap = new Map();
/** 表单重置 */
const reset = () => {
form.value = { ...initFormData };
leaveFormRef.value?.resetFields();
};
-
+// 获取卷册号列表
+const getJuance = async () => {
+ const res = await catalogList(currentProject.value?.id);
+ volumeCatalogList.value = res.data;
+ volumeCatalogList.value.forEach((e) => {
+ volumeMap.set(e.volumeNumber, e);
+ });
+};
+const handleSelect = (val) => {
+ let obj = volumeMap.get(val);
+ console.log(obj);
+ form.value.volumeName = obj.documentName;
+ form.value.specialty = obj.specialty;
+};
/** 获取详情 */
const getInfo = () => {
loading.value = true;
@@ -345,7 +374,8 @@ const handleStartWorkFlow = async (data: LeaveForm) => {
//流程变量
taskVariables.value = {
// leave4/5 使用的流程变量
- userList: ['1', '3', '4']
+ userList: ['1', '3', '4'],
+ costEstimation: form.value.costEstimation
};
submitFormData.value.variables = taskVariables.value;
const resp = await startWorkFlow(submitFormData.value);
@@ -402,6 +432,7 @@ onMounted(() => {
routeParams.value = proxy.$route.query;
thumbnailUrl.value = proxy.$route.query.thumbnailUrl;
reset();
+ getJuance();
loading.value = false;
if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
getInfo();
diff --git a/src/views/cory/workMessage/components/notice.vue b/src/views/cory/workMessage/components/notice.vue
index 08c25c1..8ab8df5 100644
--- a/src/views/cory/workMessage/components/notice.vue
+++ b/src/views/cory/workMessage/components/notice.vue
@@ -5,7 +5,7 @@
-
+
@@ -46,13 +46,16 @@
-
- 详情
+ 详情
+ 审批
-
-
+ 查看流程
+
+
@@ -191,9 +194,10 @@ const userStore = useUserStoreHook();
// 从 store 中获取项目列表和当前选中的项目
const currentProject = computed(() => userStore.selectedProject);
-const { safety_inspection_violation_type, safety_inspection_check_type, review_type, safety_inspection_type } = toRefs(
- useDict('safety_inspection_violation_type', 'safety_inspection_check_type', 'review_type', 'safety_inspection_type')
+const { safety_inspection_violation_type, safety_inspection_check_type, review_type, safety_inspection_type, wf_business_status } = toRefs(
+ useDict('safety_inspection_violation_type', 'safety_inspection_check_type', 'review_type', 'safety_inspection_type', 'wf_business_status')
);
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const safetyInspectionDetail = ref();
const form = reactive({
@@ -236,6 +240,18 @@ const handleDetail = async (row) => {
rectificationFileList.value = rectificationFileRes.data;
}
};
+const handleAddApp = (row) => {
+ // 添加审批
+ proxy.$tab.closePage(proxy.$route);
+ proxy.$router.push({
+ path: `/approval/workMessage/indexEdit`,
+ query: {
+ id: row.id,
+
+ type: 'update'
+ }
+ });
+};
const getList = (row) => {};
const handleDelete = (row) => {};
diff --git a/src/views/cory/workMessage/index.vue b/src/views/cory/workMessage/index.vue
index 71595ea..805cdc0 100644
--- a/src/views/cory/workMessage/index.vue
+++ b/src/views/cory/workMessage/index.vue
@@ -1,15 +1,12 @@
-
+
-
-
-
+
+
- 删除
+ 删除
-
+
@@ -56,14 +54,12 @@
-
+
-
+
@@ -71,8 +67,7 @@
-
+
@@ -87,16 +82,13 @@
-
+
-
+
-
+
@@ -253,8 +245,8 @@ const changeForeman = (value: string | number) => {
form.value.correctorId = '';
};
-const handleQuery = () => { };
-const resetQuery = () => { };
+const handleQuery = () => {};
+const resetQuery = () => {};
const getList = async () => {
if (!queryParams.value.projectType) {
const res = await listContactTypeformtemplate(queryParams.value);
@@ -289,7 +281,7 @@ const handleDelete = async (id?: string) => {
getList();
}
};
-const handleUpdate = () => { };
+const handleUpdate = () => {};
/** 多选框选中数据 */
const handleSelectionChange = (selection: any) => {
@@ -308,6 +300,7 @@ const selectType = (value: string) => {
const resetForm = () => {
formRef.value?.resetFields();
};
+
//监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value?.id,
diff --git a/src/views/cory/workMessage/indexEdit.vue b/src/views/cory/workMessage/indexEdit.vue
new file mode 100644
index 0000000..c04c34b
--- /dev/null
+++ b/src/views/cory/workMessage/indexEdit.vue
@@ -0,0 +1,482 @@
+
+
+
+
+
+
+
+
+
+
+
+
工作联系单审批
+
+
+
+
通知单
+
+ 填报人：{{ safetyInspectionDetail?.creatorName }}
+ 填报时间：{{ safetyInspectionDetail?.createTime }}
+
+
+ {{ currentProject?.name }}
+
+
+
+
+
+
+
+ {{ safetyInspectionDetail?.checkTime }}
+
+ {{ safetyInspectionDetail?.creatorName }}
+
+ {{ safetyInspectionDetail?.correctorName }}
+
+
+ {{ dayjs(safetyInspectionDetail?.rectificationDeadline).format('YYYY 年 MM 月 DD 日') }}
+
+
+
+
+
+
+ {{ safetyInspectionDetail?.hiddenDanger }}
+
+
+
+
+
+
+
+
+
+ {{ item.originalName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ safetyInspectionDetail?.teamName }}
+
+ {{ safetyInspectionDetail?.rectificationTime }}
+
+
+ {{ safetyInspectionDetail?.measure }}
+
+
+
+
+
+
+
+
+
+ {{ item.originalName }}
+
+
+
+
+
+
+
+
+
+
+ {{ safetyInspectionDetail?.creatorName }}
+
+ {{ safetyInspectionDetail?.reviewTime }}
+
+ {{ safetyInspectionDetail?.review }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
>({
});
const { queryParams, form, rules } = toRefs(data);
-
+const ProjectStructureList = ref([]);
/** 查询施工产值列表 */
const getList = async () => {
loading.value = true;
@@ -260,19 +273,19 @@ const handleSelectionChange = (selection: ConstructionValueVO[]) => {
/** 新增按钮操作 */
const handleAdd = async () => {
reset();
- const res = await getProjectSquare(currentProject.value?.id);
- if (res.data.length === 0) return proxy?.$modal.msgWarning('当前项目下没有方阵，请先创建方阵');
- const isFangzhen = res.data.some((item) => item.children && item.children.length);
- console.log('🚀 ~ handleAdd ~ isFangzhen:', isFangzhen);
+ // const res = await getProjectSquare(currentProject.value?.id);
+ // if (res.data.length === 0) return proxy?.$modal.msgWarning('当前项目下没有方阵，请先创建方阵');
+ // const isFangzhen = res.data.some((item) => item.children && item.children.length);
+ // console.log('🚀 ~ handleAdd ~ isFangzhen:', isFangzhen);
- if (!isFangzhen) return proxy?.$modal.msgWarning('当前项目下没有方阵，请先创建方阵');
- let matrixList = res.data.map((item) => {
- return {
- ...item,
- matrixId: item?.projectId
- };
- });
- matrixOptions.value = matrixList;
+ // if (!isFangzhen) return proxy?.$modal.msgWarning('当前项目下没有方阵，请先创建方阵');
+ // let matrixList = res.data.map((item) => {
+ // return {
+ // ...item,
+ // matrixId: item?.projectId
+ // };
+ // });
+ // matrixOptions.value = matrixList;
dialog.visible = true;
dialog.title = '添加施工产值';
};
@@ -304,6 +317,18 @@ const submitTime = async (value: string) => {
form.value.artificialNum = data?.finishedNumber;
};
+/** 查询施工进度计划列表 */
+const getProjectStructureList = async () => {
+ const res = await getProjectStructure(currentProject.value?.id);
+ ProjectStructureList.value = [res.data];
+ console.log(ProjectStructureList.value);
+};
+
+/** 查询施工进度计划列表 */
+const handleCheckChange = (val) => {
+ form.value.projectStructureName = val.name;
+};
+
/** 重置选择器 */
const resetCascader = (index?: number) => {
if (index) {
@@ -370,6 +395,7 @@ const handleExport = () => {
};
onMounted(() => {
+ getProjectStructureList();
getList();
});
diff --git a/src/views/out/purchase/comm/purchPage.vue b/src/views/out/purchase/comm/purchPage.vue
index dd854d3..2a882fd 100644
--- a/src/views/out/purchase/comm/purchPage.vue
+++ b/src/views/out/purchase/comm/purchPage.vue
@@ -24,8 +24,8 @@
-
-
+
+
@@ -76,7 +76,8 @@ const initFormData = {
valueType: undefined,
planAuditStatus: undefined,
completeAuditStatus: undefined,
- unitPrice: undefined
+ unitPrice: undefined,
+ acceptedQuantity: undefined
};
const data = reactive({
form: { ...initFormData },
diff --git a/src/views/progress/constructionSchedulePlan/index.vue b/src/views/progress/constructionSchedulePlan/index.vue
index 7109158..5342916 100644
--- a/src/views/progress/constructionSchedulePlan/index.vue
+++ b/src/views/progress/constructionSchedulePlan/index.vue
@@ -1,7 +1,6 @@
-
+
@@ -10,8 +9,7 @@
-
+
@@ -27,8 +25,7 @@
- 新增
+ 新增
展开/折叠
@@ -36,9 +33,14 @@
-
+
@@ -71,16 +73,19 @@
-
+
-
+
-
+
@@ -90,39 +95,57 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -145,7 +168,8 @@ import {
getConstructionSchedulePlan,
delConstructionSchedulePlan,
addConstructionSchedulePlan,
- updateConstructionSchedulePlan, getProjectStructure
+ updateConstructionSchedulePlan,
+ getProjectStructure
} from '@/api/progress/constructionSchedulePlan';
import {
ConstructionSchedulePlanVO,
@@ -196,7 +220,6 @@ const initFormData = {
status: undefined,
remark: undefined,
projectStructureName: undefined
-
};
const data = reactive>({
@@ -243,7 +266,7 @@ const handleCheckChange = (val) => {
/** 查询施工进度计划下拉树结构 */
const getTreeselect = async () => {
- const res = await listConstructionSchedulePlan();
+ const res = await listConstructionSchedulePlan({ projectId: currentProject.value?.id });
constructionSchedulePlanOptions.value = [];
const data: ConstructionSchedulePlanOption = { id: 0, nodeName: '顶级节点', children: [] };
data.children = proxy?.handleTree(res.data, 'id', 'parentId');
diff --git a/src/views/progress/plan/component/createDailyRate.vue b/src/views/progress/plan/component/createDailyRate.vue
index 98cefa8..6546c08 100644
--- a/src/views/progress/plan/component/createDailyRate.vue
+++ b/src/views/progress/plan/component/createDailyRate.vue
@@ -345,7 +345,6 @@ const getWorkList = (bool = false) => {
if (res.code === 200) {
state.tableData = res.rows.map((item: any, i: number) => {
item.index = i + 1;
- item.aiFill = item.detailList?.reduce((sum: number, child: any) => sum + child.aiFill, 0) || 0;
return item;
});
state.total = res.total;
diff --git a/src/views/progress/progressCategory/index.vue b/src/views/progress/progressCategory/index.vue
index f285399..0344712 100644
--- a/src/views/progress/progressCategory/index.vue
+++ b/src/views/progress/progressCategory/index.vue
@@ -34,7 +34,7 @@
:file-type="['xls', 'xlsx']"
:on-upload-success="handleSuccess"
>
- 导入
+ 导入
@@ -140,10 +140,10 @@
-
+
-
+
@@ -249,6 +249,7 @@ const initFormData: ProgressCategoryForm = {
status: undefined,
remark: undefined
};
+const labelTitle = ref('测试方阵');
const data = reactive>({
form: { ...initFormData },
@@ -323,7 +324,8 @@ const getList = async () => {
if (data) {
progressCategoryList.value = data;
progressCategoryOptions.value = [];
- const datas: ProgressCategoryOption = { id: 0, name: '顶级节点', children: [...data] };
+ const datas: ProgressCategoryOption = { id: 0, name: '顶级节点', children: [{ id: id, children: [...data], name: labelTitle.value }] };
+ // form.value.parentId = id;
progressCategoryOptions.value.push(datas);
console.log('🚀 ~ getList ~ progressCategoryOptions.value:', progressCategoryOptions.value);
loading.value = false;
@@ -336,6 +338,7 @@ const getList = async () => {
const handleSuccess = () => {
console.log(111);
proxy.$modal.msgSuccess('操作成功');
+ getList();
};
/** 查询分项工程单价下拉树结构 */
@@ -355,6 +358,8 @@ const cancel = () => {
};
const handleTabClick = (tab: any) => {
+ console.log(tab);
+ labelTitle.value = tab.props.label;
const id = tab.props.name; // 实际上就是 item.id
const current = tabList.value.find((item) => item.id === id);
if (current.matrixStructureList && current.matrixStructureList.length > 0) {
diff --git a/src/views/progress/progressCategoryTemplate/index.vue b/src/views/progress/progressCategoryTemplate/index.vue
index 5d4257b..a4bc971 100644
--- a/src/views/progress/progressCategoryTemplate/index.vue
+++ b/src/views/progress/progressCategoryTemplate/index.vue
@@ -106,7 +106,7 @@
-
+
diff --git a/src/views/project/attendance/index.vue b/src/views/project/attendance/index.vue
index 7634fdb..73ec6de 100644
--- a/src/views/project/attendance/index.vue
+++ b/src/views/project/attendance/index.vue
@@ -87,11 +87,11 @@
-
+
@@ -347,10 +347,10 @@ const getList = async () => {
/** 查询近两周考勤列表 */
const getListTwoWeek = async () => {
loading.value = true;
- const res = await listAttendanceTwoWeek(queryParams.value);
- attendanceTwoWeekList.value = res.data;
- echartsOption.value = { ...option(attendanceTwoWeekList.value) };
- commandstatsIntance.value.setOption(echartsOption.value);
+ // const res = await listAttendanceTwoWeek(queryParams.value);
+ // attendanceTwoWeekList.value = res.data;
+ // echartsOption.value = { ...option(attendanceTwoWeekList.value) };
+ // commandstatsIntance.value.setOption(echartsOption.value);
};
/** 取消按钮 */
diff --git a/src/views/project/landTransfer/BasicData/enterRoad/index.vue b/src/views/project/landTransfer/BasicData/enterRoad/index.vue
index 2c73084..a553d98 100644
--- a/src/views/project/landTransfer/BasicData/enterRoad/index.vue
+++ b/src/views/project/landTransfer/BasicData/enterRoad/index.vue
@@ -31,16 +31,20 @@
模板下载
-
-
- 导入excel
-
-
+
+
+ 导入excel
+
+
- 删除
+ 导出模版
@@ -93,7 +97,7 @@
@@ -102,7 +106,7 @@