Compare commits

..

No commits in common. 'c8806084643755f72aa93354e64cefcf049fe161' and '95c4ccf7ffa5af880720862ed95c6d674c2e8ecc' have entirely different histories.

  1. 5
      src/components/data/complaintformdialog.vue
  2. 25
      src/components/negative/action-history.vue

5
src/components/data/complaintformdialog.vue

@ -220,7 +220,7 @@
<!-- 标签 --> <!-- 标签 -->
<el-row> <el-row>
<el-col :span="18"> <el-col :span="18">
<el-form-item label="标签" prop="tags" :rules="{ required: true, message: '请选择标签', trigger: 'change' }"> <el-form-item label="标签" prop="tags">
<el-checkbox-group v-model="formData.tags"> <el-checkbox-group v-model="formData.tags">
<el-checkbox v-for="item in dict.sfssTags" :key="item.id" :label="item.dictValue"> <el-checkbox v-for="item in dict.sfssTags" :key="item.id" :label="item.dictValue">
{{ item.dictLabel }} {{ item.dictLabel }}
@ -504,7 +504,7 @@
<!-- 标签 --> <!-- 标签 -->
<el-row> <el-row>
<el-col :span="18"> <el-col :span="18">
<el-form-item label="标签" prop="tags" :rules="{ required: true, message: '请选择标签', trigger: 'change' }"> <el-form-item label="标签" prop="tags">
<el-checkbox-group v-model="formData.tags"> <el-checkbox-group v-model="formData.tags">
<el-checkbox v-for="item in dict.sfssTags" :key="item.id" :label="item.dictValue"> <el-checkbox v-for="item in dict.sfssTags" :key="item.id" :label="item.dictValue">
{{ item.dictLabel }} {{ item.dictLabel }}
@ -743,7 +743,6 @@ const rules = {
departId: [{required: true, message: '请选择办理单位', trigger: 'change'}], departId: [{required: true, message: '请选择办理单位', trigger: 'change'}],
timeLimit: [{required: true, message: '请选择办理时限', trigger: 'change'}], timeLimit: [{required: true, message: '请选择办理时限', trigger: 'change'}],
approvalFlow: [{required: true, message: '请选择审批流程', trigger: 'change'}], approvalFlow: [{required: true, message: '请选择审批流程', trigger: 'change'}],
tags: [{required: true, message: '请选择标签', trigger: 'change'}],
}; };
// 1. computed storeDict // 1. computed storeDict

25
src/components/negative/action-history.vue

@ -18,7 +18,6 @@
<div <div
class="flow-time" class="flow-time"
:danger="shouldHighlight(item)" :danger="shouldHighlight(item)"
:title="getOvertimeTip(item)"
> >
<span class="second mr-8">用时</span> <span class="second mr-8">用时</span>
<span class="primary">{{ <span class="primary">{{
@ -63,22 +62,16 @@ function getConsumingTime(crtTime, index) {
} }
return moment(crtTime).diff(moment(actionHistory.value[index - 1].crtTime), "seconds") return moment(crtTime).diff(moment(actionHistory.value[index - 1].crtTime), "seconds")
} }
const catchStore = useCatchStore();
// 使 timeoutFlag //
catchStore.getDicts(["approveShouldHighlight"]);
// computed store 访
const highlightKeywords = computed(() => catchStore.dict.approveShouldHighlight || []);
const shouldHighlight = (item) => { const shouldHighlight = (item) => {
return item.timeoutFlag === true; debugger
} const keywords = highlightKeywords.value;
const matchKeyword = keywords.some(k => item.actionName?.includes(k.dictLabel));
// 使 overtimeStatus overtimeDuration return item.duration > 86400 && matchKeyword;
const getOvertimeTip = (item) => {
if (!item.timeoutFlag || !item.duration) {
return '';
}
const overtimeSeconds = item.overtimeDuration || 0;
const days = Math.floor(overtimeSeconds / 86400);
const hours = Math.floor((overtimeSeconds % 86400) / 3600);
const minutes = Math.floor((overtimeSeconds % 3600) / 60);
return `超时 ${days}${hours}${minutes}`;
} }
const activeHistory = ref({}) const activeHistory = ref({})
function handleShowDetai(item) { function handleShowDetai(item) {

Loading…
Cancel
Save