4/18

src/api/modular/main/SendCar.js

@@ -12,7 +12,18 @@ export function BookingTruckGetPage(parameter) {
     data: parameter
   })
 }
-
+/**
+ * 检索往来单位（包含车队）
+ *
+ * @author Myshipping
+ */
+export function DjyCustomerQuerytDjyCustomerInfo(parameter) {
+  return axios({
+    url: '/DjyCustomer/QuerytDjyCustomerInfo',
+    method: 'get',
+    params: parameter
+  })
+}
 /**
  * 添加订舱模板
  *

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

@@ -220,8 +220,8 @@
                         <p>
                           比对方式:
                           <span>{{
-                            row.LstShipOrderCompareMode
-                              ? row.LstShipOrderCompareMode == 'MANUAL'
+                            row.lstShipOrderCompareMode
+                              ? row.lstShipOrderCompareMode == 'MANUAL'
                                 ? '手动'
                                 : '自动'
                               : ''

src/views/main/SendCar/addForm.vue

@@ -348,7 +348,11 @@
 </template>
 
 <script>
-import { DjyCustomerAdd, DjyCustomerEdit } from '@/api/modular/main/CustomerInformationManagement'
+import {
+  DjyCustomerAdd,
+  DjyCustomerQuerytDjyCustomerInfo,
+  DjyCustomerEdit
+} from '@/api/modular/main/CustomerInformationManagement'
 import { GetSysUserPage } from '@/api/modular/main/BookingLedger'
 export default {
   data() {
@@ -477,6 +481,9 @@ export default {
     add(record) {
       this.visible = true
       this.typeData = []
+      DjyCustomerQuerytDjyCustomerInfo({ queryType: 'fleet' }).then(res => {
+        console.log(res)
+      })
     },
     /**
      * 提交表单

src/views/main/SendCar/index.vue

@@ -233,6 +233,81 @@ export default {
     this.init()
   },
   methods: {
+    init() {
+      Object.assign(this.$data, this.$options.data())
+      columns.forEach(item => {
+        item.checked = true
+      })
+      columns.forEach(item => {
+        this.ColumnsQuery.push({ ...item, checked: true })
+      })
+      DjyCustomerGet({ type: 'customer_column_config' }).then(res => {
+        if (res.data && JSON.parse(res.data.configJson).length) {
+          columns.forEach(item => {
+            item.checked = false
+          })
+          let Arr = []
+          JSON.parse(res.data.configJson).forEach(item => {
+            columns.forEach(item2 => {
+              if (item2.dataIndex == item) {
+                item2.checked = true
+                Arr.push(item2)
+              }
+            })
+          })
+          columns.forEach(item => {
+            let type = true
+            Arr.forEach(item2 => {
+              if (item.dataIndex == item2.dataIndex) {
+                type = false
+              }
+            })
+            if (type) {
+              Arr.push(item)
+            }
+          })
+          this.TableColumns = Arr
+        } else {
+          this.TableColumns = columns
+        }
+        this.FnGetData()
+        this.$forceUpdate()
+      })
+      DjyCustomerGet({ type: 'pai_che' }).then(res => {
+        if (res.data) {
+          this.ColumnsQueryL = JSON.parse(res.data.configJson).length
+          if (JSON.parse(res.data.configJson).length) {
+            this.ColumnsQuery = []
+            columns.forEach(item => {
+              this.ColumnsQuery.push({ ...item, checked: false })
+            })
+            let Arr = []
+            JSON.parse(res.data.configJson).forEach(item => {
+              this.ColumnsQuery.forEach(item2 => {
+                if (item == item2.dataIndex) {
+                  item2.checked = true
+                  Arr.push(item2)
+                }
+              })
+            })
+            this.ColumnsQuery.forEach(item => {
+              let type = true
+              Arr.forEach(item2 => {
+                if (item.dataIndex == item2.dataIndex) {
+                  type = false
+                }
+              })
+              if (type) {
+                Arr.push(item)
+              }
+            })
+            this.ColumnsQuery = Arr
+          }
+        }
+
+        this.$forceUpdate()
+      })
+    },
     FnRpropString(data) {
       let propString = ''
       if (data.propString) {
@@ -330,81 +405,7 @@ export default {
     toggleAdvanced() {
       this.advanced = !this.advanced
     },
-    init() {
-      Object.assign(this.$data, this.$options.data())
-      columns.forEach(item => {
-        item.checked = true
-      })
-      columns.forEach(item => {
-        this.ColumnsQuery.push({ ...item, checked: true })
-      })
-      DjyCustomerGet({ type: 'customer_column_config' }).then(res => {
-        if (res.data && JSON.parse(res.data.configJson).length) {
-          columns.forEach(item => {
-            item.checked = false
-          })
-          let Arr = []
-          JSON.parse(res.data.configJson).forEach(item => {
-            columns.forEach(item2 => {
-              if (item2.dataIndex == item) {
-                item2.checked = true
-                Arr.push(item2)
-              }
-            })
-          })
-          columns.forEach(item => {
-            let type = true
-            Arr.forEach(item2 => {
-              if (item.dataIndex == item2.dataIndex) {
-                type = false
-              }
-            })
-            if (type) {
-              Arr.push(item)
-            }
-          })
-          this.TableColumns = Arr
-        } else {
-          this.TableColumns = columns
-        }
-        this.FnGetData()
-        this.$forceUpdate()
-      })
-      DjyCustomerGet({ type: 'pai_che' }).then(res => {
-        if (res.data) {
-          this.ColumnsQueryL = JSON.parse(res.data.configJson).length
-          if (JSON.parse(res.data.configJson).length) {
-            this.ColumnsQuery = []
-            columns.forEach(item => {
-              this.ColumnsQuery.push({ ...item, checked: false })
-            })
-            let Arr = []
-            JSON.parse(res.data.configJson).forEach(item => {
-              this.ColumnsQuery.forEach(item2 => {
-                if (item == item2.dataIndex) {
-                  item2.checked = true
-                  Arr.push(item2)
-                }
-              })
-            })
-            this.ColumnsQuery.forEach(item => {
-              let type = true
-              Arr.forEach(item2 => {
-                if (item.dataIndex == item2.dataIndex) {
-                  type = false
-                }
-              })
-              if (type) {
-                Arr.push(item)
-              }
-            })
-            this.ColumnsQuery = Arr
-          }
-        }
 
-        this.$forceUpdate()
-      })
-    },
     handlePageChange({ currentPage, pageSize }) {
       this.queryParam.pageNo = currentPage
       this.queryParam.pageSize = pageSize