Explorar o código

fix: 修复一些Bug

sunqijun hai 3 meses
pai
achega
e35d776528

+ 7 - 5
src/views/production-safety/implement-safety-duty/components/IssueSafetyResponsibility.vue

@@ -197,6 +197,7 @@
   import type { FormInstance } from 'element-plus';
   import dayjs from 'dayjs';
   import { queryAvailableUserList } from '@/api/production-safety/responsibility-implementation';
+  import { de } from 'element-plus/es/locale';
 
   const props = defineProps<{
     modelValue: boolean;
@@ -231,7 +232,7 @@
 
   const cascaderProp = {
     expandTrigger: 'click',
-    checkStrictly: false,
+    checkStrictly: props.currentDepartmentKey === 'default',
     value: 'id',
     label: 'deptName',
     multiple: !/A|B/.test(props.currentDepartmentKey),
@@ -241,10 +242,11 @@
     () => [props.currentDepartmentKey, props.departmentOptions],
     ([currentDepartmentKey, departmentOptions]) => {
       if (!currentDepartmentKey) return;
-      console.log('departmentOptions:', departmentOptions);
-      // if (currentDepartmentKey === 'A') {
-      //   const id = departmentOptions.find((d) => d.deptName === '院领导');
-      // }
+      // 针对院领导的特殊处理
+      if (currentDepartmentKey === 'A' && Array.isArray(departmentOptions) && departmentOptions.length) {
+        const id = departmentOptions.find((d) => d.deptName === '院领导')?.id;
+        formData.deptId = [id];
+      }
       formData.leader1 = null;
       formData.leader2 = null;
       formData.signPerson = [];

+ 2 - 2
src/views/production-safety/implement-safety-duty/responsibility-agree-manage-dept.vue

@@ -113,7 +113,7 @@
                 </el-button>
                 <el-dropdown trigger="click">
                   <el-button type="primary" link>反馈</el-button>
-                  <template #dropdown>
+                  <!-- <template #dropdown>
                     <el-dropdown-menu>
                       <el-dropdown-item
                         @click="
@@ -140,7 +140,7 @@
                         >审核不通过</el-dropdown-item
                       >
                     </el-dropdown-menu>
-                  </template>
+                  </template> -->
                 </el-dropdown>
                 <el-button type="primary" link @click="handleDownloadLink(scope)">下载</el-button>
               </div>

+ 0 - 4
src/views/production-safety/implement-safety-duty/responsibility-agree-manage.vue

@@ -252,10 +252,6 @@
     }
   });
 
-  // const handleTabClick = (tab) => {
-  //   activeTabIndex.value = tab.index;
-  // };
-
   const handleQueryUserGroupPage = () => {
     return queryUserGroupPage({
       pageNumber: 1,

+ 1 - 1
src/views/production-safety/implement-safety-duty/responsibility-notice-manage-admin/list.vue

@@ -68,7 +68,7 @@
         <el-table :data="tableData.data">
           <el-table-column label="责任书名称" prop="responsibilityName" width="180" />
           <el-table-column label="状态" prop="statusName" width="100" />
-          <el-table-column label="类型" prop="safetyAreaName" width="180" />
+          <!-- <el-table-column label="类型" prop="safetyAreaName" width="180" /> -->
           <el-table-column label="下发数" prop="issuedQuantity" width="120" />
           <el-table-column label="反馈人数" prop="signedQuantity" width="120" />
           <el-table-column label="反馈比例" prop="signedRatio" width="120" />

+ 1 - 1
src/views/production-safety/implement-safety-duty/responsibility-notice-manage-dept/list.vue

@@ -66,7 +66,7 @@
         <el-table :data="tableData.data">
           <el-table-column label="责任书通知名称" prop="responsibilityName" width="180" />
           <el-table-column label="状态" prop="statusName" width="100" />
-          <el-table-column label="类型" prop="safetyAreaName" width="130" />
+          <!-- <el-table-column label="类型" prop="safetyAreaName" width="130" /> -->
           <el-table-column label="下发数" prop="issuedQuantity" width="120" />
           <el-table-column label="反馈人数" prop="signedQuantity" width="120" />
           <el-table-column label="反馈比例" prop="signedRatio" width="120" />

+ 1 - 1
src/views/production-safety/implement-safety-duty/sign-agree-dept.vue

@@ -190,7 +190,7 @@
     </footer>
   </div>
   <PreviewOnline ref="previewOnlineRef" />
-  <el-dialog v-model="dialogVisible" title="Tips" width="500">
+  <el-dialog v-model="dialogVisible" title="下一节点签署人" width="500">
     <el-form-item :label="currentLabel">
       <el-select v-model="signerId" placeholder="请选择" size="large" style="width: 100%" filterable>
         <el-option v-for="item in userOptions" :key="item.value" :label="item.label" :value="item.value" />