szh-new
张同海 4 months ago
commit ba2bdcc82f

@ -5,13 +5,13 @@ import { GetTaskPlatEnumDict } from './api'
export const searchFormSchema: FormSchema[] = [ export const searchFormSchema: FormSchema[] = [
{ {
field: 'mBlNo', field: 'mbL_NO',
label: '提单号', label: '提单号',
component: 'Input', component: 'Input',
colProps: { span: 4 }, colProps: { span: 4 },
}, },
{ {
field: 'taskNo', field: 'tasK_NO',
label: '任务流水号', label: '任务流水号',
component: 'Input', component: 'Input',
colProps: { span: 4 }, colProps: { span: 4 },

@ -31,11 +31,14 @@
<div> <div>
<div v-for="(item, index) in levelTree" <div v-for="(item, index) in levelTree"
@click="handleClickTree(item, index)" @click="handleClickTree(item, index)"
:class="{ active: item.active,redColor:item.key=='CAUTION_NOTICE' }" class="box-item"> :class="{ active: item.active, redColor: item.key == 'CAUTION_NOTICE' }"
<div class="box-text" > class="box-item">
<i v-if="item.key != 'CAUTION_NOTICE'" class="icon-touzijilu iconfont"></i> <div class="box-text">
<i v-if="item.key == 'CAUTION_NOTICE'" class="icon-jinggao iconfont"></i> <i v-if="item.key != 'CAUTION_NOTICE'"
{{item.name}} class="icon-touzijilu iconfont"></i>
<i v-if="item.key == 'CAUTION_NOTICE'"
class="icon-jinggao iconfont"></i>
{{ item.name }}
</div> </div>
<div class="box-number">{{ item.total }}</div> <div class="box-number">{{ item.total }}</div>
</div> </div>
@ -244,15 +247,17 @@
</a-modal> </a-modal>
</div> </div>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup name="任务管理">
import { ref, onMounted } from 'vue' import { ref, onMounted, watch } from 'vue'
import { formatParams } from '/@/hooks/web/common' import { formatParams } from '/@/hooks/web/common'
import { searchFormSchema } from './columns' import { searchFormSchema } from './columns'
import { useOptionsStore } from '/@/store/modules/options' import { useOptionsStore } from '/@/store/modules/options'
const optionsStore = useOptionsStore() const optionsStore = useOptionsStore()
import { BasicTable, useTable, TableAction } from '/@/components/Table' import { BasicTable, useTable, TableAction } from '/@/components/Table'
import { useMessage } from '../../hooks/web/useMessage' import { useMessage } from '../../hooks/web/useMessage'
import { useRoute, useRouter } from 'vue-router';
const { createMessage } = useMessage() const { createMessage } = useMessage()
const route = useRoute();
import { import {
GetCurrentTotalStat, GetPageAsync, TaskManageTruckGetInfoByTaskId, GetCurrentTotalStat, GetPageAsync, TaskManageTruckGetInfoByTaskId,
TaskManageTruckPrintTemplateWithHistoryList, TaskManageTruckPrintTemplateWithHistoryList,
@ -297,7 +302,11 @@ onMounted(() => {
}) })
watch(() => route.fullPath, (val) => {
if (val === '/taskmanage') {
refshTotalStat()
}
}, { deep: true });
const levelreLoading = ref(false) const levelreLoading = ref(false)
const levelLoading = ref(false) const levelLoading = ref(false)
@ -349,6 +358,26 @@ function getCurrentTotalStat() {
levelreLoading.value = false levelreLoading.value = false
}) })
} }
function refshTotalStat() {
levelreLoading.value = true
levelLoading.value = true
GetCurrentTotalStat({
isReCalc: false
})
.then(res => {
levelLoading.value = false
levelreLoading.value = false
levelTop.value = res.data.levelTop
levelNextAll.value = res.data.levelNext
levelTreeAll.value = res.data.levelTree
reload()
})
.catch(err => {
levelLoading.value = false
levelreLoading.value = false
})
}
function selectNextLevel(list, key) { function selectNextLevel(list, key) {
const arr = [] as any const arr = [] as any
list.map((item, index) => { list.map((item, index) => {
@ -430,7 +459,7 @@ function changeTopLevel() {
levelTree.value = selectTreeLevel(levelTreeAll.value, activeNextKey.value, activeTopKey.value) levelTree.value = selectTreeLevel(levelTreeAll.value, activeNextKey.value, activeTopKey.value)
activeTreeKey.value = [] activeTreeKey.value = []
taskType.value = '' taskType.value = ''
levelTree.value.forEach(item=>{ levelTree.value.forEach(item => {
item.active = false item.active = false
}) })
} }
@ -449,7 +478,7 @@ function changeNextLevel() {
activeTreeKey.value = [] activeTreeKey.value = []
getForm().setFieldsValue({ status: activeNextKey.value }) getForm().setFieldsValue({ status: activeNextKey.value })
taskType.value = '' taskType.value = ''
levelTree.value.forEach(item=>{ levelTree.value.forEach(item => {
item.active = false item.active = false
}) })
reload() reload()
@ -501,7 +530,7 @@ const [registerTable, { reload, setLoading, getForm, getSelectRows, setProps }]
const data = {} as any const data = {} as any
const queryData = JSON.parse(formatParams(p).queryCondition) const queryData = JSON.parse(formatParams(p).queryCondition)
data.pageCondition = formatParams(p).pageCondition data.pageCondition = formatParams(p).pageCondition
queryData.forEach(item=>{ queryData.forEach(item => {
if (item.FieldName === 'task_TYPE') { if (item.FieldName === 'task_TYPE') {
item.ConditionalType = 0 item.ConditionalType = 0
} }
@ -1195,9 +1224,11 @@ function handleClickTree(row, index) {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
.iconfont{
.iconfont {
font-size: 14px font-size: 14px
} }
&:hover { &:hover {
.box-text { .box-text {
@ -1225,7 +1256,7 @@ function handleClickTree(row, index) {
} }
} }
&.redColor{ &.redColor {
.box-text { .box-text {
color: rgba(237, 88, 88, 1); color: rgba(237, 88, 88, 1);
@ -1249,7 +1280,7 @@ function handleClickTree(row, index) {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
line-height: 14px; line-height: 14px;
flex:1; flex: 1;
margin-right: 10px; margin-right: 10px;
} }

@ -6,7 +6,7 @@
</a-col> </a-col>
<a-col> <a-col>
<pdf ref="pdfData"></pdf> <pdf ref="pdfData"></pdf>
<taskButton @loadingStart="loadingStart" @loadingStop="loadingStop" :id="taskPKId" ref="taskButtonRef"> <taskButton :buttonList="['取消', '完成', '转移']" @loadingStart="loadingStart" @loadingStop="loadingStop" :id="taskPKId" ref="taskButtonRef">
</taskButton> </taskButton>
</a-col> </a-col>
</a-row> </a-row>

@ -6,7 +6,7 @@
</a-col> </a-col>
<a-col> <a-col>
<pdf ref="pdfData"></pdf> <pdf ref="pdfData"></pdf>
<taskButton @loadingStart="loadingStart" @loadingStop="loadingStop" :id="taskPKId" ref="taskButtonRef"></taskButton> <taskButton :buttonList="['取消', '完成', '转移']" @loadingStart="loadingStart" @loadingStop="loadingStop" :id="taskPKId" ref="taskButtonRef"></taskButton>
</a-col> </a-col>
</a-row> </a-row>
</a-spin> </a-spin>

@ -10,15 +10,15 @@
<p>时间{{ form.createTime }}</p> <p>时间{{ form.createTime }}</p>
</div> </div>
<div>提单号:{{ form.mblNo }}</div> <div>提单号:{{ form.mblNo }}</div>
</a-col>
<a-col>
<pdf ref="pdfData"></pdf>
<a-row style="margin-top: 40px;" type="flex" justify="end" :gutter="16"> <a-row style="margin-top: 40px;" type="flex" justify="end" :gutter="16">
<taskButton :buttonList="['取消', '完成', '转移', '邮件','匹配']" @loadingStart="loadingStart" <taskButton :buttonList="['取消', '完成', '转移', '邮件','匹配']" @loadingStart="loadingStart"
@loadingStop="loadingStop" :id="taskPKId" ref="taskButtonRef"> @loadingStop="loadingStop" :id="taskPKId" ref="taskButtonRef">
</taskButton> </taskButton>
</a-row> </a-row>
</a-col>
<a-col>
<pdf ref="pdfData"></pdf>
</a-col> </a-col>
</a-row> </a-row>
</a-spin> </a-spin>

@ -138,6 +138,11 @@
<a-table :pagination="false" size="small" :scroll="{ x: 1500, y: 300 }" :columns="columnsLoad" <a-table :pagination="false" size="small" :scroll="{ x: 1500, y: 300 }" :columns="columnsLoad"
:data-source="taskData.loadDetailList" bordered> :data-source="taskData.loadDetailList" bordered>
</a-table> </a-table>
<a-row style="margin-top: 40px;" type="flex" justify="end" :gutter="16">
<taskButton :buttonList="['取消', '完成', '转移', '邮件','匹配']" @loadingStart="loadingStart"
@loadingStop="loadingStop" :id="taskPKId" ref="taskButtonRef">
</taskButton>
</a-row>
</div> </div>
</a-spin> </a-spin>
</div> </div>
@ -146,6 +151,7 @@
import { ref, onMounted, computed } from 'vue' import { ref, onMounted, computed } from 'vue'
import { GetInfoByTaskIdNotice } from '../api' import { GetInfoByTaskIdNotice } from '../api'
import { useMessage } from '../../../hooks/web/useMessage' import { useMessage } from '../../../hooks/web/useMessage'
import taskButton from '../components/taskButton.vue'
const { createMessage } = useMessage() const { createMessage } = useMessage()
import { useRoute } from 'vue-router' import { useRoute } from 'vue-router'
const selectedRowKeysTable = ref([]) const selectedRowKeysTable = ref([])

@ -92,8 +92,11 @@
style="width: 50%;margin: 15px 0" :pagination="false" size="small" border :columns="columns" style="width: 50%;margin: 15px 0" :pagination="false" size="small" border :columns="columns"
:data-source="taskData.buisList"> :data-source="taskData.buisList">
</a-table> </a-table>
<a-row style="margin-top: 40px;" type="flex" justify="end" :gutter="16">
<taskButton :buttonList="['取消', '完成', '转移', '检索']" @loadingStart="loadingStart" <taskButton :buttonList="['取消', '完成', '转移', '检索']" @loadingStart="loadingStart"
@loadingStop="loadingStop" :id="taskPKId" ref="taskButtonRef"></taskButton> @loadingStop="loadingStop" :id="taskPKId" ref="taskButtonRef"></taskButton>
</a-row>
</div> </div>
</div> </div>
</a-spin> </a-spin>

@ -104,9 +104,11 @@
</div> </div>
</div> </div>
</div> </div>
<a-row style="margin-top: 40px;" type="flex" justify="end" :gutter="16">
<taskButton :buttonList="['取消', '完成', '转移', '邮件', '检索']" @loadingStart="loadingStart" <taskButton :buttonList="['取消', '完成', '转移', '邮件', '检索']" @loadingStart="loadingStart"
@loadingStop="loadingStop" :id="taskPKId"></taskButton> @loadingStop="loadingStop" :id="taskPKId"></taskButton>
</a-row>
</a-spin> </a-spin>
</div> </div>

@ -25,8 +25,11 @@
{{ record.vgmWeight }} {{ record.vgmWeightUnit }} {{ record.vgmWeight }} {{ record.vgmWeightUnit }}
</span> </span>
</a-table> </a-table>
<a-row style="margin-top: 40px;" type="flex" justify="end" :gutter="16">
<taskButton :buttonList="['取消', '完成', '转移']" @loadingStart="loadingStart" <taskButton :buttonList="['取消', '完成', '转移']" @loadingStart="loadingStart"
@loadingStop="loadingStop" :id="taskPKId" ref="taskButtonRef"></taskButton> @loadingStop="loadingStop" :id="taskPKId" ref="taskButtonRef"></taskButton>
</a-row>
</div> </div>
</a-spin> </a-spin>
</div> </div>

Loading…
Cancel
Save