日志模块

src/components/Table/index.js

@@ -169,7 +169,6 @@ export default {
      * @param Boolean bool
      */
     refresh(bool = false) {
-      console.log(this.sortObj)
       bool &&
         (this.localPagination = Object.assign(
           {},
@@ -187,7 +186,6 @@ export default {
      * @param {Object} sorter 排序条件
      */
     loadData(pagination, filters, sorter) {
-      console.log(pagination, filters, sorter)
       this.localLoading = true
       if (sorter) {
         this.sortObj = sorter

src/views/main/BookingLedger/detail/index.vue

@@ -552,8 +552,17 @@ export default {
       }
       this.$set(this.historyData, this.id, hisData)
     }
-    // this.mainOrderActiveKey = '1-1'
-    next()
+    if (this.feeShow) {
+      const mapFrame = this.$refs['iframe']
+      const iframeWin = mapFrame.contentWindow
+      iframeWin.postMessage(
+        {
+          type: 'save'
+        }, '*')
+    }
+    setTimeout(() => {
+      next()
+    }, 100)
     setTimeout(() => {
       this.getRouterHis()
     }, 800)
@@ -894,7 +903,7 @@ export default {
         }, 200)
         setTimeout(() => {
           const key = this.$route.fullPath
-          // this.sendMessageFY()
+          this.sendMessageFY()
           setTimeout(() => {
             const detailsChange = Object.keys(this.needSavePages).includes(key)
               ? !!this.needSavePages[key].details

src/views/main/BookingLedger/detail/modules/basicInfo.vue

@@ -275,7 +275,7 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <template v-if="['VOLTA', 'WHL', 'CSL', 'MSC', 'VOL','MSCFD'].includes(details.carrierid)">
+            <template v-if="['VOLTA', 'WHL', 'CSL', 'MSC', 'VOL','MSCFD','REL','FCS'].includes(details.carrierid)">
               <a-col :xs="12" :sm="12" :md="12" :lg="{ span: '4-8' }" :xl="{ span: '4-8' }">
                 <a-form-model-item
                   class="from-label"

src/views/main/BookingLedger/detail/modules/goodsTable.vue

@@ -1446,7 +1446,6 @@ export default {
       this.$refs['tableRef'].setCellSelection({ rowKey, colKey })
     },
     init() {
-      console.log('开始')
       if (Object.keys(this.details).length > 0) {
         const arr = []
         const totalCtnall = {}

src/views/system/log/oplog/details.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-modal title="日志详情" :width="900" :visible="visible" :confirmLoading="confirmLoading" @cancel="handleCancel">
+  <a-modal title="日志详情" :width="1400" :visible="visible" :confirmLoading="confirmLoading" @cancel="handleCancel">
     <a-spin :spinning="confirmLoading">
       <a-form :model="form">
         <!-- <a-row :gutter="24">
@@ -23,28 +23,26 @@
         </a-row>
         <a-row :gutter="24">
           <a-col :md="12" :sm="24">
-            <a-form-item label="请求参数" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <json-viewer
-                :value="form.param"
-                :expand-depth="5"
-                boxed
-                sort
-                copyable
-              >
-              </json-viewer>
-            </a-form-item>
+            <div style="margin-bottom: 15px;">请求参数</div>
+            <json-viewer
+              :value="form.param"
+              :expand-depth="5"
+              boxed
+              sort
+              copyable
+            >
+            </json-viewer>
           </a-col>
           <a-col :md="12" :sm="24">
-            <a-form-item label="返回结果" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <json-viewer
-                :value="form.result"
-                :expand-depth="5"
-                boxed
-                sort
-                copyable
-              >
-              </json-viewer>
-            </a-form-item>
+            <div style="margin-bottom: 15px;">返回结果</div>
+            <json-viewer
+              :value="form.result"
+              :expand-depth="5"
+              boxed
+              sort
+              copyable
+            >
+            </json-viewer>
           </a-col>
         </a-row>
       </a-form>

src/views/system/log/oplog/index.vue

@@ -8,20 +8,25 @@
               <a-row :gutter="48">
                 <a-col :md="8" :sm="24">
                   <a-form-item label="url">
-                    <a-select style="width: 100%" v-model="queryParam.url">
-                      <a-select-option value="/BookingOrder/Save">
-                        订舱详情保存/BookingOrder/Save
-                      </a-select-option>
-                      <a-select-option value="/BookingOrder/SaveDataInList">
-                        订舱台账保存/BookingOrder/SaveDataInList
-                      </a-select-option>
-                      <a-select-option value="/BookingOrder/BachUpdate">
-                        批量编辑台账/BookingOrder/BachUpdate
-                      </a-select-option>
-                      <a-select-option value="/BookingOrder/BachUpdateShipagency">
-                        批量修改船代/BookingOrder/BachUpdateShipagency
-                      </a-select-option>
-                    </a-select>
+                    <auto-complete
+                      :allowClear="true"
+                      v-model="queryParam.url"
+                    >
+                      <template slot="dataSource">
+                        <a-select-option value="/BookingOrder/Save">
+                          订舱详情保存/BookingOrder/Save
+                        </a-select-option>
+                        <a-select-option value="/BookingOrder/SaveDataInList">
+                          订舱台账保存/BookingOrder/SaveDataInList
+                        </a-select-option>
+                        <a-select-option value="/BookingOrder/BachUpdate">
+                          批量编辑台账/BookingOrder/BachUpdate
+                        </a-select-option>
+                        <a-select-option value="/BookingOrder/BachUpdateShipagency">
+                          批量修改船代/BookingOrder/BachUpdateShipagency
+                        </a-select-option>
+                      </template>
+                    </auto-complete>
                   </a-form-item>
                 </a-col>
                 <a-col :md="5" :sm="24">
@@ -43,14 +48,12 @@
             </a-col>
             <a-col :md="4" :sm="24" :labelCol="{ span: 2, offset: 12 }">
               <span class="table-page-search-submitButtons" style="text-align: right">
-                <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+                <a-button type="primary" @click="handleRefsh">查询</a-button>
                 <a-button
                   style="margin-left: 8px"
                   @click="
                     () =>
-                      (queryParam = {
-                        success: 0
-                      })
+                      (queryParam = {})
                   "
                 >重置</a-button
                 >
@@ -65,7 +68,7 @@
                 <a-row :gutter="48">
                   <a-col :md="6" :sm="24">
                     <a-form-item label="是否成功">
-                      <a-select v-model="queryParam.success" placeholder="请选择是否成功">
+                      <a-select allowClear v-model="queryParam.success" placeholder="请选择是否成功">
                         <a-select-option v-for="(item, index) in successDict" :key="index" :value="item.code">
                           {{ item.value }}</a-select-option
                         >
@@ -135,21 +138,21 @@ import { STable, Ellipsis, XCard } from '@/components'
 import { sysOpLogPage, sysOpLogDelete, sysOpLogdetail } from '@/api/modular/system/logManage'
 import detailsOplog from './details'
 import { sysEnumDataList } from '@/api/modular/system/enumManage'
+import { AutoComplete } from 'ant-design-vue'
 import moment from 'moment'
 export default {
   components: {
     XCard,
     STable,
     Ellipsis,
-    detailsOplog
+    detailsOplog,
+    AutoComplete
   },
   data() {
     return {
       advanced: false,
       // 查询参数
-      queryParam: {
-        success: 0
-      },
+      queryParam: { },
       // 表头
       columns: [
         {
@@ -173,8 +176,7 @@ export default {
         {
           title: 'IP',
           dataIndex: 'ip',
-          width: '130px',
-          sorter: true
+          width: '130px'
         },
         {
           title: '请求地址',
@@ -189,10 +191,7 @@ export default {
           title: '操作时间',
           dataIndex: 'opTime',
           width: '160px',
-          scopedSlots: {
-            customRender: 'opTime',
-            sorter: true
-          }
+          sorter: true
         },
         {
           title: '操作人',
@@ -206,8 +205,7 @@ export default {
         {
           title: '操作人帐号',
           dataIndex: 'account',
-          width: '150px',
-          sorter: true
+          width: '150px'
         },
         {
           title: '详情',
@@ -220,7 +218,16 @@ export default {
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-        return sysOpLogPage(Object.assign(parameter, this.switchingDate())).then(res => {
+        const data = Object.assign(parameter, this.switchingDate())
+        if (data.businessId) {
+          data.SortField = 'opTime'
+          data.DescSort = false
+        }
+        if (!data.businessId) {
+          data.SortField = 'opTime'
+          data.DescSort = true
+        }
+        return sysOpLogPage(data).then(res => {
           return res.data
         })
       },
@@ -243,6 +250,17 @@ export default {
         return values[0].value
       }
     },
+    handleRefsh() {
+      if (this.queryParam.businessId) {
+        this.$refs.table.sortObj.field = 'opTime'
+        this.$refs.table.sortObj.order = 'ascend'
+      }
+      if (!this.queryParam.businessId) {
+        this.$refs.table.sortObj.field = 'opTime'
+        this.$refs.table.sortObj.order = 'descend'
+      }
+      this.$refs.table.refresh(true)
+    },
     handleLook(row) {
       this.$refs.detailsOplog.visible = true
       this.$refs.detailsOplog.confirmLoading = true