zhangjie 1 vuosi sitten
vanhempi
commit
c02eccd360

+ 1 - 1
src/api/common.js

@@ -1,5 +1,5 @@
 import { request } from '@/utils/request.js';
-import { getFileMD5 } from '@/utils/crypto.js';
+// import { getFileMD5 } from '@/utils/crypto.js';
 //上传附件接口
 export const uploadFiles = (formData, md5) => {
   return request({

+ 8 - 0
src/utils/filter.js

@@ -27,6 +27,8 @@ import {
   ATTENDANCE_STATISTICS_SUBMIT_STATUS,
   VIOLATION_TYPE,
   VIOLATION_FLOW_STATUS,
+  WARN_TYPE,
+  WARN_FLOW_STATUS,
 } from '@/config/constants';
 import { dateFormat } from './tool';
 
@@ -139,3 +141,9 @@ export function violationTypeFilter(val) {
 export function violationFlowStatusFilter(val) {
   return VIOLATION_FLOW_STATUS[val] || DEFAULT_FIELD;
 }
+export function warnTypeFilter(val) {
+  return WARN_TYPE[val] || DEFAULT_FIELD;
+}
+export function warnFlowStatusFilter(val) {
+  return WARN_FLOW_STATUS[val] || DEFAULT_FIELD;
+}

+ 1 - 1
src/views/service-unit/service-unit-manage/range-manage/add-range-dialog.vue

@@ -34,7 +34,7 @@
         <div class="btn-group"> </div>
         <t-table
           size="small"
-          row-key="id"
+          row-key="crmId"
           :columns="columns"
           :data="tableData"
           bordered

+ 25 - 15
src/views/sop/sop-monitor/delay-warning/index.vue

@@ -23,7 +23,17 @@
           showPageSize: false,
           total: pagination.total,
         }"
+        v-loading="tableLoading"
       >
+        <template #type="{ col, row }">
+          {{ warnTypeFilter(row[col.colKey]) }}
+        </template>
+        <template #status="{ col, row }">
+          {{ warnFlowStatusFilter(row[col.colKey]) }}
+        </template>
+        <template #warnTime="{ col, row }">
+          {{ timestampFilter(row[col.colKey]) }}
+        </template>
       </t-table>
     </div>
     <FlowDialog
@@ -42,9 +52,14 @@ import { dictToOptionList } from '@/utils/tool';
 import { WARN_TYPE, WARN_FLOW_STATUS } from '@/config/constants';
 import { omit } from 'lodash';
 import { DialogPlugin, MessagePlugin } from 'tdesign-vue-next';
+import {
+  warnTypeFilter,
+  warnFlowStatusFilter,
+  timestampFilter,
+} from '@/utils/filter';
 import FlowDialog from './flow-dialog';
-const showFlowDialog = ref(false);
 
+const showFlowDialog = ref(false);
 const curRow = ref(null);
 const editSuccess = () => {
   MessagePlugin.success('操作成功');
@@ -81,29 +96,24 @@ const closeHandler = (row) => {
   });
 };
 const columns = [
-  { colKey: 'service', title: '服务单元', width: 150 },
-  // { colKey: 'b', title: '预警流水号' },
-  { colKey: 'warnTime', title: '预警时间', width: 150 },
-  { colKey: 'sopNo', title: 'SOP流水号', width: 160 },
-  { colKey: 'userName', title: '节点负责人', width: 120 },
-  { colKey: 'custom', title: '客户名称', width: 120 },
-  { colKey: 'crmNo', title: '项目单号', width: 140 },
-  { colKey: 'crmName', title: '项目名称' },
+  { colKey: 'service', title: '服务单元', width: 140 },
+  { colKey: 'code', title: '预警流水号', width: 200 },
+  { colKey: 'warnTime', title: '预警时间', width: 180 },
+  { colKey: 'sopNo', title: 'SOP流水号', width: 200 },
+  { colKey: 'userName', title: '节点负责人', width: 140 },
+  { colKey: 'custom', title: '客户名称', width: 140 },
+  { colKey: 'crmNo', title: '项目单号', width: 200 },
+  { colKey: 'crmName', title: '项目名称', width: 200 },
   {
     colKey: 'type',
     title: '预警类型',
     width: 150,
-    cell: (h, { row }) => {
-      return <span>{WARN_TYPE[row.type] || row.type}</span>;
-    },
   },
   { colKey: 'fieldObj', title: '预警字段' },
   {
     colKey: 'status',
     title: '跟进状态',
-    cell: (h, { row }) => {
-      return <span>{WARN_FLOW_STATUS[row.status] || row.status}</span>;
-    },
+    width: 150,
   },
   {
     title: '管理',

+ 9 - 2
src/views/sop/sop-monitor/violation-registration/index.vue

@@ -43,6 +43,9 @@
         <template #status="{ col, row }">
           {{ violationFlowStatusFilter(row[col.colKey]) }}
         </template>
+        <template #createTime="{ col, row }">
+          {{ timestampFilter(row[col.colKey]) }}
+        </template>
         <template #operate="{ row }">
           <div class="table-operations">
             <t-link
@@ -92,7 +95,11 @@ import { dictToOptionList } from '@/utils/tool';
 import { VIOLATION_TYPE, VIOLATION_FLOW_STATUS } from '@/config/constants';
 import { omit } from 'lodash';
 import { DialogPlugin, MessagePlugin } from 'tdesign-vue-next';
-import { violationTypeFilter, violationFlowStatusFilter } from '@/utils/filter';
+import {
+  violationTypeFilter,
+  violationFlowStatusFilter,
+  timestampFilter,
+} from '@/utils/filter';
 import ViolationFlowDialog from './flow-dialog.vue';
 
 const showViolationFlowDialog = ref(false);
@@ -140,7 +147,7 @@ const columns = [
   { colKey: 'userName', title: '节点负责人', width: 140 },
   { colKey: 'custom', title: '客户名称', width: 140 },
   { colKey: 'crmNo', title: '项目单号', width: 200 },
-  { colKey: 'crmName', title: '项目名称' },
+  { colKey: 'crmName', title: '项目名称', width: 200 },
   {
     colKey: 'type',
     title: '违规类型',