diff --git a/src/api/machine/machineProject.js b/src/api/machine/machineProject.js
new file mode 100644
index 0000000..eae4f7b
--- /dev/null
+++ b/src/api/machine/machineProject.js
@@ -0,0 +1,19 @@
+import {createAPI} from "../../utils/httpRequest";
+
+export const queryMachinePage = (data) => createAPI(`/machine/project/machineList`,'get',data)
+
+export const queryMachineList = (data) => createAPI(`/quote`,'post',data)
+export const saveMachine = (data) => createAPI(`/machine/project/machineAdd`,'post',data)
+
+export const updateMachine = (data) => createAPI(`/machine/project/machineEdit`,'put',data)
+export const getMachineById = (data) => createAPI(`/machine/project/getMachineById`,'get',data)
+
+
+export const machineDelete = (data) => createAPI(`/machine/project/machineDelete/${data.id}`,'post',data)
+
+export const projectUpdateStatus = (data) => createAPI(`/machine/project/machineProjectUpdateStatus`,'post',data)
+export const searchUserAuthMachineProjectApplicationInfo = (data) => createAPI(`/machine/project/searchUserAuthMachineProjectApplicationInfo`,'get',data)
+export const updateProjectAuthHist = data => createAPI(`/machine/project/updateProjectAuthHist`,'post',data)
+export const queryMachineProjectAuthList = data => createAPI(`/machine/project/searchMachineProjectAuthRecords`,'get',data)
+
+export const sendTextLoraWatch = data => createAPI(`/pms/eam/sendTextLoraWatch`,'post',data)
diff --git a/src/api/machine/machineProjectIncome.js b/src/api/machine/machineProjectIncome.js
new file mode 100644
index 0000000..13d0a47
--- /dev/null
+++ b/src/api/machine/machineProjectIncome.js
@@ -0,0 +1,32 @@
+import { createAPI } from "../../utils/httpRequest";
+
+export const queryMachineProjectIncomeList = (data) => createAPI(`/machine/projectIncome/incomeList`, 'get', data)
+export const saveMachineProjectIncome = (data) => createAPI(`/machine/projectIncome/projectIncomeAdd`, 'post', data)
+export const updateMachineProjectIncome = (data) => createAPI(`/machine/projectIncome/projectIncomeEdit`, 'put', data)
+export const deleteProjectIncome = (data) => createAPI(`/machine/projectIncome/projectIncomeDelete/${data.id}`,'post',data)
+
+export const queryMachineProjectPlanList = (data) => createAPI(`/machine/projectPlan/planList`, 'get', data)
+export const saveMachineProjectPlan = (data) => createAPI(`/machine/projectPlan/projectPlanAdd`, 'post', data)
+export const updateMachineProjectPlan = (data) => createAPI(`/machine/projectPlan/projectPlanEdit`, 'put', data)
+export const deleteProjectPlan = (data) => createAPI(`/machine/projectPlan/projectPlanDelete/${data.id}`,'post',data)
+
+export const queryMachineProjectTaskList = (data) => createAPI(`/machine/projectTask/taskList`, 'get', data)
+export const saveMachineProjectTask = (data) => createAPI(`/machine/projectTask/projectTaskAdd`, 'post', data)
+export const updateMachineProjectTask = (data) => createAPI(`/machine/projectTask/projectTaskEdit`, 'put', data)
+export const deleteProjectTask = (data) => createAPI(`/machine/projectTask/projectTaskDelete/${data.id}`,'post',data)
+
+
+export const queryMachineProjectCloseList = (data) => createAPI(`/machine/projectClose/closeList`, 'get', data)
+export const saveMachineProjectClose = (data) => createAPI(`/machine/projectClose/projectCloseAdd`, 'post', data)
+export const updateMachineProjectClose = (data) => createAPI(`/machine/projectClose/projectCloseEdit`, 'put', data)
+export const deleteProjectClose = (data) => createAPI(`/machine/projectClose/projectCloseDelete/${data.id}`,'post',data)
+export const projectCloseAuthSearch = data => createAPI(`/machine/projectClose/projectCloseAuthSearch`,'post',data)
+export const saveBatchProjectClose = (data) => createAPI(`/machine/projectClose/saveBatchProjectClose`, 'post', data)
+export const projectCloseUpdateStatus = (data) => createAPI(`/machine/projectClose/projectCloseUpdateStatus`, 'post', data)
+
+export const currencyList = (data) => createAPI(`/currency/queryList`, 'post', data)
+
+export const projectIncomeUpload = (data) => createAPI(`/machine/projectIncome/upload`,'post',data)
+export const projectIncomeQueryOss = (data) => createAPI(`/machine/projectIncome/queryOssFile`,'post',data)
+
+
diff --git a/src/api/orderIssure/soIssueNotify.js b/src/api/orderIssure/soIssueNotify.js
index 25615d0..81db155 100644
--- a/src/api/orderIssure/soIssueNotify.js
+++ b/src/api/orderIssure/soIssueNotify.js
@@ -41,3 +41,6 @@ export const searchOtherPart= data => createAPI(`/orderIssure/issureNotify/searc
export const searchNotifyLog= data => createAPI(`/orderIssure/issureNotify/searchNotifyLog`,'post',data)
export const deleteNotifyMaterialWithOutLog= data => createAPI(`/orderIssure/issureNotify/deleteNotifyMaterialWithOutLog`,'post',data)
export const searchNotifyLogClose= data => createAPI(`/orderIssure/issureNotify/searchNotifyLogClose`,'post',data)
+
+
+export const updateNotifyConfirmStatus= data => createAPI(`/orderIssure/issureNotify/updateNotifyConfirmStatus`,'post',data)
diff --git a/src/api/user.js b/src/api/user.js
index 52f2da9..70dc716 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -7,3 +7,6 @@ export const updateUserLanguage = data => createAPI(`/sys/user/updateUserLanguag
// 获取用户列表
export const userList = data => createAPI(`/sys/user/userList`,'Post',data)
+
+export const userChooseComponentList = data => createAPI(`/sys/user/userChooseComponentList`,'get',data)
+export const userChooseComponentPage = data => createAPI(`/sys/user/userChooseComponentPage`,'get',data)
diff --git a/src/components/selector/user/userChooseComponent.vue b/src/components/selector/user/userChooseComponent.vue
new file mode 100644
index 0000000..f2bf2ca
--- /dev/null
+++ b/src/components/selector/user/userChooseComponent.vue
@@ -0,0 +1,144 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/auth/authMachineProject.vue b/src/views/modules/auth/authMachineProject.vue
new file mode 100644
index 0000000..62837e7
--- /dev/null
+++ b/src/views/modules/auth/authMachineProject.vue
@@ -0,0 +1,1314 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查 询
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row[item.columnProp] }}
+ ![]()
+
+
+
+
+ 审批
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{'同意'}}
+
+ {{'不同意'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+ {{ formatContent(scope.row.projectIncome) }}
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+ 修改
+ 下达
+ 删除
+ 选择结案人员
+
+ 详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/machine/modules/machineProjectCloseAuthForm.vue b/src/views/modules/machine/modules/machineProjectCloseAuthForm.vue
new file mode 100644
index 0000000..df0fdce
--- /dev/null
+++ b/src/views/modules/machine/modules/machineProjectCloseAuthForm.vue
@@ -0,0 +1,230 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+ 可选结案人
+
+
+
+
+
+
+
+
+
+
+
+ 添加>>
+
+
+ 删除
+
+
+
+ 已有结案人
+
+
+
+
+
+
+
+
+
+
+
+ 确
+ 定
+ 关闭
+
+
+
+
+
+
+
+
+
+ 确认
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/machine/modules/machineProjectDetailForm.vue b/src/views/modules/machine/modules/machineProjectDetailForm.vue
new file mode 100644
index 0000000..d9e3487
--- /dev/null
+++ b/src/views/modules/machine/modules/machineProjectDetailForm.vue
@@ -0,0 +1,255 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/machine/modules/machineProjectForm.vue b/src/views/modules/machine/modules/machineProjectForm.vue
new file mode 100644
index 0000000..71a51f9
--- /dev/null
+++ b/src/views/modules/machine/modules/machineProjectForm.vue
@@ -0,0 +1,340 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 项目负责人
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
新增
+
+
+
+
+
+
+
+ {{ formatContent(scope.row.incomeName) }}
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+ {{ formatContent(scope.row.remark) }}
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/machine/modules/machineProjectPlanTable.vue b/src/views/modules/machine/modules/machineProjectPlanTable.vue
new file mode 100644
index 0000000..6ac05ce
--- /dev/null
+++ b/src/views/modules/machine/modules/machineProjectPlanTable.vue
@@ -0,0 +1,263 @@
+
+
+
新增
+
+
+
+
+
+
+ {{ formatContent(scope.row.planDescribe) }}
+
+
+
+
+ {{ formatContent(scope.row.remark) }}
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/machine/modules/machineProjectTaskTable.vue b/src/views/modules/machine/modules/machineProjectTaskTable.vue
new file mode 100644
index 0000000..c4059d4
--- /dev/null
+++ b/src/views/modules/machine/modules/machineProjectTaskTable.vue
@@ -0,0 +1,262 @@
+
+
+
新增
+
+
+
+
+
+
+ {{ formatContent(scope.row.taskDescribe) }}
+
+
+
+
+ {{ formatContent(scope.row.remark) }}
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+ {{ '导出' }}
+
+
+
+
+
+
+
+ {{ scope.row[item.columnProp] }}
+ ![]()
+
+
+
+
+
+ 取消确认
+ 确认
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+ {{ scope.row[item.columnProp] }}
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+ {{ scope.row[item.columnProp] }}
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row[item.columnProp] }}
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row[item.columnProp] }}
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row[item.columnProp] }}
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 关闭
+
+
+
+
+
上传附件
+
下载
+
+
+
+
+ {{scope.row[item.columnProp]}}
+ ![]()
+
+
+
+
+ 删除
+ 预览
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 将文件拖到此处，或点击上传
+
+
+
+
+
+
+
+
+
+
+
+
+