From 6e8d9f4154fbb5f6e1ae7109ebb93a04365a58a5 Mon Sep 17 00:00:00 2001
From: WenShiJun <piratecaptain37@aliyun.com>
Date: Sat, 30 Mar 2024 16:01:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=BC=96=E8=BE=91=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8D=E7=A7=B0=E6=B2=A1=E6=9C=89=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?bug=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/labor_contract/components/add.vue   |  2 +-
 src/views/labor_contract/details.vue          |  7 ++++++-
 .../management_staffing/components/add.vue    | 16 ++++++++--------
 src/views/management_staffing/index.vue       | 17 +++++++++++++++--
 .../occupational_hazards/components/add.vue   |  2 +-
 src/views/occupational_hazards/details.vue    |  7 ++++++-
 .../management_agreement/components/add.vue   |  2 +-
 .../management_agreement/index.vue            |  7 ++++++-
 .../safety_assessment/components/add.vue      |  2 +-
 src/views/safety_assessment/index.vue         | 19 ++++++++++++++++---
 .../safety_activities/components/add.vue      |  2 +-
 .../safety_activities/index.vue               |  7 ++++++-
 .../safety_manual/components/add.vue          |  2 +-
 .../safety_culture/safety_manual/index.vue    |  7 ++++++-
 .../safety_production/components/add.vue      |  2 +-
 src/views/safety_production/index.vue         |  7 ++++++-
 .../safety_responsibility/components/add.vue  |  2 +-
 src/views/safety_responsibility/details.vue   |  7 ++++++-
 .../security_commitment/components/add.vue    |  2 +-
 src/views/security_commitment/details.vue     |  7 ++++++-
 20 files changed, 96 insertions(+), 30 deletions(-)

diff --git a/src/views/labor_contract/components/add.vue b/src/views/labor_contract/components/add.vue
index bc8d65c..82c2b0a 100644
--- a/src/views/labor_contract/components/add.vue
+++ b/src/views/labor_contract/components/add.vue
@@ -24,7 +24,7 @@
         <layout-upload
           v-model:file-list="form.file"
           accept=".pdf"
-          :limit="9"
+          :limit="1"
           :size="100"
         />
       </el-form-item>
diff --git a/src/views/labor_contract/details.vue b/src/views/labor_contract/details.vue
index 0f1267c..f681534 100644
--- a/src/views/labor_contract/details.vue
+++ b/src/views/labor_contract/details.vue
@@ -102,7 +102,7 @@
 <script setup>
 import { useRoute } from "vue-router";
 import useListData from "@/assets/js/useListData.js";
-import { serialNumber } from "@/assets/js/utils.js";
+import { addingPrefixToFile, serialNumber } from "@/assets/js/utils.js";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { nextTick, reactive, ref } from "vue";
 import Add from "@/views/labor_contract/components/add.vue";
@@ -162,6 +162,11 @@ const fnAddOrEdit = async (
         ...detail,
         OPERATINGCOMPANY: detail.CORP_NAME,
       };
+      data.addOrEditDialog.form.file = addingPrefixToFile([
+        {
+          FILEPATH: detail.ATTACHMENT_ROUTE,
+        },
+      ]);
     }
   } else {
     data.addOrEditDialog.form = { USER_ID };
diff --git a/src/views/management_staffing/components/add.vue b/src/views/management_staffing/components/add.vue
index 5c99a59..3215ef2 100644
--- a/src/views/management_staffing/components/add.vue
+++ b/src/views/management_staffing/components/add.vue
@@ -30,7 +30,7 @@
         <layout-upload
           v-model:file-list="form.file"
           accept=".pdf"
-          :limit="9"
+          :limit="1"
           :size="100"
         />
       </el-form-item>
@@ -43,13 +43,13 @@
           placeholder="选择时间"
         />
       </el-form-item>
-      <el-form-item label="备注" prop="MEETING_CONTENT">
-        <el-input
-          v-model="form.MEETING_CONTENT"
-          placeholder="请输入内容"
-          style="width: 300px"
-        ></el-input>
-      </el-form-item>
+      <!--      <el-form-item label="备注" prop="MEETING_CONTENT">-->
+      <!--        <el-input-->
+      <!--          v-model="form.MEETING_CONTENT"-->
+      <!--          placeholder="请输入内容"-->
+      <!--          style="width: 300px"-->
+      <!--        ></el-input>-->
+      <!--      </el-form-item>-->
     </el-form>
     <template #footer>
       <el-button @click="fnClose">取消</el-button>
diff --git a/src/views/management_staffing/index.vue b/src/views/management_staffing/index.vue
index 8fbe7b9..6571704 100644
--- a/src/views/management_staffing/index.vue
+++ b/src/views/management_staffing/index.vue
@@ -122,7 +122,7 @@
 </template>
 
 <script setup>
-import { serialNumber } from "@/assets/js/utils";
+import { addingPrefixToFile, serialNumber } from "@/assets/js/utils";
 import useListData from "@/assets/js/useListData.js";
 import Add from "./components/add.vue";
 import { nextTick, reactive } from "vue";
@@ -151,7 +151,20 @@ const fnAddOrEdit = async (STAFFING_ID = "", type = "add") => {
   data.addOrEditDialog.visible = true;
   data.addOrEditDialog.type = type;
   if (type === "edit" && STAFFING_ID) {
-    data.addOrEditDialog.form.STAFFING_ID = STAFFING_ID;
+    const resData = await infoStaffingView({ STAFFING_ID });
+    if (resData) {
+      const detail = resData.pd;
+      data.addOrEditDialog.form = {
+        ...detail,
+        OPERATINGCOMPANY: detail.CORP_NAME,
+        EXPIRYDATE: detail.EXPIRYDATE,
+      };
+      data.addOrEditDialog.form.file = addingPrefixToFile([
+        {
+          FILEPATH: detail.ATTACHMENT_ROUTE,
+        },
+      ]);
+    }
   } else {
     data.addOrEditDialog.form = {};
   }
diff --git a/src/views/occupational_hazards/components/add.vue b/src/views/occupational_hazards/components/add.vue
index bef47b2..46700f8 100644
--- a/src/views/occupational_hazards/components/add.vue
+++ b/src/views/occupational_hazards/components/add.vue
@@ -28,7 +28,7 @@
         <layout-upload
           v-model:file-list="form.file"
           accept=".pdf"
-          :limit="9"
+          :limit="1"
           :size="100"
         />
       </el-form-item>
diff --git a/src/views/occupational_hazards/details.vue b/src/views/occupational_hazards/details.vue
index 7f0d2de..7b67e84 100644
--- a/src/views/occupational_hazards/details.vue
+++ b/src/views/occupational_hazards/details.vue
@@ -104,7 +104,7 @@
 <script setup>
 import { useRoute } from "vue-router";
 import useListData from "@/assets/js/useListData.js";
-import { serialNumber } from "@/assets/js/utils.js";
+import { addingPrefixToFile, serialNumber } from "@/assets/js/utils.js";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { nextTick, reactive, ref } from "vue";
 import Add from "@/views/occupational_hazards/components/add.vue";
@@ -166,6 +166,11 @@ const fnAddOrEdit = async (
         ...detail,
         OPERATINGCOMPANY: detail.CORP_NAME,
       };
+      data.addOrEditDialog.form.file = addingPrefixToFile([
+        {
+          FILEPATH: detail.ATTACHMENT_ROUTE,
+        },
+      ]);
     }
   } else {
     data.addOrEditDialog.form = { USER_ID };
diff --git a/src/views/production_course_regulate/management_agreement/components/add.vue b/src/views/production_course_regulate/management_agreement/components/add.vue
index 8003826..31eb037 100644
--- a/src/views/production_course_regulate/management_agreement/components/add.vue
+++ b/src/views/production_course_regulate/management_agreement/components/add.vue
@@ -27,7 +27,7 @@
         <layout-upload
           v-model:file-list="form.file"
           accept=".pdf"
-          :limit="9"
+          :limit="1"
           :size="100"
         />
         <!--        <span>{{ form.ATTACHMENT_NAME }}</span>-->
diff --git a/src/views/production_course_regulate/management_agreement/index.vue b/src/views/production_course_regulate/management_agreement/index.vue
index 44ee903..f714a92 100644
--- a/src/views/production_course_regulate/management_agreement/index.vue
+++ b/src/views/production_course_regulate/management_agreement/index.vue
@@ -125,7 +125,7 @@
 </template>
 
 <script setup>
-import { serialNumber } from "@/assets/js/utils";
+import { addingPrefixToFile, serialNumber } from "@/assets/js/utils";
 import useListData from "@/assets/js/useListData.js";
 import Add from "./components/add.vue";
 import { nextTick, reactive } from "vue";
@@ -166,6 +166,11 @@ const fnAddOrEdit = async (MANAGEMENTAGREEMENT_ID = "", type = "add") => {
         OPERATINGCOMPANY: detail.CORP_NAME,
         ATTACHMENT_NAME: attachmentName,
       };
+      data.addOrEditDialog.form.file = addingPrefixToFile([
+        {
+          FILEPATH: detail.ATTACHMENT_ROUTE,
+        },
+      ]);
     }
   } else {
     data.addOrEditDialog.form = {}; // 新增时清空表单
diff --git a/src/views/safety_assessment/components/add.vue b/src/views/safety_assessment/components/add.vue
index 4779fe6..cb4b465 100644
--- a/src/views/safety_assessment/components/add.vue
+++ b/src/views/safety_assessment/components/add.vue
@@ -24,7 +24,7 @@
         <layout-upload
           v-model:file-list="form.file"
           accept=".pdf"
-          :limit="9"
+          :limit="1"
           :size="100"
         />
       </el-form-item>
diff --git a/src/views/safety_assessment/index.vue b/src/views/safety_assessment/index.vue
index f613985..7841fc9 100644
--- a/src/views/safety_assessment/index.vue
+++ b/src/views/safety_assessment/index.vue
@@ -121,7 +121,7 @@
 </template>
 
 <script setup>
-import { serialNumber } from "@/assets/js/utils";
+import { addingPrefixToFile, serialNumber } from "@/assets/js/utils";
 import useListData from "@/assets/js/useListData.js";
 import Add from "./components/add.vue";
 import { nextTick, reactive } from "vue";
@@ -146,18 +146,31 @@ const data = reactive({
     info: {},
   },
 });
+
 const fnAddOrEdit = async (SAFETYASSESSMENT_ID = "", type = "add") => {
   data.addOrEditDialog.visible = true;
   data.addOrEditDialog.type = type;
   if (type === "edit" && SAFETYASSESSMENT_ID) {
-    data.addOrEditDialog.form.SAFETYASSESSMENT_ID = SAFETYASSESSMENT_ID;
+    const resData = await infoAssessmentView({ SAFETYASSESSMENT_ID });
+    if (resData) {
+      const detail = resData.pd;
+      data.addOrEditDialog.form = {
+        ...detail,
+        OPERATINGCOMPANY: detail.CORP_NAME,
+        EXPIRYDATE: detail.EXPIRYDATE,
+      };
+      data.addOrEditDialog.form.file = addingPrefixToFile([
+        {
+          FILEPATH: detail.ATTACHMENT_ROUTE,
+        },
+      ]);
+    }
   } else {
     data.addOrEditDialog.form = {};
   }
 
   await nextTick();
 };
-
 const fnView = async (SAFETYASSESSMENT_ID) => {
   const resData = await infoAssessmentView({
     SAFETYASSESSMENT_ID,
diff --git a/src/views/safety_culture/safety_activities/components/add.vue b/src/views/safety_culture/safety_activities/components/add.vue
index 19d579d..e443c53 100644
--- a/src/views/safety_culture/safety_activities/components/add.vue
+++ b/src/views/safety_culture/safety_activities/components/add.vue
@@ -23,7 +23,7 @@
         <layout-upload
           v-model:file-list="form.file"
           accept=".pdf"
-          :limit="9"
+          :limit="1"
           :size="100"
         />
       </el-form-item>
diff --git a/src/views/safety_culture/safety_activities/index.vue b/src/views/safety_culture/safety_activities/index.vue
index 8031964..d03d242 100644
--- a/src/views/safety_culture/safety_activities/index.vue
+++ b/src/views/safety_culture/safety_activities/index.vue
@@ -121,7 +121,7 @@
 </template>
 
 <script setup>
-import { serialNumber } from "@/assets/js/utils";
+import { addingPrefixToFile, serialNumber } from "@/assets/js/utils";
 import useListData from "@/assets/js/useListData.js";
 import Add from "./components/add.vue";
 import { nextTick, reactive } from "vue";
@@ -157,6 +157,11 @@ const fnAddOrEdit = async (ACTIVITIES_ID = "", type = "add") => {
         OPERATINGCOMPANY: resData.pd.CORP_NAME,
         EXPIRYDATE: resData.pd.EXPIRYDATE,
       };
+      data.addOrEditDialog.form.file = addingPrefixToFile([
+        {
+          FILEPATH: resData.pd.ATTACHMENT_ROUTE,
+        },
+      ]);
     }
   } else {
     data.addOrEditDialog.form = {};
diff --git a/src/views/safety_culture/safety_manual/components/add.vue b/src/views/safety_culture/safety_manual/components/add.vue
index c764759..f0164cf 100644
--- a/src/views/safety_culture/safety_manual/components/add.vue
+++ b/src/views/safety_culture/safety_manual/components/add.vue
@@ -23,7 +23,7 @@
         <layout-upload
           v-model:file-list="form.file"
           accept=".pdf"
-          :limit="9"
+          :limit="1"
           :size="100"
         />
       </el-form-item>
diff --git a/src/views/safety_culture/safety_manual/index.vue b/src/views/safety_culture/safety_manual/index.vue
index 7d08cdf..e3387bf 100644
--- a/src/views/safety_culture/safety_manual/index.vue
+++ b/src/views/safety_culture/safety_manual/index.vue
@@ -116,7 +116,7 @@
 </template>
 
 <script setup>
-import { serialNumber } from "@/assets/js/utils";
+import { addingPrefixToFile, serialNumber } from "@/assets/js/utils";
 import useListData from "@/assets/js/useListData.js";
 import Add from "./components/add.vue";
 import { nextTick, reactive } from "vue";
@@ -153,6 +153,11 @@ const fnAddOrEdit = async (MANUAL_ID = "", type = "add") => {
         OPERATINGCOMPANY: resData.pd.CORP_NAME,
         EXPIRYDATE: resData.pd.EXPIRYDATE,
       };
+      data.addOrEditDialog.form.file = addingPrefixToFile([
+        {
+          FILEPATH: resData.pd.ATTACHMENT_ROUTE,
+        },
+      ]);
     }
   } else {
     data.addOrEditDialog.form = {};
diff --git a/src/views/safety_production/components/add.vue b/src/views/safety_production/components/add.vue
index ebbb912..f6a42f6 100644
--- a/src/views/safety_production/components/add.vue
+++ b/src/views/safety_production/components/add.vue
@@ -24,7 +24,7 @@
         <layout-upload
           v-model:file-list="form.file"
           accept=".pdf"
-          :limit="9"
+          :limit="1"
           :size="100"
         />
       </el-form-item>
diff --git a/src/views/safety_production/index.vue b/src/views/safety_production/index.vue
index 21afb28..85f3231 100644
--- a/src/views/safety_production/index.vue
+++ b/src/views/safety_production/index.vue
@@ -121,7 +121,7 @@
 </template>
 
 <script setup>
-import { serialNumber } from "@/assets/js/utils";
+import { addingPrefixToFile, serialNumber } from "@/assets/js/utils";
 import useListData from "@/assets/js/useListData.js";
 import Add from "./components/add.vue";
 import { nextTick, reactive } from "vue";
@@ -158,6 +158,11 @@ const fnAddOrEdit = async (SAFETYPRODUCTION_ID = "", type = "add") => {
         OPERATINGCOMPANY: detail.CORP_NAME,
         EXPIRYDATE: detail.EXPIRYDATE,
       };
+      data.addOrEditDialog.form.file = addingPrefixToFile([
+        {
+          FILEPATH: detail.ATTACHMENT_ROUTE,
+        },
+      ]);
     }
   } else {
     data.addOrEditDialog.form = {};
diff --git a/src/views/safety_responsibility/components/add.vue b/src/views/safety_responsibility/components/add.vue
index 5052991..d2edf5e 100644
--- a/src/views/safety_responsibility/components/add.vue
+++ b/src/views/safety_responsibility/components/add.vue
@@ -28,7 +28,7 @@
         <layout-upload
           v-model:file-list="form.file"
           accept=".pdf"
-          :limit="9"
+          :limit="1"
           :size="100"
         />
       </el-form-item>
diff --git a/src/views/safety_responsibility/details.vue b/src/views/safety_responsibility/details.vue
index 6d7889c..78a8a80 100644
--- a/src/views/safety_responsibility/details.vue
+++ b/src/views/safety_responsibility/details.vue
@@ -104,7 +104,7 @@
 <script setup>
 import { useRoute } from "vue-router";
 import useListData from "@/assets/js/useListData.js";
-import { serialNumber } from "@/assets/js/utils.js";
+import { addingPrefixToFile, serialNumber } from "@/assets/js/utils.js";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { nextTick, reactive, ref } from "vue";
 import Add from "@/views/safety_responsibility/components/add.vue";
@@ -166,6 +166,11 @@ const fnAddOrEdit = async (
         ...detail,
         OPERATINGCOMPANY: detail.CORP_NAME,
       };
+      data.addOrEditDialog.form.file = addingPrefixToFile([
+        {
+          FILEPATH: detail.ATTACHMENT_ROUTE,
+        },
+      ]);
     }
   } else {
     data.addOrEditDialog.form = { USER_ID };
diff --git a/src/views/security_commitment/components/add.vue b/src/views/security_commitment/components/add.vue
index b4b20f9..66e4ddb 100644
--- a/src/views/security_commitment/components/add.vue
+++ b/src/views/security_commitment/components/add.vue
@@ -29,7 +29,7 @@
         <layout-upload
           v-model:file-list="form.file"
           accept=".pdf"
-          :limit="9"
+          :limit="1"
           :size="100"
         />
       </el-form-item>
diff --git a/src/views/security_commitment/details.vue b/src/views/security_commitment/details.vue
index 796e949..9dcac82 100644
--- a/src/views/security_commitment/details.vue
+++ b/src/views/security_commitment/details.vue
@@ -109,7 +109,7 @@ import {
   getSafetyCommitmentUserList,
 } from "@/request/traffic_safety_commitment.js";
 import useListData from "@/assets/js/useListData.js";
-import { serialNumber } from "@/assets/js/utils.js";
+import { addingPrefixToFile, serialNumber } from "@/assets/js/utils.js";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { nextTick, reactive, ref } from "vue";
 import Add from "@/views/security_commitment/components/add.vue";
@@ -168,6 +168,11 @@ const fnAddOrEdit = async (
         ...detail,
         OPERATINGCOMPANY: detail.CORP_NAME,
       };
+      data.addOrEditDialog.form.file = addingPrefixToFile([
+        {
+          FILEPATH: detail.ATTACHMENT_ROUTE,
+        },
+      ]);
     }
   } else {
     data.addOrEditDialog.form = { USER_ID };