Преглед изворни кода

fix: 替换相关页面字段

xiaweibo пре 2 месеци
родитељ
комит
8941da1a62

+ 1 - 1
src/api/drawLessons/index.ts

@@ -333,7 +333,7 @@ export function queryDrawLessonsAdminDetailPage(query: QueryPageRequest<DrawLess
  */
 export function cancellationMessagePost(id: number) {
   return http.request({
-    url: `/drawLessons/admin/void?id=${id}`,
+    url: `/drawLessons/admin/invalid?id=${id}`,
     method: 'put',
   });
 }

+ 1 - 1
src/views/production-safety/risk-identification-and-control/labor-products-purchase-apply-manage/configs/tables.ts

@@ -41,7 +41,7 @@ const PURCHASE_APPLY_TABLE_COLUMNS: TableColumnProps[] = [
   },
   {
     label: '当前流程节点',
-    prop: 'nodeDescription',
+    prop: 'ppeDescription',
     align: 'left',
     minWidth: '140px',
   },

+ 58 - 0
src/views/production-safety/risk-identification-and-control/labor-products-purchase-apply-manage/configs/tablesTow.ts

@@ -0,0 +1,58 @@
+import type { TableColumnProps } from '@/types/basic-table';
+
+const TABLE_OPTIONS = {
+  emptyText: '暂无数据',
+  loading: true,
+  maxHeight: 'calc(70vh - 150px)',
+};
+
+/** 劳防用品采购申请列表列:申请单号、申请人、申请人部门、状态、当前流程节点、操作(后端字段:applyCode, applicantName, deptName, statusName, nodeDescription) */
+const PURCHASE_APPLY_TABLE_COLUMNS: TableColumnProps[] = [
+  {
+    label: '编号',
+    type: 'index',
+    align: 'center',
+    width: '80px',
+  },
+  {
+    label: '申请单号',
+    prop: 'applyCode',
+    align: 'left',
+    minWidth: '140px',
+  },
+  {
+    label: '申请人',
+    prop: 'applicantName',
+    align: 'left',
+    minWidth: '100px',
+  },
+  {
+    label: '申请部门',
+    prop: 'deptName',
+    align: 'left',
+    minWidth: '140px',
+  },
+  {
+    label: '状态',
+    prop: 'status',
+    slot: 'status',
+    align: 'center',
+    minWidth: '100px',
+  },
+  {
+    label: '当前流程节点',
+    prop: 'nodeDescription',
+    align: 'left',
+    minWidth: '140px',
+  },
+  {
+    label: '操作',
+    prop: 'action',
+    slot: 'action',
+    fixed: 'right',
+    width: '220px',
+    align: 'left',
+  },
+];
+
+export { TABLE_OPTIONS, PURCHASE_APPLY_TABLE_COLUMNS };

+ 1 - 1
src/views/production-safety/risk-identification-and-control/labor-products-purchase-apply-manage/listAdmin.vue

@@ -105,7 +105,7 @@
   import BasicTable from '@/components/BasicTable.vue';
   import useTableConfig from '@/hooks/useTableConfigHook';
   import ActionButton from '@/components/ActionButton.vue';
-  import { TABLE_OPTIONS, PURCHASE_APPLY_TABLE_COLUMNS } from './configs/tables';
+  import { TABLE_OPTIONS, PURCHASE_APPLY_TABLE_COLUMNS } from './configs/tablesTow';
   import { useRouter } from 'vue-router';
   import type { QueryPageRequest } from '@/types/basic-query';
   import {

+ 1 - 1
utils/devProxy/staff/proxy.ts

@@ -10,7 +10,7 @@ import path from 'path';
 
 // staff环境
 const proxyStaff: PROXY_TYPE = {
-  serverHost: 'http://192.168.6.42:8802/',
+  serverHost: 'http://192.168.22.116:8802/',
 //   serverHost: 'http://192.168.22.148:8802/',
   skyeyeLoginHost: 'http://192.168.6.42:7000/skyeye-login/#/',
   skyeyePlatformHost: 'http://192.168.6.42:7000/skyeye-pc/#/',