Explorar el Código

fix:修改导入接口调错问题&以及修改部分UI展示&修改检查单导入模版功能

sunqijun hace 1 mes
padre
commit
d79f9f9206

+ 6 - 8
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/checkTemplateManagement/components/checkTemplateManagementDetail.vue

@@ -50,16 +50,16 @@
       </el-form-item>
       <el-form-item label="状态:" prop="status">
         <el-radio-group v-model="ruleFormData.status" :disabled="isViewMode">
-          <el-radio :label="1">启用</el-radio>
-          <el-radio :label="0">禁用</el-radio>
+          <el-radio label="启用" :value="1">启用</el-radio>
+          <el-radio label="禁用" :value="0">禁用</el-radio>
         </el-radio-group>
       </el-form-item>
     </el-form>
 
     <div class="check-items-section">
-      <el-button plain @click="TemplateDownload">
+      <!-- <el-button plain @click="TemplateDownload">
         模板下载
-      </el-button>
+      </el-button> -->
       <el-button plain @click="handleeDownload" v-if="isCreateMode || isEditMode">
         导入
       </el-button>
@@ -67,7 +67,6 @@
         导出
       </el-button>
     </div>
-
     <div>
       <!-- <div class="section-header">
         <el-upload
@@ -139,8 +138,7 @@
     :visible="batchImportVisible"
     :import-api-url="importApiUrl"
     :template-url="templateUrl"
-    template-name="下载模板"
-    :show-template="false"
+    template-name="检查单模版导入模版"
     @close="batchImportVisible = false"
     @update="handleUpdate"
   />
@@ -401,7 +399,7 @@
   const batchImportVisible = ref(false);
   const { urlPrefix } = useGlobSetting();
   const importApiUrl = ref(urlJoin(urlPrefix, '/areaCheckPlanManageAdmin/importCheckList'));
-  const templateUrl = ref('./skyeye-file-upload/sfysecurity/TEMPLATE/import-hidden-danger-template.xlsx');
+  const templateUrl = ref('./skyeye-file-upload/sfysecurity/TEMPLATE/检查单导入模版 2.xlsx');
 
   const handleeDownload = () => {
     batchImportVisible.value = true;

+ 3 - 3
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/checkTemplateManagement/configs/tables.ts

@@ -32,13 +32,13 @@ export const CHECK_TEMPLATE_TABLE_COLUMNS: TableColumnProps[] = [
     label: '类别名称',
     prop: 'categoryName',
     align: 'left',
-    minWidth: '120px',
+    minWidth: '140px',
   },
   {
     label: '使用次数',
     prop: 'useCount',
     align: 'center',
-    minWidth: '100px',
+    minWidth: '120px',
   },
   // {
   //   label: '备注',
@@ -50,7 +50,7 @@ export const CHECK_TEMPLATE_TABLE_COLUMNS: TableColumnProps[] = [
     label: '修改用户名称',
     prop: 'updateUserName',
     align: 'left',
-    minWidth: '120px',
+    minWidth: '160px',
   },
   {
     label: '修改时间',

+ 1 - 1
src/views/production-safety/productionSafetySystem/safetySystemConstructionWorkPlanManagement/safetySystemConstructionWorkPlanManagement.vue

@@ -480,7 +480,7 @@
     // 批量导入
   const batchImportVisible = ref(false);
   const { urlPrefix } = useGlobSetting();
-  const importApiUrl = ref(urlJoin(urlPrefix, '/safety-culture/importProductionEducationTrainingPlan'));
+  const importApiUrl = ref(urlJoin(urlPrefix, '/safetyWorkPlan/workPlan/import'));
   const templateUrl = ref('./skyeye-file-upload/sfysecurity/TEMPLATE/安全体系建设工作计划导入模版.xlsx');
   // 导入
   const handleImport = () => {