Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

src/views/taskmanage/columns.tsx

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

src/views/taskmanage/index.vue

@@ -31,10 +31,13 @@
                                             <div>
                                                 <div v-for="(item, index) in levelTree"
                                                     @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' }"
+                                                    class="box-item">
                                                     <div class="box-text">
-                                                        <i v-if="item.key != 'CAUTION_NOTICE'" class="icon-touzijilu  iconfont"></i>
+                                                        <i v-if="item.key != 'CAUTION_NOTICE'"
-                                                        <i v-if="item.key == 'CAUTION_NOTICE'" class="icon-jinggao  iconfont"></i>
+                                                            class="icon-touzijilu  iconfont"></i>
+                                                        <i v-if="item.key == 'CAUTION_NOTICE'"
+                                                            class="icon-jinggao  iconfont"></i>
                                                         {{ item.name }}
                                                     </div>
                                                     <div class="box-number">{{ item.total }}</div>
@@ -244,15 +247,17 @@
         </a-modal>
     </div>
 </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 { searchFormSchema } from './columns'
 import { useOptionsStore } from '/@/store/modules/options'
 const optionsStore = useOptionsStore()
 import { BasicTable, useTable, TableAction } from '/@/components/Table'
 import { useMessage } from '../../hooks/web/useMessage'
+import { useRoute, useRouter } from 'vue-router';
 const { createMessage } = useMessage()
+const route = useRoute();
 import {
     GetCurrentTotalStat, GetPageAsync, TaskManageTruckGetInfoByTaskId,
     TaskManageTruckPrintTemplateWithHistoryList,
@@ -297,7 +302,11 @@ onMounted(() => {
 })
 
 
-
+watch(() => route.fullPath, (val) => {
+    if (val === '/taskmanage') {
+        refshTotalStat()
+    }
+}, { deep: true });
 
 const levelreLoading = ref(false)
 const levelLoading = ref(false)
@@ -349,6 +358,26 @@ function getCurrentTotalStat() {
             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) {
     const arr = [] as any
     list.map((item, index) => {
@@ -1196,9 +1225,11 @@ function handleClickTree(row, index) {
     display: flex;
     justify-content: space-between;
     align-items: center;
+
     .iconfont {
         font-size: 14px
     }
+
     &:hover {
 
         .box-text {

src/views/taskmanage/taskList/Amendment.vue

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

src/views/taskmanage/taskList/Cancellation.vue

@@ -6,7 +6,7 @@
             </a-col>
             <a-col>
                 <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-row>
     </a-spin>

src/views/taskmanage/taskList/draft.vue

@@ -10,15 +10,15 @@
                     <p>时间：{{ form.createTime }}</p>
                 </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">
                     <taskButton :buttonList="['取消', '完成', '转移', '邮件','匹配']" @loadingStart="loadingStart"
                         @loadingStop="loadingStop" :id="taskPKId" ref="taskButtonRef">
                     </taskButton>
                 </a-row>
-
-            </a-col>
-            <a-col>
-                <pdf ref="pdfData"></pdf>
             </a-col>
         </a-row>
     </a-spin>

src/views/taskmanage/taskList/rollingNomination.vue

@@ -138,6 +138,11 @@
                 <a-table :pagination="false" size="small" :scroll="{ x: 1500, y: 300 }" :columns="columnsLoad"
                     :data-source="taskData.loadDetailList" bordered>
                 </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>
         </a-spin>
     </div>
@@ -146,6 +151,7 @@
 import { ref, onMounted, computed } from 'vue'
 import { GetInfoByTaskIdNotice } from '../api'
 import { useMessage } from '../../../hooks/web/useMessage'
+import taskButton from '../components/taskButton.vue'
 const { createMessage } = useMessage()
 import { useRoute } from 'vue-router'
 const selectedRowKeysTable = ref([])

src/views/taskmanage/taskList/routeCutChange.vue

@@ -92,8 +92,11 @@
                     style="width: 50%;margin: 15px 0" :pagination="false" size="small" border :columns="columns"
                     :data-source="taskData.buisList">
                 </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>

src/views/taskmanage/taskList/transPlanHasChange.vue

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

src/views/taskmanage/taskList/vgmDetail.vue

@@ -25,8 +25,11 @@
                         {{ record.vgmWeight }} {{ record.vgmWeightUnit }}
                     </span>
                 </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>
         </a-spin>
     </div>