添加是否占舱，业务来源

src/api/modular/main/BookingLedger.js

@@ -805,3 +805,12 @@ export function ExcuteShippingOrderCompareBatch(parameter) {
     data: parameter
   })
 }
+
+// 分页查询订舱业务来源
+export function BookingSourcePage(parameter) {
+  return axios({
+    url: '/BookingSource/page',
+    method: 'get',
+    params: parameter
+  })
+}

src/layouts/BasicLayout.vue

@@ -132,7 +132,7 @@ export default {
     this.setBookingInfo()
   },
   methods: {
-    ...mapActions(['setSidebar', 'setCarrierList', 'setYardList', 'setPackageList', 'setIssuetypeList', 'setBlfrtList', 'setCtnallList', 'setLineList', 'setBookingInitData']),
+    ...mapActions(['setSidebar', 'setCarrierList', 'setYardList', 'setPackageList', 'setIssuetypeList', 'setBlfrtList', 'setCtnallList', 'setLineList', 'setBookingSourcePage', 'setBookingInitData']),
     // 重新生成
     setMenus () {
       const routes = convertRoutes(this.mainMenu.find(item => item.path === '/'))
@@ -165,6 +165,7 @@ export default {
       this.setBlfrtList()
       this.setCtnallList()
       this.setLineList()
+      this.setBookingSourcePage()
       this.setBookingInitData()
     }
   }

src/store/getters.js

@@ -27,7 +27,8 @@ const getters = {
   blfrtList: state => state.booking.blfrtList,
   ctnallList: state => state.booking.ctnallList,
   lineList: state => state.booking.lineList,
-  bookingInitData: state => state.booking.bookingInitData
+  bookingInitData: state => state.booking.bookingInitData,
+  sourceList: state => state.booking.sourceList
 }
 
 export default getters

src/store/modules/booking.js

@@ -6,7 +6,8 @@ import {
   GetFrt,
   GetCtn,
   GetTenantLineList,
-  GetAllSelectData
+  GetAllSelectData,
+  BookingSourcePage
 } from '@/api/modular/main/BookingLedger'
 
 const booking = {
@@ -18,6 +19,7 @@ const booking = {
     blfrtList: [],
     ctnallList: [],
     lineList: [],
+    sourceList: [],
     bookingInitData: {
       customernameInitList: [],
       forwarderInitList: [],
@@ -72,6 +74,9 @@ const booking = {
     SET_LINELIST: (state, list) => {
       state.lineList = list
     },
+    SET_SOURCELIST: (state, list) => {
+      state.sourceList = list
+    },
     SET_BOOKINGINITDATA: (state, obj) => {
       state.bookingInitData = { ...state.bookingInitData, ...obj }
     }
@@ -230,6 +235,26 @@ const booking = {
           })
       })
     },
+    setBookingSourcePage({ commit }, obj) {
+      return new Promise(resolve => {
+        BookingSourcePage({
+          SearchValue: ''
+        })
+          .then(response => {
+            if (response.success) {
+              commit('SET_SOURCELIST', response.data.rows)
+              resolve(response.data)
+            } else {
+              // eslint-disable-next-line no-undef
+              reject(new Error(data.message))
+            }
+          })
+          .catch(error => {
+            // eslint-disable-next-line no-undef
+            reject(error)
+          })
+      })
+    },
     setBookingInitData({ commit }, obj) {
       return new Promise(resolve => {
         GetAllSelectData().then(response => {

src/views/main/BookingLedger/detail/components/selectView.vue

@@ -59,7 +59,8 @@ import {
  GetForwarderlist,
  GetSysUserPage,
  GetService,
- getGoodsname
+ getGoodsname,
+ BookingSourcePage
 } from '@/api/modular/main/BookingLedger'
 import { mapGetters, mapActions } from 'vuex'
 let timer
@@ -112,7 +113,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['carrierList', 'yardList', 'packageList', 'issuetypeList', 'blfrtList', 'lineList', 'bookingInitData'])
+    ...mapGetters(['carrierList', 'yardList', 'packageList', 'issuetypeList', 'blfrtList', 'lineList', 'bookingInitData', 'sourceList'])
   },
   watch: {
     defaultVal(nval, oval) {
@@ -193,6 +194,8 @@ export default {
           return GetService
         case 'getGoodsname':
           return getGoodsname
+        case 'BookingSourcePage':
+          return BookingSourcePage
       }
     },
     emnuData (type) {
@@ -334,6 +337,8 @@ export default {
         case 'shippingMethod':
           const arr = this.$options.filters['dictData']('ShippingMethod') || []
           return arr
+        case 'sourceName':
+          return this.sourceList
       }
     },
     filterOption(input, option) {
@@ -386,7 +391,7 @@ export default {
         this.$refs.selectView.$refs.vcSelect.focus()
       }
       this.open = true
-      if (['cargoid', 'nobill', 'copynobill', 'carrierid', 'yard', 'kindpkgs', 'issuetype', 'blfrt', 'masterBolIndicator', 'salerCode', 'shippingMethod'].includes(this.type)) {
+      if (['cargoid', 'nobill', 'copynobill', 'carrierid', 'yard', 'kindpkgs', 'issuetype', 'blfrt', 'masterBolIndicator', 'salerCode', 'shippingMethod', 'sourceName'].includes(this.type)) {
         this.selectList = this.emnuData(this.type)
         this.inLoading = false
         return false

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

@@ -251,15 +251,15 @@ const initDetail = {
   issuedate: '',
   issueplace: '',
   issueplaceid: '',
-  nobill: 'THREE',
+  nobill: '',
-  copynobill: 'THREE',
+  copynobill: '',
   prepardat: '',
   prepardatid: '',
   payableat: '',
   payableatid: '',
   blfrt: '',
   thirdpayaddr: '',
-  service: 'CY-CY',
+  service: '',
   reeferf: '',
   tempset: '',
   tempid: '',
@@ -1052,7 +1052,7 @@ export default {
       }
       const $BookingEDIExt = { ...JSON.parse(JSON.stringify(bookingEDIExt)), ...res.data.bookingEDIExt }
       this.$set(this, 'bookingDetails', { ...this.bookingDetails, ...newData, ...{ bookingEDIExt: $BookingEDIExt } })
-      this.getDefaultVal()
+      // this.getDefaultVal()
       this.inPageLoading = false
       setTimeout(() => {
         setTimeout(() => {

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

@@ -206,7 +206,7 @@
           </a-row>
           <div class="from-box2">
             <a-row :gutter="10">
-              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
+              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="5">
                 <a-form-model-item
                   class="from-label"
                   label="船名"
@@ -231,7 +231,7 @@
                 </a-form-model-item>
               </a-col>
               <template v-if="details.carrierid === 'ESL'">
-                <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="5">
+                <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="4">
                   <a-form-model-item
                     class="from-label"
                     label="内部航次"
@@ -244,21 +244,9 @@
                     <inputView type="voynoinner" :parentVal="details.voynoinner" @getInputChange="inputChange" />
                   </a-form-model-item>
                 </a-col>
-                <!-- <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="5">
-                  <a-form-model-item
-                    class="from-label"
-                    label="航线代码"
-                    :labelCol="labelCol"
-                    :wrapperCol="wrapperCol"
-                    has-feedback
-                    prop="lanecode"
-                  >
-                    <inputView type="lanecode" :parentVal="details.lanecode" @getInputChange="inputChange" />
-                  </a-form-model-item>
-                </a-col> -->
               </template>
               <template v-else>
-                <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="5">
+                <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="4">
                   <a-form-model-item
                     class="from-label"
                     label="内部航次"
@@ -273,7 +261,7 @@
                 </a-col>
               </template>
               <template v-if="details.carrierid === 'ESL'">
-                <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
+                <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="5">
                   <a-form-model-item
                     class="from-label"
                     label="航次"
@@ -287,7 +275,7 @@
                 </a-col>
               </template>
               <template v-else>
-                <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
+                <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="5">
                   <a-form-model-item
                     class="from-label"
                     label="海关航次"
@@ -300,7 +288,7 @@
                   </a-form-model-item>
                 </a-col>
               </template>
-              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="7">
+              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="5">
                 <a-form-model-item
                   class="from-label"
                   label="开船日期"
@@ -322,6 +310,32 @@
                   </div>
                 </a-form-model-item>
               </a-col>
+              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="5">
+                <a-form-model-item
+                  class="from-label"
+                  label="是否占舱"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  has-feedback
+                  prop="zhanCangFlag"
+                >
+                  <!-- style="margin-left:10px;margin-top:-6px;" -->
+                  <div class="date-box">
+                    <!-- <a-checkbox size="small" v-model="details.zhanCangFlag">
+                      <template v-if="details.zhanCangFlag">是</template>
+                      <template v-else>否</template>
+                    </a-checkbox> -->
+                    <a-radio-group size="small" v-model="details.zhanCangFlag">
+                      <a-radio size="small" value="是">
+                        是
+                      </a-radio>
+                      <a-radio size="small" value="否">
+                        否
+                      </a-radio>
+                    </a-radio-group>
+                  </div>
+                </a-form-model-item>
+              </a-col>
               <!-- <template v-if="details.carrierid === 'ESL'">
                 <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="5">
                   <a-form-model-item
@@ -348,7 +362,7 @@
             </a-row>
             <a-row :gutter="10">
               <template>
-                <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
+                <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="5">
                   <a-form-model-item
                     class="from-label"
                     label="实际开船"
@@ -371,7 +385,7 @@
                 </a-col>
               </template>
               <template>
-                <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="5">
+                <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="4">
                   <a-form-model-item
                     class="from-label"
                     label="船司航线"
@@ -385,7 +399,7 @@
                   </a-form-model-item>
                 </a-col>
               </template>
-              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
+              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="5">
                 <a-form-model-item
                   class="from-label"
                   label="船代"
@@ -405,7 +419,7 @@
                   ></selectView>
                 </a-form-model-item>
               </a-col>
-              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
+              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="5">
                 <a-form-model-item
                   class="from-label"
                   label="航线"
@@ -425,6 +439,26 @@
                   ></selectView>
                 </a-form-model-item>
               </a-col>
+              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="5">
+                <a-form-model-item
+                  class="from-label"
+                  label="业务来源"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  has-feedback
+                  prop="sourceName"
+                >
+                  <selectView
+                    type="sourceName"
+                    :defaultVal="details.sourceName"
+                    searchApi="BookingSourcePage"
+                    :searchQuery="{ SearchValue: '' }"
+                    :showLabel="['name']"
+                    :openSearch="false"
+                    @change="getSelectViewRes"
+                  ></selectView>
+                </a-form-model-item>
+              </a-col>
             </a-row>
           </div>
           <a-row class="from-box3" :gutter="10">
@@ -1196,6 +1230,9 @@ export default {
       } else if (type === 'lineName') {
         this.details[type] = res.name || ''
         this.$emit('editLineName', true)
+      } else if (type === 'sourceName') {
+        this.details[type] = res.name || ''
+        this.details['sourceCode'] = res.code || ''
       }
     },
     dateChangeFun({ type, value }) {

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

@@ -93,7 +93,7 @@
               >
                 <selectView
                   type="nobill"
-                  :defaultVal="details.nobill || 'THREE'"
+                  :defaultVal="details.nobill"
                   searchApi="nobillData"
                   :searchQuery="{ name: '' }"
                   :showLabel="['name']"
@@ -113,7 +113,7 @@
               >
                 <selectView
                   type="copynobill"
-                  :defaultVal="details.copynobill || 'THREE'"
+                  :defaultVal="details.copynobill"
                   searchApi="copynobilllData"
                   :searchQuery="{ name: '' }"
                   :showLabel="['name']"

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

@@ -245,15 +245,15 @@ const sedDetail = {
   issuedate: '',
   issueplace: '',
   issueplaceid: '',
-  nobill: 'THREE',
+  nobill: '',
-  copynobill: 'THREE',
+  copynobill: '',
   prepardat: '',
   prepardatid: '',
   payableat: '',
   payableatid: '',
   blfrt: '',
   thirdpayaddr: '',
-  service: 'CY-CY',
+  service: '',
   reeferf: '',
   tempset: '',
   tempid: '',