更新格式单对比

src/components/lstDraftCompareRlt/api.ts

@@ -14,7 +14,7 @@ export function GetDraftCompareResultInfo(data) {
   return request<DataResult>({
     url: '/taskApi/TaskDraftCompare/GetDraftCompareResultInfo',
     method: 'post',
-    data: data,
+    params: data,
   })
 }
 

src/components/lstDraftCompareRlt/index.vue

@@ -1,12 +1,9 @@
 <template>
     <div>
-        <a-modal :title="formatSheet.isExistsDiff ? '格式单比对（有差异）' : '格式单比对（正常）'" @cancel="formatSheetVisible = false"
+        <a-modal :footer="null" :title="formatSheet.isExistsDiff ? '格式单比对（有差异）' : '格式单比对（正常）'" @cancel="formatSheetVisible = false"
             :visible="formatSheetVisible" class="formatSheetModal" width="90%">
-            <template slot="footer">
-                <a-button key="back" @click="formatSheetVisible = false"> 关闭 </a-button>
-            </template>
             <a-spin :spinning="spinning">
-                <div>
+                <div style="margin-top: 10px;padding-bottom: 30px" >
                     <div style="margin:10px 0" v-if="formatSheet.manualFeedBackResult">
                         {{ formatSheet.manualFeedBackResult.operTime }}
                         【人工修正】 {{ formatSheet.manualFeedBackResult.operUser }}，
@@ -237,7 +234,7 @@
                 </div>
             </a-spin>
         </a-modal>
-        <a-modal :title="TaskShippingOrderCompareData.isExistsDiff ? '下货纸比对（有差异）' : '下货纸比对（正常）'"
+        <a-modal :footer="null" :title="TaskShippingOrderCompareData.isExistsDiff ? '下货纸比对（有差异）' : '下货纸比对（正常）'"
             @cancel="TaskShippingOrderCompareVisible = false" :visible="TaskShippingOrderCompareVisible"
             class="formatSheetModal" width="40%">
             <template slot="footer">
@@ -397,7 +394,7 @@ function initLstDraft(row) {
     GetDraftCompareResultInfo({ bookingid: row.id }).then((res) => {
         if (!res.succ) {
             spinning.value = false
-            createMessage.success(res.msg)
+            createMessage.error(res.msg)
         } else {
             if (res.extra) {
                 formatSheet.value = res.extra
@@ -479,6 +476,7 @@ function reload(row) {
                 createMessage.success(res.msg)
             } else {
                 if (res.extra) {
+                    TaskShippingOrderCompareVisible.value = true
                     TaskShippingOrderCompareData.value = res.extra
                     TaskShippingOrderCompareData.value.total = res.total
                     TaskShippingOrderCompareData.value.lstShipOrderCompareRlt = row.lstShipOrderCompareRlt

src/views/bookingcabin/generation/index.vue

@@ -569,9 +569,9 @@ function handleSaveCabin() {
   CreateBookingOrder(ApiData).then(res => {
     if (res.succeeded) {
       closeModal()
-      createMessage.success(res.data.msg)
+      createMessage.success(res.message)
     } else {
-      createMessage.error(res.data.msg)
+      createMessage.error(res.message)
     }
     setModalProps({ loading: false })
   })
@@ -593,11 +593,14 @@ function handleSaveTask(){
   CreateBookingAndSlot(ApiData).then(res => {
     if (res.succeeded) {
       closeModal()
-      createMessage.success(res.data.msg)
+      createMessage.success(res.msg)
     } else {
-      createMessage.error(res.data.msg)
+      createMessage.error(res.msg)
     }
     setModalProps({ loading: false })
+  }).catch(err => {
+    createMessage.error(err.msg)
+    setModalProps({ loading: false })
   })
 }
 

src/views/operation/seaexport/index.vue

@@ -92,7 +92,7 @@
         <template v-if="column.dataIndex == 'lstDraftCompareRlt'">
           <div class="goods-status">
             <a-popover>
-              <template slot="content">
+              <template #content>
                 <p>
                   比对时间: <span>{{ record.lstDraftCompareDate }}</span>
                 </p>
@@ -114,7 +114,7 @@
         <template v-if="column.dataIndex == 'lstShipOrderCompareRlt'">
           <div class="goods-status">
             <a-popover>
-              <template slot="content">
+              <template #content>
                 <p>
                   比对方式:
                   <span>{{

src/views/taskmanage/columns.tsx

@@ -16,12 +16,6 @@ export const searchFormSchema: FormSchema[] = [
     component: 'Input',
     colProps: { span: 4 },
   },
-  {
-    field: 'taskRecvName',
-    label: '接收人',
-    component: 'Input',
-    colProps: { span: 4 },
-  },
   {
     field: 'etd',
     label: '开船日期',
@@ -34,8 +28,8 @@ export const searchFormSchema: FormSchema[] = [
     },
   },
   {
-    field: 'taskDate',
-    label: '任务日期',
+    field: 'createTime',
+    label: '创建日期',
     component: 'RangePicker',
     required: false,
     dynamicDisabled: false,
@@ -45,7 +39,7 @@ export const searchFormSchema: FormSchema[] = [
     },
   },
   {
-    field: 'taskType',
+    field: 'tasK_TYPE',
     label: '任务类型',
     component: 'Select',
     required: false,

src/views/taskmanage/index.vue

@@ -309,7 +309,6 @@ router.afterEach((to, from) => {
     refshTotalStat();
   }
 });
-
 const levelreLoading = ref(false)
 const levelLoading = ref(false)
 const levelTop = ref([]) as any  //顶层tab
@@ -331,9 +330,11 @@ function getCurrentTotalStat() {
     levelNext.value = []
     levelTreeAll.value = []
     levelTree.value = []
-    GetCurrentTotalStat({
-        isReCalc: false
-    })
+    const data = {
+        isReCalc: false,
+        queryCondition:formatParams(getForm().getFieldsValue()).queryCondition
+    }
+    GetCurrentTotalStat(data)
         .then(res => {
             levelLoading.value = false
             levelreLoading.value = false
@@ -344,6 +345,7 @@ function getCurrentTotalStat() {
                 activeTopKey.value = levelTop.value[0].key
                 levelNext.value = selectNextLevel(levelNextAll.value, activeTopKey.value)
                 if (levelNext.value.length > 0) {
+                    console.log(levelNext.value,activeNextKey.value)
                     if (!activeNextKey.value) {
                         activeNextKey.value = levelNext.value[0].key
                         getForm().setFieldsValue({ status: activeNextKey.value })
@@ -366,7 +368,8 @@ function refshTotalStat() {
     levelreLoading.value = true
     levelLoading.value = true
     GetCurrentTotalStat({
-        isReCalc: false
+        isReCalc: false,
+        ...getForm().getFieldsValue()
     })
         .then(res => {
             levelLoading.value = false
@@ -518,7 +521,7 @@ const columns = [
     { dataIndex: 'statuS_NAME', width: 100, title: '任务状态' },
     { dataIndex: 'tasK_USER_STATUS_NAME', width: 120, title: '任务个人状态' },
     { dataIndex: 'vesseL_VOYNO', width: 180, title: '船名/航次' },
-    { dataIndex: 'carrieR_ID', width: 100, title: '船公司' },
+    { dataIndex: 'carrieR_CODE', width: 100, title: '船公司' },
     { dataIndex: 'tasK_NO', width: 150, title: '任务流水号' },
     { dataIndex: 'tasK_SOURCE_NAME', width: 100, title: '任务来源' },
     { dataIndex: 'createUserName', width: 100, title: '接收人' },
@@ -569,6 +572,8 @@ const [registerTable, { reload, setLoading, getForm, getSelectRows, setProps }]
     formConfig: {
         labelWidth: 120,
         schemas: searchFormSchema,
+        submitFunc:handleNext,
+        resetFunc:handleResetFunc
     },
     isTreeTable: false,
     pagination: true,
@@ -590,11 +595,16 @@ const [registerTable, { reload, setLoading, getForm, getSelectRows, setProps }]
     }
 })
 
-
+function handleNext(){
+    activeNextKey.value = ''
+    getCurrentTotalStat()
+}
 function handledbclick(row) {
     handleEdit(row)
 }
-
+function handleResetFunc(){
+    console.log('handleResetFunc')
+}
 function handleEdit(data) {
     switch (data.tasK_TYPE) {
         case 'VGM_COMPARE':