修改问题

1 year ago · 82ca09bc79
parent 2b4a910ab2
commit 82ca09bc79
7 changed files with 116 additions and 27 deletions
--- a/.env.development
+++ b/.env.development
@ -9,5 +9,4 @@ VUE_APP_SOCKET_BASE_URL=http://47.104.222.4:5010
 # VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api
 # VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345/api

-//VUE_APP_API_BASE_URL=http://127.0.0.1:5000
-//VUE_APP_SOCKET_BASE_URL=http://127.0.0.1:5000
+
--- a/src/views/main/BookingCustomerLedger/detail/index.vue
+++ b/src/views/main/BookingCustomerLedger/detail/index.vue
@ -623,9 +623,9 @@
                    :labelCol="labelCol"
                    :wrapperCol="wrapperCol"
                    has-feedback
-                    prop="CtrnLength">
+                    prop="ctrnLength">
                    <div class="line-box">
-                      <a-input-number size="small" v-model="details.CtrnLength" />
+                      <a-input-number size="small" v-model="details.ctrnLength" />
                      <span class="unit">CM</span>
                    </div>
                  </a-form-model-item>
@ -637,9 +637,9 @@
                    :labelCol="labelCol"
                    :wrapperCol="wrapperCol"
                    has-feedback
-                    prop="CtrnWidth">
+                    prop="ctrnWidth">
                    <div class="line-box">
-                      <a-input-number size="small" v-model="details.CtrnWidth" />
+                      <a-input-number size="small" v-model="details.ctrnWidth" />
                      <span class="unit">CM</span>
                    </div>
                  </a-form-model-item>
@ -651,9 +651,9 @@
                    :labelCol="labelCol"
                    :wrapperCol="wrapperCol"
                    has-feedback
-                    prop="CtrnHeight">
+                    prop="ctrnHeight">
                    <div class="line-box">
-                      <a-input-number size="small" v-model="details.CtrnHeight" />
+                      <a-input-number size="small" v-model="details.ctrnHeight" />
                      <span class="unit">CM</span>
                    </div>
                  </a-form-model-item>
@ -1003,8 +1003,48 @@ export default {
            notifyparty: $data.bookingDetails.notifyparty,
            consignee: $data.bookingDetails.consignee,
            shipper: $data.bookingDetails.shipper,
-            ctnList: [],
-            serviceList: []
+            saleCode: $data.bookingDetails.saleCode,
+            blfrt: $data.bookingDetails.blfrt,
+            service: $data.bookingDetails.service,
+            contractno: $data.bookingDetails.contractno,
+            voyno: $data.bookingDetails.voyno,
+            vessel: $data.bookingDetails.vessel,
+            etd: $data.bookingDetails.etd,
+            portdischargeid: $data.bookingDetails.portdischargeid,
+            portloadid: $data.bookingDetails.portloadid,
+            carrierid: $data.bookingDetails.carrierid,
+            reeferf: $data.bookingDetails.reeferf,
+            tempid: $data.bookingDetails.tempid,
+            tempset: $data.bookingDetails.tempset,
+            pkgs: $data.bookingDetails.pkgs,
+            kindpkgs: $data.bookingDetails.kindpkgs,
+            cbm: $data.bookingDetails.cbm,
+            kgs: $data.bookingDetails.kgs,
+            hscode: $data.bookingDetails.hscode,
+            cargoid: $data.bookingDetails.cargoid,
+            description: $data.bookingDetails.description,
+            soremark: $data.bookingDetails.soremark,
+            ctrnHeight: $data.bookingDetails.ctrnHeight,
+            ctrnWidth: $data.bookingDetails.ctrnWidth,
+            ctrnLength: $data.bookingDetails.ctrnLength,
+            dtel: $data.bookingDetails.dtel,
+            linkman: $data.bookingDetails.linkman,
+            dclass: $data.bookingDetails.dclass,
+            dunno: $data.bookingDetails.dunno,
+            ctnList: $data.bookingDetails.ctnList,
+            serviceList: $data.bookingDetails.serviceList
+          }
+          if (copyData.cargoid === 'S') {
+            copyData.cargoName = 'S 普通货'
+          }
+          if (copyData.cargoid === 'R') {
+            copyData.cargoName = 'R 冻柜'
+          }
+          if (copyData.cargoid === 'D') {
+            copyData.cargoName = 'D 危险品'
+          }
+          if (copyData.cargoid === 'O') {
+            copyData.cargoName = 'O 超限箱'
          }
          this.details = { ...JSON.parse(JSON.stringify(copyData)) }
        } else {
--- a/src/views/main/BookingLedger/detail/index.vue
+++ b/src/views/main/BookingLedger/detail/index.vue
@ -349,7 +349,7 @@ const bookingEDIExt = {
  acihbl: ''
 }
 export default {
-  name: 'BookingDetailTest',
+  name: 'BookingDetail',
  inject: ['reload'],
  components: {
    operationArea,
@ -1322,7 +1322,7 @@ export default {
                this.setBookingList(newBookingList)
                this.setBookingGridOptions(newBookingGridOptions)
                that.$router.replace({
-                  name: 'BookingDetailTest',
+                  name: 'BookingDetail',
                  query: {
                    id: res.data.id,
                    type: res.data.carrierid,
@ -1369,7 +1369,7 @@ export default {
                this.setBookingList(newBookingList)
                this.setBookingGridOptions(newBookingGridOptions)
                that.$router.replace({
-                  name: 'BookingDetailTest',
+                  name: 'BookingDetail',
                  query: {
                    id: res.data.id,
                    type: res.data.carrierid,
@ -1518,7 +1518,7 @@ export default {
        delete $data[this.$route.fullPath]
        this.setNeedSavePages($data)
        this.$router.replace({
-          name: 'BookingDetailTest',
+          name: 'BookingDetail',
          query: { id: prevId, type: prevType, mblno: this.bookingList[prevId].mblno, noOpenTab: true }
        })
      } else {
@ -1532,7 +1532,7 @@ export default {
        delete $data[this.$route.fullPath]
        this.setNeedSavePages($data)
        this.$router.replace({
-          name: 'BookingDetailTest',
+          name: 'BookingDetail',
          query: { id: nextId, type: nextType, mblno: this.bookingList[nextId].mblno, noOpenTab: true }
        })
      }
@ -1542,7 +1542,7 @@ export default {
    },
    copyBookingFun() {
      this.$router.push({
-        name: 'BookingDetailTest',
+        name: 'BookingDetail',
        query: { id: this.id, isCopy: true, type: this.bookingDetails.carrierid }
      })
    },
--- a/src/views/main/BookingLedger/detail/modules/basicInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/basicInfo.vue
@ -211,6 +211,28 @@
                </a-form-model-item>
              </a-col>
            </template>
+            <a-col :xs="12" :sm="12" :md="12" :lg="{span: '4-8'}" :xl="{span: '4-8'}">
+              <a-form-model-item
+                class="from-label"
+                label="销售代码"
+                :labelCol="{
+                  xs: { span: 24 },
+                  sm: { span: 10 },
+                  md: { span: 10 }
+                }"
+                :wrapperCol="{
+                  xs: { span: 24 },
+                  sm: { span: 14 },
+                  md: { span: 14 }
+                }"
+                has-feedback
+                prop="saleCode"
+              >
+                <template >
+                  <inputView type="saleCode" :parentVal="details.saleCode" @getInputChange="inputChange" />
+                </template>
+              </a-form-model-item>
+            </a-col>
            <template v-if="details.carrierid === 'ESL'">
              <a-col :xs="12" :sm="12" :md="12" :lg="{span: '4-8'}" :xl="{span: '4-8'}">
                <a-form-model-item
--- a/src/views/main/BookingLedger/detail/modules/mailingInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/mailingInfo.vue
@ -515,6 +515,27 @@
                      @change="getSelectViewRes"></selectView>
                  </a-form-model-item>
                </a-col>
+                <a-col :span="6" >
+                  <a-form-model-item
+                    class="from-label"
+                    label="船代"
+                    :labelCol="labelCol"
+                    :wrapperCol="wrapperCol"
+                    has-feedback
+                    prop="shipagency"
+                  >
+                    <selectView
+                      ref="shipagency"
+                      type="shipagency"
+                      :defaultVal="details.shipagency"
+                      searchApi="GetForwarderlist"
+                      :searchQuery="{ KeyWord: '' }"
+                      :showLabel="['name', 'showCode']"
+                      :openSearch="true"
+                      @change="getSelectViewRes"
+                    ></selectView>
+                  </a-form-model-item>
+                </a-col>
                <a-col :span="24">
                  <div style="height: 1px;background: rgb(170 176 185);margin: 5px 0;"></div>
                </a-col>
--- a/src/views/main/BookingLedger/list/modules/initData.js
+++ b/src/views/main/BookingLedger/list/modules/initData.js
@ -235,7 +235,7 @@ export default {
      sortable: true,
      slots: { default: 'bsstatusname' }
    },
-    { field: 'bookingno', label: 'BOOKINGNO', width: 160, title: '业务编号', showHeaderOverflow: true, sortable: true },
+    { field: 'bookingno', label: 'BOOKINGNO', width: 160, title: '订舱编号', showHeaderOverflow: true, sortable: true },
    { field: 'trucker', label: 'TRUCKER', width: 160, title: '车队', showHeaderOverflow: true, sortable: true },
    { field: 'tempset', label: 'TEMPSET', width: 160, title: '设置温度', showHeaderOverflow: true, sortable: true },
    { field: 'reeferf', label: 'REEFERF', width: 160, title: '通风度', showHeaderOverflow: true, sortable: true },
@ -421,13 +421,21 @@ export default {
      title: '装载放行',
      showHeaderOverflow: true,
      slots: { default: 'IsZZFX' }
+    },
+    {
+      field: 'custno',
+      label: 'custno',
+      width: 160,
+      title: '委托编号',
+      showHeaderOverflow: true,
+      showOverflow: false
    }
  ],
  // ==== 表单部分 ====
  condAllData: [
    { title: '委托单位', align: 'center', width: 160, label: 'CUSTOMERNAME', type: 'complete', showLabel: 'shortName' }, // 客户
    { title: '主提单号', align: 'center', width: 160, label: 'MBLNO', type: 'input' },
-    { title: '分提单号', align: 'center', width: 160, label: 'HBLNO', type: 'input' },
+    { title: '委托编号', align: 'center', width: 160, label: 'custno', type: 'input' },
    {
      title: '船公司',
      align: 'center',
--- a/src/views/main/ViewDeletedList/ViewDeletedList.vue
+++ b/src/views/main/ViewDeletedList/ViewDeletedList.vue
@ -214,7 +214,7 @@ import { XCard, setFormModel } from '@/components'
 import columnSetting from '@/components/tableColumnSetting'
 import formLabel from './modules/formLabel'
 import {
-  BookingOrderPage,
+  PageDataByBooking,
  SendTrace,
  GetVessellist,
  GetPortlist,
@ -1013,12 +1013,12 @@ export default {
      this.editColumnsSave(this.gridOptions.columns)
    },
    editColumnsSave(data = {}) {
-      DjyUserConfigAdd({
-        type: 'booking_list_column',
-        configJson: JSON.stringify(data)
-      }).then(res => {
-        this.$refs.setForm.handleCancel()
-      })
+      // DjyUserConfigAdd({
+      //   type: 'booking_list_column',
+      //   configJson: JSON.stringify(data)
+      // }).then(res => {
+      //   this.$refs.setForm.handleCancel()
+      // })
    },

    columnChange(data) {
@ -1068,9 +1068,8 @@ export default {
      if (isInit) {
        query.firstFlag = true
      }
-      BookingOrderPage(query)
+      PageDataByBooking(query)
        .then(res => {
-          console.log('BookingOrderPage==>>', query)
          if (res.success) {
            let newBookingList = {}
            if (query.PageNo !== 1) {