From d0a75a5ea1ce6bc435e6b77ce99fbf49652c3dbd Mon Sep 17 00:00:00 2001
From: xiepeng <xiepeng@zcloudchina.com>
Date: Mon, 3 Jun 2024 18:01:11 +0800
Subject: [PATCH] =?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

---
 .../operation_vehicle/index.vue               |  3 +--
 .../user_practitioner/add.vue                 | 20 +++++++++----------
 .../{ => components}/review.vue               |  1 +
 .../user_practitioner/index.vue               |  3 +--
 .../management_agreement/index.vue            |  8 ++++----
 .../safety_activities/components/add.vue      |  4 +++-
 .../safety_activities/index.vue               |  8 ++++----
 .../safety_manual/components/add.vue          |  6 +++---
 .../safety_culture/safety_manual/index.vue    |  9 ++++-----
 .../safety_meeting/add.vue                    |  3 +++
 .../safety_meeting/meeting_info.vue           | 10 +++++-----
 .../components/select_person.vue              |  1 +
 .../components/add.vue                        | 13 ++++++------
 .../components/list.vue                       |  1 +
 14 files changed, 47 insertions(+), 43 deletions(-)
 rename src/views/enterprise_management/user_practitioner/{ => components}/review.vue (99%)

diff --git a/src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue b/src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue
index ac3f8bf..5b856fd 100644
--- a/src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue
+++ b/src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue
@@ -177,8 +177,7 @@
     <layout-import-file
       v-model:visible="data.importDialogVisible"
       template-url="/template/truckExcelTemplate.xls"
-      @submit="fnSubmitImport"
-    />
+      @submit="fnSubmitImport"></layout-import-file>
   </div>
 </template>
 
diff --git a/src/views/enterprise_management/user_practitioner/add.vue b/src/views/enterprise_management/user_practitioner/add.vue
index e66a219..4dcbcde 100644
--- a/src/views/enterprise_management/user_practitioner/add.vue
+++ b/src/views/enterprise_management/user_practitioner/add.vue
@@ -264,24 +264,24 @@
         <el-col :span="8">
           <el-form-item label="是否安全管理人员" prop="IS_SAFETY">
             <el-radio-group v-model="data.form.IS_SAFETY">
-              <el-radio :label="1">是</el-radio>
-              <el-radio :label="0">否</el-radio>
+              <el-radio :value="1">是</el-radio>
+              <el-radio :value="0">否</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="是否主要负责人" prop="ISHEAD">
             <el-radio-group v-model="data.form.ISHEAD">
-              <el-radio label="1">是</el-radio>
-              <el-radio label="0">否</el-radio>
+              <el-radio value="1">是</el-radio>
+              <el-radio value="0">否</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="是否部门领导" prop="ISLEADER">
             <el-radio-group v-model="data.form.ISLEADER">
-              <el-radio label="1">是</el-radio>
-              <el-radio label="0">否</el-radio>
+              <el-radio value="1">是</el-radio>
+              <el-radio value="0">否</el-radio>
             </el-radio-group>
             <!--                <el-tooltip
                   content="温馨提示：部门领导可以审核离岗申请，查看同部门清单数据"
@@ -1016,8 +1016,8 @@ const data = reactive({
     userCerFile: [],
 
     // 身份证照片
-    ID_CARD_FRONT: "",
-    ID_CARD_BACK: "",
+    ID_CARD_FRONT: [],
+    ID_CARD_BACK: [],
     // 身份证有效期
     ID_CARD_VALIDITY: [],
     ID_CARD_VALIDITY_START: "",
@@ -1028,7 +1028,7 @@ const data = reactive({
     ID_CARD_ORGAN: "",
 
     // 驾驶证照片
-    DRIVER_LICENSE: "",
+    DRIVER_LICENSE: [],
     // 驾驶证号
     DRIVER_LICENSE_NO: "",
     // 准驾车型
@@ -1048,7 +1048,7 @@ const data = reactive({
     DRIVER_LICENSE_ORGAN: "",
 
     // 道路运输从业人员从业资格证照片
-    QUALIFICATION_CERTIFICATE: "",
+    QUALIFICATION_CERTIFICATE: [],
     // 道路运输从业人员从业资格证号
     QUALIFICATION_CERTIFICATE_NO: "",
     // 从业资格类别
diff --git a/src/views/enterprise_management/user_practitioner/review.vue b/src/views/enterprise_management/user_practitioner/components/review.vue
similarity index 99%
rename from src/views/enterprise_management/user_practitioner/review.vue
rename to src/views/enterprise_management/user_practitioner/components/review.vue
index 4054543..000df19 100644
--- a/src/views/enterprise_management/user_practitioner/review.vue
+++ b/src/views/enterprise_management/user_practitioner/components/review.vue
@@ -172,6 +172,7 @@ import {
   layoutFnGetProfessionalTitle,
 } from "@/assets/js/data_dictionary.js";
 import { setPractitionerReview } from "@/request/user_practitioner.js";
+import Scheduling from "@/views/enterprise_management/user/components/scheduling.vue";
 
 const props = defineProps({
   visible: {
diff --git a/src/views/enterprise_management/user_practitioner/index.vue b/src/views/enterprise_management/user_practitioner/index.vue
index e9f9904..f55c078 100644
--- a/src/views/enterprise_management/user_practitioner/index.vue
+++ b/src/views/enterprise_management/user_practitioner/index.vue
@@ -183,7 +183,7 @@ import { nextTick, reactive, ref } from "vue";
 import { serialNumber } from "@/assets/js/utils.js";
 import useListData from "@/assets/js/useListData.js";
 import { ElMessageBox, ElMessage } from "element-plus";
-import Review from "./review.vue";
+import Review from "./components/review.vue";
 import { debounce } from "throttle-debounce";
 import useButtonJurisdiction from "@/assets/js/useButtonJurisdiction.js";
 import { useRouter } from "vue-router";
@@ -202,7 +202,6 @@ const { list, pagination, searchForm, fnGetData, fnResetPagination } =
       // APPLY_TYPE: "1-3",
     },
   });
-console.log(await getPractitionerList());
 const data = reactive({
   personnelTypeList: [],
   reviewDialog: {
diff --git a/src/views/production_course_regulate/management_agreement/index.vue b/src/views/production_course_regulate/management_agreement/index.vue
index 0ceb59f..0f3f5bd 100644
--- a/src/views/production_course_regulate/management_agreement/index.vue
+++ b/src/views/production_course_regulate/management_agreement/index.vue
@@ -15,14 +15,14 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+<!--          <el-col :span="6">
             <el-form-item label="完成状态" prop="COMPLETIONSTATUS">
               <el-select v-model="searchForm.COMPLETIONSTATUS">
                 <el-option label="已上传" :value="1" />
                 <el-option label="未上传" :value="0" />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col>-->
           <el-col :span="6">
             <el-form-item label="有效状态" prop="VALIDSTATUS">
               <el-select v-model="searchForm.VALIDSTATUS">
@@ -56,12 +56,12 @@
           </template>
         </el-table-column>
         <el-table-column prop="MANAGEMENTAGREEMENTNAME" label="名称" />
-        <el-table-column prop="COMPLETIONSTATUS" label="完成状态" width="80">
+<!--        <el-table-column prop="COMPLETIONSTATUS" label="完成状态" width="80">
           <template #default="{ row }">
             <el-tag v-if="row.COMPLETIONSTATUS === '1'">已上传</el-tag>
             <el-tag v-else-if="row.COMPLETIONSTATUS === '0'">未上传</el-tag>
           </template>
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column label="有效状态" prop="VALIDSTATUS" width="80">
           <template #default="{ row }">
             <el-tag v-if="row.VALIDSTATUS === '1'" type="success">有效</el-tag>
diff --git a/src/views/safety_culture/safety_activities/components/add.vue b/src/views/safety_culture/safety_activities/components/add.vue
index c958252..c36714c 100644
--- a/src/views/safety_culture/safety_activities/components/add.vue
+++ b/src/views/safety_culture/safety_activities/components/add.vue
@@ -19,7 +19,7 @@
       >
         <span>{{ operatingCompany }}</span>
       </el-form-item>-->
-      <el-form-item label="会议附件" prop="file">
+      <el-form-item label="文件" prop="file">
         <layout-upload
           v-model:file-list="form.file"
           accept=".pdf"
@@ -100,6 +100,8 @@ const { visible, form } = useVModels(props, emits);
 const rules = {
   file: [{ required: true, message: "请上传附件", trigger: "change" }],
   ACTIVITIESNAME: [{ required: true, message: "请输入名称", trigger: "blur" }],
+  EXPIRYDATE: [{ required: true, message: "请选择到期日期", trigger: "change" }],
+  CYCLE: [{ required: true, message: "请选择周期", trigger: "change"}],
 };
 
 const operatingCompany = ref("");
diff --git a/src/views/safety_culture/safety_activities/index.vue b/src/views/safety_culture/safety_activities/index.vue
index c7043b0..be51383 100644
--- a/src/views/safety_culture/safety_activities/index.vue
+++ b/src/views/safety_culture/safety_activities/index.vue
@@ -26,8 +26,8 @@
           <el-col :span="6">
             <el-form-item label="有效状态" prop="VALIDSTATUS">
               <el-select v-model="searchForm.VALIDSTATUS">
-                <el-option label="正常" :value="1" />
-                <el-option label="未生效" :value="0" />
+                <el-option label="正常" :value="0" />
+                <el-option label="未生效" :value="1" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -68,8 +68,8 @@
         </el-table-column>
         <el-table-column label="有效状态" prop="VALIDSTATUS">
           <template #default="{ row }">
-            <el-tag v-if="row.VALIDSTATUS === '1'" type="success">正常</el-tag>
-            <el-tag v-else-if="row.VALIDSTATUS === '0'" type="warning"
+            <el-tag v-if="row.VALIDSTATUS === '0'" type="success">正常</el-tag>
+            <el-tag v-else-if="row.VALIDSTATUS === '1'" type="warning"
               >未生效</el-tag
             >
           </template>
diff --git a/src/views/safety_culture/safety_manual/components/add.vue b/src/views/safety_culture/safety_manual/components/add.vue
index 145eb80..cc14667 100644
--- a/src/views/safety_culture/safety_manual/components/add.vue
+++ b/src/views/safety_culture/safety_manual/components/add.vue
@@ -19,7 +19,7 @@
       >
         <span>{{ operatingCompany }}</span>
       </el-form-item>-->
-      <el-form-item label="会议附件" prop="file">
+      <el-form-item label="文件" prop="file">
         <layout-upload
           v-model:file-list="form.file"
           accept=".pdf"
@@ -27,7 +27,7 @@
           :size="100"
         />
       </el-form-item>
-      <el-col :span="12">
+<!--      <el-col :span="12">
         <el-form-item label="到期时间" prop="EXPIRYDATE">
           <el-date-picker
             v-model="form.EXPIRYDATE"
@@ -37,7 +37,7 @@
             placeholder="选择时间"
           />
         </el-form-item>
-      </el-col>
+      </el-col>-->
     </el-form>
     <template #footer>
       <el-button @click="fnClose">取消</el-button>
diff --git a/src/views/safety_culture/safety_manual/index.vue b/src/views/safety_culture/safety_manual/index.vue
index c16892f..c42e1fe 100644
--- a/src/views/safety_culture/safety_manual/index.vue
+++ b/src/views/safety_culture/safety_manual/index.vue
@@ -55,8 +55,8 @@
             {{ serialNumber(pagination, $index) }}
           </template>
         </el-table-column>
-        <el-table-column prop="MANUALNAME" label="名称" width="250" />
-        <el-table-column prop="COMPLETIONSTATUS" label="完成状态" width="250">
+        <el-table-column prop="MANUALNAME" label="名称" />
+        <el-table-column prop="COMPLETIONSTATUS" label="完成状态" width="80">
           <template #default="{ row }">
             <el-tag v-if="row.COMPLETIONSTATUS === '1'" type="success"
               >已上传</el-tag
@@ -66,16 +66,15 @@
             >
           </template>
         </el-table-column>
-        <el-table-column label="有效状态" prop="VALIDSTATUS">
+<!--        <el-table-column label="有效状态" prop="VALIDSTATUS" width="80">
           <template #default="{ row }">
             <el-tag v-if="row.VALIDSTATUS === '1'" type="success">正常</el-tag>
             <el-tag v-else-if="row.VALIDSTATUS === '0'" type="warning"
               >未生效</el-tag
             >
           </template>
-        </el-table-column>
+        </el-table-column>-->
         <!--        <el-table-column prop="CORP_NAME" label="经营企业" width="150" />-->
-        <el-table-column prop="EXPIRYDATE" label="到期时间" width="150" />
         <el-table-column prop="CREATETIME" label="创建时间" width="150" />
         <el-table-column prop="OPERATTIME" label="修改时间" width="150" />
         <el-table-column label="操作" width="180">
diff --git a/src/views/safety_production_related/safety_meeting/add.vue b/src/views/safety_production_related/safety_meeting/add.vue
index e75e2e5..2b38dda 100644
--- a/src/views/safety_production_related/safety_meeting/add.vue
+++ b/src/views/safety_production_related/safety_meeting/add.vue
@@ -174,6 +174,9 @@ const rules = {
       trigger: "blur",
     },
   ],
+  PERSON: [
+    { required: true, message: "请选择人员", trigger: "change" },
+  ],
 };
 
 const router = useRouter();
diff --git a/src/views/safety_production_related/safety_meeting/meeting_info.vue b/src/views/safety_production_related/safety_meeting/meeting_info.vue
index 94a6aef..3a14884 100644
--- a/src/views/safety_production_related/safety_meeting/meeting_info.vue
+++ b/src/views/safety_production_related/safety_meeting/meeting_info.vue
@@ -35,11 +35,11 @@
         <!--        {{ detailItems.NOTES }}-->
         <!--      </el-descriptions-item>-->
         <el-descriptions-item label="远程参会人员">
-          应参会{{ detailItems.totalPersonNum }}/人，实参人数{{
+          应参会{{ detailItems.totalPersonNum }}人，实参人数{{
             detailItems.realPersonNum
-          }}/人
+          }}人
         </el-descriptions-item>
-        <el-descriptions-item label="会议附件">
+        <el-descriptions-item label="会议附件" v-if="detailItems.CONFIRM_MESSAGE_SIGN_ROUTE">
           <a
             :href="VITE_FILE_URL + detailItems.CONFIRM_MESSAGE_SIGN_ROUTE"
             target="_blank"
@@ -47,7 +47,7 @@
             >查看会议附件</a
           >
         </el-descriptions-item>
-        <el-descriptions-item label="会议视频">
+        <el-descriptions-item label="会议视频" v-if="detailItems.VIDEO_SIGN_ROUTE">
           <video
             :src="VITE_FILE_URL + detailItems.VIDEO_SIGN_ROUTE"
             controls
@@ -61,7 +61,7 @@
       >
         <el-table-column label="头像" align="center">
           <template #default="{ row }">
-            <img :src="VITE_FILE_URL + row.USERAVATARURL" alt="Avatar" />
+            <img :src="row.USERAVATARPREFIX + row.USERAVATARURL_CONVERT" alt="Avatar" width="100" height="100" />
           </template>
         </el-table-column>
         <el-table-column label="姓名" align="center">
diff --git a/src/views/safety_production_related/security_notice/components/select_person.vue b/src/views/safety_production_related/security_notice/components/select_person.vue
index 4f5f8e2..0c96947 100644
--- a/src/views/safety_production_related/security_notice/components/select_person.vue
+++ b/src/views/safety_production_related/security_notice/components/select_person.vue
@@ -103,6 +103,7 @@ const { list, searchForm, pagination, fnGetData, fnResetPagination, tableRef } =
     key: "userList",
   });
 
+
 const fnInit = async () => {
   await fnResetPagination();
   await nextTick();
diff --git a/src/views/three_institutional_libraries/safety_production_responsibility_system/components/add.vue b/src/views/three_institutional_libraries/safety_production_responsibility_system/components/add.vue
index e83494a..2e41305 100644
--- a/src/views/three_institutional_libraries/safety_production_responsibility_system/components/add.vue
+++ b/src/views/three_institutional_libraries/safety_production_responsibility_system/components/add.vue
@@ -19,14 +19,13 @@
       <el-form-item label="文件" prop="file">
         <layout-upload v-model:file-list="form.file" accept=".pdf" />
       </el-form-item>
+      <div
+        v-if="form.TEXT_INFO && type === 'edit'"
+        class="tr mb-10"
+      >
+        <el-button type="primary" @click="fnExport">导出WORD</el-button>
+      </div>
       <el-form-item label="文件内容" prop="TEXT_INFO">
-        <div
-          v-if="form.TEXT_INFO && type === 'edit'"
-          class="tr mb-10"
-          style="flex: 1"
-        >
-          <el-button type="primary" @click="fnExport">导出WORD</el-button>
-        </div>
         <layout-editor v-model="form.TEXT_INFO" />
       </el-form-item>
       <el-form-item label="标签" prop="labels">
diff --git a/src/views/three_institutional_libraries/safety_production_responsibility_system/components/list.vue b/src/views/three_institutional_libraries/safety_production_responsibility_system/components/list.vue
index 885b42d..5398615 100644
--- a/src/views/three_institutional_libraries/safety_production_responsibility_system/components/list.vue
+++ b/src/views/three_institutional_libraries/safety_production_responsibility_system/components/list.vue
@@ -134,6 +134,7 @@
       <el-table-column prop="UPLOAD_TIME" label="上传时间" width="150" />
       <el-table-column label="操作" width="200">
         <template #default="{ row }">
+
           <el-button
             v-if="tabName === 'platform_resource_library'"
             type="primary"