diff --git a/src/request/keyprojects.js b/src/request/keyprojects.js
index a26cbf6..bfcd5d8 100644
--- a/src/request/keyprojects.js
+++ b/src/request/keyprojects.js
@@ -36,8 +36,8 @@ export const setOutsourcedGoEdit = (params) =>
post("/outsourced/goEdit", params); // 重点工程修改获取
export const setOutsourcedDelete = (params) =>
post("/outsourced/delete", params); // 重点工程修改获取
-export const getOutsourcedJie = (params) => post("/outsourced/jie", params); // 结束工程
-export const getOutsourcedStart = (params) => post("/outsourced/start", params); // 结束工程
+export const getOutsourcedUpdateState = (params) =>
+ post("/outsourced/updateState", params); // 结束工程
export const getKeyprojectcheckList = (params) =>
post("/keyprojectcheck/list", params); // 安全环保检查列表
diff --git a/src/views/keyprojects/hidden/index.vue b/src/views/keyprojects/hidden/index.vue
index 36fdcd2..bf71380 100644
--- a/src/views/keyprojects/hidden/index.vue
+++ b/src/views/keyprojects/hidden/index.vue
@@ -46,11 +46,6 @@
{{ row.DEPARTMENT_NAME }}
-
检查信息
- {{ data.info.INSPECTION_CATEGORY }}
+
{{ data.info.HIDDENDESCR }}
@@ -53,10 +62,12 @@
import { getKeyprojectcheckFindHidden } from "@/request/keyprojects";
import { reactive } from "vue";
import { useRoute } from "vue-router";
+const VITE_FILE_URL = import.meta.env.VITE_FILE_URL;
const route = useRoute();
const data = reactive({
info: {},
+ hiddenImgs: [],
});
const fnGetData = async () => {
@@ -64,6 +75,7 @@ const fnGetData = async () => {
HIDDEN_ID: route.query.HIDDEN_ID,
});
data.info = resData.pd;
+ data.hiddenImgs = resData.pd.hiddenImgs;
};
fnGetData();
diff --git a/src/views/keyprojects/inspection/index.vue b/src/views/keyprojects/inspection/index.vue
index 3204217..70b1ece 100644
--- a/src/views/keyprojects/inspection/index.vue
+++ b/src/views/keyprojects/inspection/index.vue
@@ -46,11 +46,6 @@
{{ row.DEPARTMENT_NAME }}
-
@@ -82,6 +83,7 @@
@@ -103,65 +105,14 @@
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
+
+
@@ -303,6 +254,7 @@ const rules = {
const data = reactive({
form: {
+ STATE: "0",
acceptanceList: [
{
id: Math.random(),
diff --git a/src/views/keyprojects/outsourced/index.vue b/src/views/keyprojects/outsourced/index.vue
index 38bce01..545ae11 100644
--- a/src/views/keyprojects/outsourced/index.vue
+++ b/src/views/keyprojects/outsourced/index.vue
@@ -87,12 +87,13 @@
{{ row.DEPARTMENT_NAME }}
-
- 未开始
+ 未开工
进行中
已结束
+ 开工申请中
+ 结束申请中
@@ -117,19 +118,19 @@
type="primary"
text
link
- v-if="row.STATE === '1'"
+ v-if="row.STATE === '-2'"
@click="fnHandleJie(row.OUTSOURCED_ID)"
>
- 结束
+ 结束审批
- 审批
+ 开工审批
{
await ElMessageBox.confirm("确定要结束吗?", {
type: "warning",
});
- const resData = await getOutsourcedJie({ OUTSOURCED_ID });
- if (resData.code === "0") {
- ElMessage.success("操作成功");
- } else {
- ElMessage.warning(resData.message);
- }
+ await getOutsourcedUpdateState({ OUTSOURCED_ID, STATE: "2" });
+ ElMessage.success("已结束");
fnGetData();
};
const fnHandleStart = async (OUTSOURCED_ID) => {
- const resData = await getOutsourcedStart({ OUTSOURCED_ID });
- if (resData.code === "0") {
- ElMessage.success("审批成功");
- } else {
- ElMessage.warning(resData.message);
- }
+ await ElMessageBox.confirm("确定要开工吗?", {
+ type: "warning",
+ });
+ await getOutsourcedUpdateState({ OUTSOURCED_ID, STATE: "1" });
+ ElMessage.success("已开工");
fnGetData();
};
diff --git a/src/views/keyprojects/outsourced/view.vue b/src/views/keyprojects/outsourced/view.vue
index b649080..4395be6 100644
--- a/src/views/keyprojects/outsourced/view.vue
+++ b/src/views/keyprojects/outsourced/view.vue
@@ -35,20 +35,14 @@
{{ data.info.INVOLVING_CORPS_DEPART_NAME }}
-
- {{ data.info.GROUP_UNIT_NAME }}
-
{{ data.info.STARTTIME }} 至 {{ data.info.ENDTIME }}
-
- {{ data.info.UNITS_NAME }}
-
-
+
{{ data.info.CONTRACT_NUM }}
-
- {{ data.info.MANAGE_CORPS_NAME }}
+
+ {{ data.info.UNITS_NAME }}
{{ data.info.UNITS_PIC_NAME }}
@@ -56,19 +50,12 @@
{{ data.info.UNITS_PHONE }}
-
- {{ data.info.MANAGE_PIC }}
-
-
- {{ data.info.MANAGE_PHONE }}
-
-
- {{ data.info.IS_SMS === "0" ? "是" : "否" }}
-
- 未开始
+ 未开工
进行中
已结束
+ 开工申请中
+ 结束申请中
处罚相关
diff --git a/src/views/keyprojects/personnelmanagement/index.vue b/src/views/keyprojects/personnelmanagement/index.vue
index 43666f5..c301200 100644
--- a/src/views/keyprojects/personnelmanagement/index.vue
+++ b/src/views/keyprojects/personnelmanagement/index.vue
@@ -148,12 +148,9 @@ const data = reactive({
});
const resetPwd = async (PERSONNELMANAGEMENT_ID, NAME) => {
- await ElMessageBox.confirm(
- "是否将[" + NAME + "]的密码重置为 666666 吗?",
- {
- type: "warning",
- }
- );
+ await ElMessageBox.confirm("是否将[" + NAME + "]的密码重置为 666666 吗?", {
+ type: "warning",
+ });
await setPersonnelmanagementResetPwd({ PERSONNELMANAGEMENT_ID });
ElMessage.success("重置成功");
};
@@ -200,7 +197,7 @@ const fnGoEdit = async (id) => {
const fnResetPaginationTransfer = () => {
fnGetData(searchForm);
- tableRef.value.clearSelection()
+ tableRef.value.clearSelection();
};
const fnAdd = () => {
diff --git a/src/views/keyprojects/punish/index.vue b/src/views/keyprojects/punish/index.vue
index a61d1f4..815987f 100644
--- a/src/views/keyprojects/punish/index.vue
+++ b/src/views/keyprojects/punish/index.vue
@@ -46,11 +46,6 @@
{{ row.DEPARTMENT_NAME }}
-