更新问题

.env

@@ -11,8 +11,8 @@ VUE_APP_TYPE = 'gangjie'
 # VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345
 
 # 和川大简云测试
-# VUE_APP_API_BASE_URL=http://60.209.125.238:35100
+VUE_APP_API_BASE_URL=http://60.209.125.238:35100
-# VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100
+VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100
 
 # 客户端测试
 # VUE_APP_API_BASE_URL=http://60.209.125.238:30813
@@ -23,8 +23,8 @@ VUE_APP_TYPE = 'gangjie'
 # VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30814
 
 # 港捷
-VUE_APP_API_BASE_URL=http://118.190.144.189:5001
+# VUE_APP_API_BASE_URL=http://118.190.144.189:5001
-VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5001
+# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5001
 
 # 客户端正式
 # VUE_APP_API_BASE_URL=http://118.190.144.189:6001

.env.development

@@ -11,8 +11,8 @@ VUE_APP_TYPE = 'gangjie'
 # VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345
 
 # 和川大简云测试
-# VUE_APP_API_BASE_URL=http://60.209.125.238:35100
+VUE_APP_API_BASE_URL=http://60.209.125.238:35100
-# VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100
+VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100
 
 # 客户端测试
 # VUE_APP_API_BASE_URL=http://60.209.125.238:30813
@@ -26,8 +26,8 @@ VUE_APP_TYPE = 'gangjie'
 # VUE_APP_SOCKET_BASE_URL=http://192.168.0.80:7373/
 
 # 港捷
-VUE_APP_API_BASE_URL=http://118.190.144.189:5001
+# VUE_APP_API_BASE_URL=http://118.190.144.189:5001
-VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5001
+# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5001
 
 # 运营端正式
 # VUE_APP_API_BASE_URL=http://118.190.144.189:6002

src/store/getters.js

@@ -18,7 +18,9 @@ const getters = {
   multiTab: state => state.app.multiTab,
   lang: state => state.i18n.lang,
   bookingList: state => state.user.bookingList,
+  desChinaFlag: state => state.user.desChinaFlag,
   slotShow: state => state.user.slotShow,
+  subTenant: state => state.user.subTenant,
   vesselFrom: state => state.user.vesselFrom,
   tenantParam: state => state.user.tenantParam,
   bctaskType: state => state.user.bctaskType,

src/store/modules/user.js

@@ -17,10 +17,12 @@ const user = {
     name: '',
     welcome: '',
     firstFlag: true, // 订舱台账首次加载
+    desChinaFlag: false, // 货描是否可以输入中文
     feeShow: false, // 订舱详情是否显示费用
     slotShow: false, // 订舱详情是否显示舱位
     vesselFrom: false, // 船名下拉框采用哪种方式
     avatar: '',
+    subTenant: [], // 订舱子公司
     messageNum: 0,
     buttons: [], // 按钮权限
     admintype: '', // 是否是超管
@@ -113,6 +115,12 @@ const user = {
     SET_HASBOOKINGDETAIL: (state, obj) => {
       state.hasbookingDetail = obj
     },
+    SET_DESCHINA: (state, buttons) => {
+      state.desChinaFlag = buttons
+    },
+    SET_SUBTENANT: (state, obj) => {
+      state.subTenant = obj
+    },
     SET_FIRSTFLAG: (state, flag) => {
       state.firstFlag = flag
     }
@@ -174,6 +182,7 @@ const user = {
               }
               if (data.tenantParams) {
                 data.tenantParams.forEach(item => {
+                  // 是否显示占舱
                   if (item.paraCode === 'ENABLE_SLOT_ABILITY') {
                     if (item.paraValue === 'YES') {
                       commit('SET_SLOTSHOW', true)
@@ -181,6 +190,7 @@ const user = {
                       commit('SET_SLOTSHOW', false)
                     }
                   }
+                  // 是否显示费用
                   if (item.paraCode === 'ENABLE_FEE_ABILITY') {
                     if (item.paraValue === 'YES') {
                       commit('SET_FEESHOW', true)
@@ -188,6 +198,7 @@ const user = {
                       commit('SET_FEESHOW', false)
                     }
                   }
+                  // 船名选择数据源
                   if (item.paraCode === 'VESSEL_FROM_CONFIG_ONLY') {
                     if (item.paraValue === 'YES') {
                       commit('SET_VESSELFROM', true)
@@ -195,13 +206,27 @@ const user = {
                       commit('SET_VESSELFROM', false)
                     }
                   }
+                  // 马士基订舱
                   if (item.paraCode === 'BOOKING_CHANNEL_SELECT_SHOW') {
                     const arr = item.paraValue ? item.paraValue.split(',') : []
                     commit('SET_TENANTPARAM', arr)
                   }
+                  // 生成任务
                   if (item.paraCode === 'BC_TASK_CREATE_ORDER') {
                     commit('SET_BCTASKTYPE', item.paraValue)
                   }
+                  // 订舱子公司
+                  if (item.paraCode === 'BOOKING_SUB_TENANT') {
+                    let arr = []
+                    if (item.paraValue) {
+                      arr = JSON.parse(item.paraValue)
+                    }
+                    commit('SET_SUBTENANT', arr)
+                  }
+                    // 货描是否允许中文
+                  if (item.paraCode === 'DESCRIP_CAN_CHINESE') {
+                    commit('SET_DESCHINA', item.paraValue)
+                  }
                 })
                 if (data.tenantParams.length === 0) {
                   commit('SET_SLOTSHOW', false)

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

@@ -260,7 +260,7 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <template v-if="details.carrierid === 'ESL'">
+            <template v-if="details.carrierid === 'ESL' || details.carrierid === 'ESL-NEW'">
               <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/BookingGangjie/detail/modules/basicInfo.vue

@@ -277,7 +277,7 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <template v-if="['VOLTA', 'WHL', 'CSL', 'MSC', 'VOL','MSCFD','REL','FCS'].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"
@@ -351,7 +351,8 @@
                       :showLabel="['vessel']"
                       v-if="!vesselFrom"
                       :openSearch="true"
-                      @change="getSelectViewRes"></selectView>
+                      @change="getSelectViewRes">
+                    </selectView>
                     <selectView
                       class="copy-input"
                       ref="vesselView"
@@ -381,10 +382,7 @@
                     has-feedback
                     prop="voynoinner">
                     <!-- 内部航次暂无接口， 暂时改为输入框 -->
-                    <inputView
+                    <inputView type="voynoinner" :parentVal="details.voynoinner" @getInputChange="inputChange" />
-                      type="voynoinner"
-                      :parentVal="details.voynoinner"
-                      @getInputChange="inputChange" />
                   </a-form-model-item>
                 </a-col>
               </template>
@@ -398,10 +396,7 @@
                     has-feedback
                     prop="voynoinner">
                     <!-- 内部航次暂无接口， 暂时改为输入框 -->
-                    <inputView
+                    <inputView type="voynoinner" :parentVal="details.voynoinner" @getInputChange="inputChange" />
-                      type="voynoinner"
-                      :parentVal="details.voynoinner"
-                      @getInputChange="inputChange" />
                   </a-form-model-item>
                 </a-col>
               </template>
@@ -427,11 +422,7 @@
                     :wrapperCol="wrapperCol2"
                     has-feedback
                     prop="voyno">
-                    <inputView
+                    <inputView ref="voyno" type="voyno" :parentVal="details.voyno" @getInputChange="inputChange" />
-                      ref="voyno"
-                      type="voyno"
-                      :parentVal="details.voyno"
-                      @getInputChange="inputChange" />
                   </a-form-model-item>
                 </a-col>
               </template>
@@ -572,12 +563,12 @@
               </a-col>
             </a-row>
             <a-row :gutter="10">
-              <a-col :xs="24" :sm="9" :md="9" :lg="9" :xl="4">
+              <a-col :xs="24" :sm="9" :md="9" :lg="9" :xl="5">
                 <a-form-model-item
                   class="from-label"
                   label="ERP代码"
-                  :labelCol="{span:7}"
+                  :labelCol="{ span: 8 }"
-                  :wrapperCol="{span:17}"
+                  :wrapperCol="{ span: 16 }"
                   has-feedback
                   prop="erpCode">
                   <inputView
@@ -591,8 +582,8 @@
                 <a-form-model-item
                   class="from-label"
                   label="操作备注"
-                  :labelCol="labelCol3"
+                  :labelCol="{ span: 5 }"
-                  :wrapperCol="wrapperCol3"
+                  :wrapperCol="{ span: 19 }"
                   has-feedback
                   prop="czRemark">
                   <inputView
@@ -602,12 +593,12 @@
                     @getInputChange="inputChange" />
                 </a-form-model-item>
               </a-col>
-              <a-col :xs="24" :sm="9" :md="9" :lg="9" :xl="7">
+              <a-col :xs="24" :sm="9" :md="9" :lg="9" :xl="6">
                 <a-form-model-item
                   class="from-label"
                   label="单证备注"
-                  :labelCol="labelCol3"
+                  :labelCol="{ span: 7 }"
-                  :wrapperCol="wrapperCol3"
+                  :wrapperCol="{ span: 17 }"
                   has-feedback
                   prop="dzRemark">
                   <inputView
@@ -621,8 +612,8 @@
                 <a-form-model-item
                   class="from-label"
                   label="申请箱使"
-                  :labelCol="labelCol3"
+                  :labelCol="{ span: 7 }"
-                  :wrapperCol="wrapperCol3"
+                  :wrapperCol="{ span: 17 }"
                   has-feedback
                   prop="shenQingXiangShi">
                   <inputView
@@ -633,6 +624,31 @@
                 </a-form-model-item>
               </a-col>
             </a-row>
+            <a-row>
+              <a-col
+                v-if="subTenantList.length>0"
+                :xs="24"
+                :sm="9"
+                :md="9"
+                :lg="9"
+                :xl="5">
+                <a-form-model-item
+                  class="from-label"
+                  label="所属公司"
+                  :labelCol="{ span: 8 }"
+                  :wrapperCol="{ span: 16 }"
+                  has-feedback
+                  prop="subTenant">
+                  <selectView
+                    type="subTenant"
+                    :defaultVal="details.subTenant"
+                    :disabled="BookingLockOrder['subTenantId'] && isLockBooking"
+                    :showLabel="['name']"
+                    @change="getSelectViewRes">
+                  </selectView>
+                </a-form-model-item>
+              </a-col>
+            </a-row>
           </div>
         </a-form-model>
       </div>
@@ -742,6 +758,7 @@ export default {
   data() {
     return {
       frompre: {},
+      subTenantList: [],
       type: this.$route.query.type,
       basicDetails: JSON.parse(JSON.stringify(this.details)),
       BookingLockOrder: {},
@@ -974,10 +991,12 @@ export default {
   },
   created() {
     this.init()
+    const arr = this.subTenant
+    this.subTenantList = arr
   },
   computed: {
     ...mapGetters([
-      'projectDict', 'vesselFrom'
+      'projectDict', 'vesselFrom', 'subTenant'
     ])
   },
   methods: {
@@ -1252,14 +1271,14 @@ export default {
         }
         if (res.serviceItem) {
           const WserviceItem = []
-            res.serviceItem.split(']').forEach((item) => {
+          res.serviceItem.split(']').forEach((item) => {
-              if (item.split('[')[1]) {
+            if (item.split('[')[1]) {
-                WserviceItem.push(item.split('[')[1])
+              WserviceItem.push(item.split('[')[1])
-              }
+            }
-            })
+          })
-            console.log(WserviceItem)
+          console.log(WserviceItem)
-            // this.details.saveServiceList = WserviceItem
+          // this.details.saveServiceList = WserviceItem
-            // this.$emit('handleSaveService', WserviceItem)
+          // this.$emit('handleSaveService', WserviceItem)
         } else {
           this.details.saveServiceList = []
           this.$emit('handleSaveService', [])
@@ -1302,6 +1321,9 @@ export default {
       } else if (type === 'thirdPay') {
         this.details.thirdPay = res.shortName || ''
         this.details.thirdPaytode = Number(res.id) || ''
+      } else if (type === 'subTenantId') {
+        this.details.subTenantId = res.id || ''
+        this.details.subTenantName = res.name || ''
       }
     },
     dateChangeFun({ type, value }) {
@@ -1338,14 +1360,16 @@ export default {
 .ant-col-xl-4-8 {
   width: 20%;
 }
+
 .customer-btn {
-      display: inline-block;
+  display: inline-block;
-      font-size: 12px !important;
+  font-size: 12px !important;
-      padding: 0px !important;
+  padding: 0px !important;
-      color: @primary-color;
+  color: @primary-color;
-      cursor: pointer;
+  cursor: pointer;
-      margin-top: -4px;
+  margin-top: -4px;
-    }
+}
+
 /deep/ .ant-card-body {
   padding-left: 10px !important;
 }

src/views/main/BookingGangjie/list/modules/formLabel.vue

@@ -231,7 +231,8 @@ export default {
       'lineList',
       'bookingInitData',
       'dpTreeList',
-      'statusDIct'
+      'statusDIct',
+      'subTenant'
     ])
   },
   mounted() { },
@@ -399,6 +400,7 @@ export default {
             'taskCategory',
             'taskSource',
             'taskType',
+            'subTenantName',
             'OP',
             'VESSEL',
             'bsStatusList'
@@ -448,6 +450,8 @@ export default {
           return this.dpTreeList
         case 'OrgOp':
           return this.dpTreeList
+        case 'subTenantName':
+          return this.subTenant
         case 'VESSEL':
           return localStorage.getItem('vesselInfo') ? JSON.parse(localStorage.getItem('vesselInfo')) : []
         case 'BSSTATUSNAME':

src/views/main/BookingLedger/detail/childModules/sendMail.vue

@@ -263,6 +263,7 @@ export default {
         this.downloading = false
       })
     },
+    // 打开后获取各类人 必须要有邮箱才能显示出来 以及根据订舱内容赋值主题
     getPeople(data) {
       const arr = data.contacts ? data.contacts : []
       const arr1 = []

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

@@ -153,7 +153,8 @@ export default {
       'sourceList',
       'countryList',
       'agentFilter',
-      'yardFilter'
+      'yardFilter',
+      'subTenant'
     ])
   },
   watch: {
@@ -396,6 +397,8 @@ export default {
           return this.countryList
         case 'shippercountry':
           return this.countryList
+        case 'subTenant':
+          return this.subTenant
       }
     },
     filterOption(input, option) {
@@ -446,7 +449,6 @@ export default {
       }
     },
     getSelectFirst(e, canClick = true) {
-      console.log(e)
       if (canClick) {
         this.$refs.selectView.$refs.vcSelect.$refs.arrow.click()
       } else {
@@ -461,6 +463,7 @@ export default {
           'carrierid',
           'carrier',
           'yard',
+          'subTenant',
           'kindpkgs',
           'issuetype',
           'blfrt',

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

@@ -5,11 +5,11 @@
     :disabled="disabled"
     :style="`width:${width}%;display:inline-block;height: ${height}px`"
     @input="debounce(textareaChange, 300, $event)"
-    @blur="textareaBlur"
+    @blur="textareaBlur"></textarea>
-  ></textarea>
   <!--  -->
 </template>
 <script>
+import { mapGetters } from 'vuex'
 let timer
 export default {
   name: '',
@@ -45,6 +45,11 @@ export default {
       inEdit: false
     }
   },
+  computed: {
+    ...mapGetters([
+      'desChinaFlag'
+    ])
+  },
   watch: {
     parentVal(nval, oval) {
       if (this.inEdit) {
@@ -53,7 +58,7 @@ export default {
       this.value = nval
     }
   },
-  mounted() {},
+  mounted() { },
   methods: {
     debounce(func, wait, ...args) {
       if (timer) clearTimeout(timer)
@@ -103,11 +108,30 @@ export default {
       // tab键转换暂时屏蔽，看后台转换的效果，再放开
       tmp = tmp.replace(/\t/gi, ' ')
       // 中文字符，看后台转换效果，后修改
-      if (/[\u4E00-\u9FA5]+/g.test(tmp) && ['description', 'marks'].includes(this.type)) {
+      if (/[\u4E00-\u9FA5]+/g.test(tmp) && ['marks'].includes(this.type)) {
         tmp = tmp.replace(/[\u4E00-\u9FA5]+/g, '')
         this.$message.error(`${this.getTypeName(this.type)}中，不支持中文字符`)
       }
-      console.log(tmp,str)
+      if (/[\u4E00-\u9FA5]+/g.test(tmp) && ['description'].includes(this.type)) {
+        if (!this.desChinaFlag) {
+          tmp = tmp.replace(/[\u4E00-\u9FA5]+/g, '')
+          this.$message.error(`${this.getTypeName(this.type)}中，不支持中文字符`)
+        }
+      }
+      const regex = /^[A-Za-z0-9 \n`~!@#$%^&*()-_=+[\]{}|;:'",.<>/?]+$/;
+      if (tmp) {
+        if (regex.test(tmp)) {
+          console.log('输入符合要求');
+        } else {
+          if (['description'].includes(this.type)) {
+            if (!this.desChinaFlag) {
+              this.$message.warning('有特殊字符或者中文')
+            }
+          } else {
+            this.$message.warning('有特殊字符或者中文')
+          }
+        }
+      }
       return tmp
     },
     getTypeName(type) {

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

@@ -2,62 +2,121 @@
   <div class="basic-info">
     <x-card style="padding-top: 15px;">
       <div slot="content" style="margin-top: -24px;">
-        <a-form-model style="margin-bottom: 10px" size="small" ref="basicFrom" :selfUpdate="true" :model="details"
+        <a-form-model
+          style="margin-bottom: 10px"
+          size="small"
+          ref="basicFrom"
+          :selfUpdate="true"
+          :model="details"
           :rules="rules">
           <a-row class="from-box">
             <a-col :xs="12" :sm="12" :md="12" :lg="{ span: '4-8' }" :xl="{ span: '4-8' }">
-              <a-form-model-item class="from-label" prop="customername" label="委托单位" :labelCol="labelCol4"
+              <a-form-model-item
-                :wrapperCol="wrapperCol4" has-feedback>
+                class="from-label"
+                prop="customername"
+                label="委托单位"
+                :labelCol="labelCol4"
+                :wrapperCol="wrapperCol4"
+                has-feedback>
                 <div class="customer-box">
-                  <selectView type="customername" :defaultVal="details.customername" searchApi="DjyCustomerSuggest"
+                  <selectView
-                    :searchQuery="{ keyword: '', type: 'consignor' }" :showLabel="['shortName']" :openSearch="true"
+                    type="customername"
-                    :disabled="BookingLockOrder['CUSTOMERNAME'] && isLockBooking" :isCopy="true"
+                    :defaultVal="details.customername"
-                    @change="getSelectViewRes" style="flex: 1; margin-top: -4px"></selectView>
+                    searchApi="DjyCustomerSuggest"
-                  <span class="customer-btn iconfont icon-touxiang" @click.stop="changeCustomer('select')"
+                    :searchQuery="{ keyword: '', type: 'consignor' }"
+                    :showLabel="['shortName']"
+                    :openSearch="true"
+                    :disabled="BookingLockOrder['CUSTOMERNAME'] && isLockBooking"
+                    :isCopy="true"
+                    @change="getSelectViewRes"
+                    style="flex: 1; margin-top: -4px"></selectView>
+                  <span
+                    class="customer-btn iconfont icon-touxiang"
+                    @click.stop="changeCustomer('select')"
                     :style="{ paddingRight: '0px' }"></span>
                   <span class="customer-btn iconfont icon-jiahao2fill" @click.stop="changeCustomer('add')"></span>
                 </div>
               </a-form-model-item>
             </a-col>
             <a-col :xs="12" :sm="12" :md="12" :lg="{ span: '4-8' }" :xl="{ span: '4-8' }">
-              <a-form-model-item class="from-label" prop="thirdPay" label="第三方" :labelCol="labelCol2"
+              <a-form-model-item
-                :wrapperCol="wrapperCol2" has-feedback>
+                class="from-label"
+                prop="thirdPay"
+                label="第三方"
+                :labelCol="labelCol2"
+                :wrapperCol="wrapperCol2"
+                has-feedback>
                 <div class="customer-box">
-                  <selectView type="thirdPay" :defaultVal="details.thirdPay" searchApi="DjyCustomerSuggest"
+                  <selectView
-                    :searchQuery="{ keyword: '', type: 'consignor' }" :showLabel="['shortName']"
+                    type="thirdPay"
-                    :disabled="BookingLockOrder['thirdPay'] && isLockBooking" :openSearch="true" :isCopy="true"
+                    :defaultVal="details.thirdPay"
-                    @change="getSelectViewRes" style="flex: 1; margin-top: -4px"></selectView>
+                    searchApi="DjyCustomerSuggest"
+                    :searchQuery="{ keyword: '', type: 'consignor' }"
+                    :showLabel="['shortName']"
+                    :disabled="BookingLockOrder['thirdPay'] && isLockBooking"
+                    :openSearch="true"
+                    :isCopy="true"
+                    @change="getSelectViewRes"
+                    style="flex: 1; margin-top: -4px"></selectView>
                 </div>
               </a-form-model-item>
             </a-col>
             <a-col :xs="12" :sm="12" :md="12" :lg="{ span: '4-8' }" :xl="{ span: '4-8' }">
-              <a-form-model-item class="from-label" label="PO NO" :labelCol="labelCol2" :wrapperCol="wrapperCol2"
+              <a-form-model-item
-                has-feedback prop="pono">
+                class="from-label"
-                <inputView :ishd="BookingLockOrder['pono'] && isLockBooking" type="pono" :parentVal="details.pono"
+                label="PO NO"
+                :labelCol="labelCol2"
+                :wrapperCol="wrapperCol2"
+                has-feedback
+                prop="pono">
+                <inputView
+                  :ishd="BookingLockOrder['pono'] && isLockBooking"
+                  type="pono"
+                  :parentVal="details.pono"
                   @getInputChange="inputChange" />
               </a-form-model-item>
             </a-col>
             <a-col :xs="12" :sm="12" :md="12" :lg="{ span: '4-8' }" :xl="{ span: '4-8' }">
-              <a-form-model-item class="from-label" label="船公司" prop="carrierid" :labelCol="labelCol2"
+              <a-form-model-item
-                :wrapperCol="wrapperCol2" has-feedback>
+                class="from-label"
-                <selectView ref="carrierid" type="carrierid" :defaultVal="details.carrierid" searchApi="GetCarrierlist"
+                label="船公司"
-                  :searchQuery="{ keyword: '', type: 'consignor' }" :showLabel="['cnName', 'code']"
+                prop="carrierid"
-                  :disabled="BookingLockOrder['carrier'] && isLockBooking" :openSearch="false"
+                :labelCol="labelCol2"
-                  @change="getSelectViewRes" style="flex: 1; margin-top: -4px"></selectView>
+                :wrapperCol="wrapperCol2"
+                has-feedback>
+                <selectView
+                  ref="carrierid"
+                  type="carrierid"
+                  :defaultVal="details.carrierid"
+                  searchApi="GetCarrierlist"
+                  :searchQuery="{ keyword: '', type: 'consignor' }"
+                  :showLabel="['cnName', 'code']"
+                  :disabled="BookingLockOrder['carrier'] && isLockBooking"
+                  :openSearch="false"
+                  @change="getSelectViewRes"
+                  style="flex: 1; margin-top: -4px"></selectView>
               </a-form-model-item>
             </a-col>
             <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="{
+              <a-form-model-item
-                xs: { span: 24 },
+                class="from-label"
-                sm: { span: 9 },
+                label="是否占舱"
-                md: { span: 9 }
+                :labelCol="{
-              }" :wrapperCol="{
+                  xs: { span: 24 },
+                  sm: { span: 9 },
+                  md: { span: 9 }
+                }"
+                :wrapperCol="{
                   xs: { span: 24 },
                   sm: { span: 12 },
                   md: { span: 12 }
-                }" has-feedback prop="zhanCangFlag">
+                }"
+                has-feedback
+                prop="zhanCangFlag">
                 <div class="date-box">
-                  <a-radio-group :disabled="BookingLockOrder['zhanCangFlag'] && isLockBooking" size="small"
+                  <a-radio-group
+                    :disabled="BookingLockOrder['zhanCangFlag'] && isLockBooking"
+                    size="small"
                     v-model="details.zhanCangFlag">
                     <a-radio size="small" value="是"> 是 </a-radio>
                     <a-radio size="small" value="否"> 否 </a-radio>
@@ -66,55 +125,101 @@
               </a-form-model-item>
             </a-col>
             <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="labelCol4" :wrapperCol="wrapperCol4"
+              <a-form-model-item
-                has-feedback prop="custno">
+                class="from-label"
-                <inputView :ishd="BookingLockOrder['custno'] && isLockBooking" type="custno" :parentVal="details.custno"
+                label="订舱编号"
+                :labelCol="labelCol4"
+                :wrapperCol="wrapperCol4"
+                has-feedback
+                prop="custno">
+                <inputView
+                  :ishd="BookingLockOrder['custno'] && isLockBooking"
+                  type="custno"
+                  :parentVal="details.custno"
                   @getInputChange="inputChange" />
               </a-form-model-item>
             </a-col>
             <a-col :xs="12" :sm="12" :md="12" :lg="{ span: '4-8' }" :xl="{ span: '4-8' }">
-              <a-form-model-item class="from-label" label="提单号" prop="mblno" :labelCol="labelCol2"
+              <a-form-model-item
-                :wrapperCol="wrapperCol2" has-feedback>
+                class="from-label"
-                <inputView type="mblno" :parentVal="details.mblno" :ishd="BookingLockOrder['mblno'] && isLockBooking"
+                label="提单号"
+                prop="mblno"
+                :labelCol="labelCol2"
+                :wrapperCol="wrapperCol2"
+                has-feedback>
+                <inputView
+                  type="mblno"
+                  :parentVal="details.mblno"
+                  :ishd="BookingLockOrder['mblno'] && isLockBooking"
                   @getInputChange="inputChange" />
               </a-form-model-item>
             </a-col>
             <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="labelCol2" :wrapperCol="wrapperCol2"
+              <a-form-model-item
-                has-feedback prop="hblno">
+                class="from-label"
-                <inputView :ishd="BookingLockOrder['hblno'] && isLockBooking" type="hblno" :parentVal="details.hblno"
+                label="分提单号"
+                :labelCol="labelCol2"
+                :wrapperCol="wrapperCol2"
+                has-feedback
+                prop="hblno">
+                <inputView
+                  :ishd="BookingLockOrder['hblno'] && isLockBooking"
+                  type="hblno"
+                  :parentVal="details.hblno"
                   @getInputChange="inputChange" />
               </a-form-model-item>
             </a-col>
             <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="labelCol2" :wrapperCol="wrapperCol2"
+              <a-form-model-item
-                has-feedback prop="forwarder">
+                class="from-label"
-                <selectView type="forwarder" ref="forwarder" :defaultVal="details.forwarder" :agentFilter="agentFilter"
+                label="订舱代理"
-                  :details="details" searchApi="DjyCustomerSuggest"
+                :labelCol="labelCol2"
+                :wrapperCol="wrapperCol2"
+                has-feedback
+                prop="forwarder">
+                <selectView
+                  type="forwarder"
+                  ref="forwarder"
+                  :defaultVal="details.forwarder"
+                  :agentFilter="agentFilter"
+                  :details="details"
+                  searchApi="DjyCustomerSuggest"
                   :disabled="BookingLockOrder['forwarder'] && isLockBooking"
-                  :searchQuery="{ keyword: '', type: 'booking_agent' }" :showLabel="['shortName']" :openSearch="true"
+                  :searchQuery="{ keyword: '', type: 'booking_agent' }"
-                  @change="getSelectViewRes" style="flex: 1; margin-top: -4px"></selectView>
+                  :showLabel="['shortName']"
+                  :openSearch="true"
+                  @change="getSelectViewRes"
+                  style="flex: 1; margin-top: -4px"></selectView>
               </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" :labelCol="{
+                <a-form-model-item
-                  xs: { span: 24 },
+                  class="from-label"
-                  sm: { span: 10 },
+                  :labelCol="{
-                  md: { span: 10 }
+                    xs: { span: 24 },
-                }" :wrapperCol="{
+                    sm: { span: 10 },
+                    md: { span: 10 }
+                  }"
+                  :wrapperCol="{
                     xs: { span: 24 },
                     sm: { span: 14 },
                     md: { span: 14 }
-                  }" has-feedback>
+                  }"
+                  has-feedback>
                   <span slot="label"> <span class="mustRed">运费协议号</span> </span>
                   <div class="copy-box">
                     <template>
-                      <autoView class="copy-input" type="contractno"
+                      <autoView
-                        :disabled="BookingLockOrder['contractno'] && isLockBooking" :defaultVal="details.contractno"
+                        class="copy-input"
-                        :dropdownStyle="{ width: '300px' }" searchApi="getContractno"
+                        type="contractno"
+                        :disabled="BookingLockOrder['contractno'] && isLockBooking"
+                        :defaultVal="details.contractno"
+                        :dropdownStyle="{ width: '300px' }"
+                        searchApi="getContractno"
                         :searchQuery="{ queryItem: '', top: 50, laneCName: this.details.lineName, carrier: this.details.carrierid, pod: this.details.destinationid }"
-                        :showLabel="['contractNo']" @select="getAutoViewRes"></autoView>
+                        :showLabel="['contractNo']"
+                        @select="getAutoViewRes"></autoView>
                     </template>
                   </div>
                 </a-form-model-item>
@@ -122,20 +227,36 @@
             </template>
             <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 class="from-label" label="EP号" :labelCol="labelCol4" :wrapperCol="wrapperCol4"
+                <a-form-model-item
-                  has-feedback prop="epCode">
+                  class="from-label"
-                  <inputView :ishd="BookingLockOrder['epCode'] && isLockBooking" type="epCode"
+                  label="EP号"
-                    :parentVal="details.epCode" @getInputChange="inputChange" />
+                  :labelCol="labelCol4"
+                  :wrapperCol="wrapperCol4"
+                  has-feedback
+                  prop="epCode">
+                  <inputView
+                    :ishd="BookingLockOrder['epCode'] && isLockBooking"
+                    type="epCode"
+                    :parentVal="details.epCode"
+                    @getInputChange="inputChange" />
                 </a-form-model-item>
               </a-col>
             </template>
             <template
               v-if="['VOLTA', 'WHL', 'CSL', 'MSC', 'VOL', 'MSCFD', 'REL', 'FCS', 'YML'].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" label="真提单号" :labelCol="labelCol4" :wrapperCol="wrapperCol4"
+                <a-form-model-item
-                  has-feedback prop="tmblno">
+                  class="from-label"
-                  <inputView :ishd="BookingLockOrder['tmblno'] && isLockBooking" type="tmblno"
+                  label="真提单号"
-                    :parentVal="details.tmblno" @getInputChange="inputChange" />
+                  :labelCol="labelCol4"
+                  :wrapperCol="wrapperCol4"
+                  has-feedback
+                  prop="tmblno">
+                  <inputView
+                    :ishd="BookingLockOrder['tmblno'] && isLockBooking"
+                    type="tmblno"
+                    :parentVal="details.tmblno"
+                    @getInputChange="inputChange" />
                 </a-form-model-item>
               </a-col>
             </template>
@@ -143,163 +264,326 @@
           <div class="from-box2">
             <a-row>
               <a-col :xs="12" :sm="12" :md="12" :lg="{ span: '4-8' }" :xl="5">
-                <a-form-model-item class="from-label" label="开船日期" :labelCol="labelCol4" :wrapperCol="wrapperCol4"
+                <a-form-model-item
-                  has-feedback prop="etd">
+                  class="from-label"
+                  label="开船日期"
+                  :labelCol="labelCol4"
+                  :wrapperCol="wrapperCol4"
+                  has-feedback
+                  prop="etd">
                   <div class="date-box">
-                    <datePickerView class="date-picker" :disabled="BookingLockOrder['etd'] && isLockBooking"
+                    <datePickerView
-                      :parentVal="details.etd" type="etd" format="YYYY-MM-DD" @dateChange="dateChangeFun"
+                      class="date-picker"
+                      :disabled="BookingLockOrder['etd'] && isLockBooking"
+                      :parentVal="details.etd"
+                      type="etd"
+                      format="YYYY-MM-DD"
+                      @dateChange="dateChangeFun"
                       style="margin-top: -5px"></datePickerView>
                     <span class="week" v-if="etdWeek && etdWeek !== 'NaN'">W{{ etdWeek || '--' }}</span>
                   </div>
                 </a-form-model-item>
               </a-col>
               <a-col :xs="12" :sm="12" :md="12" :lg="{ span: '4-8' }" :xl="6">
-                <a-form-model-item class="from-label" label="船名" :labelCol="{
+                <a-form-model-item
-                  xs: { span: 24 },
+                  class="from-label"
-                  sm: { span: 4 },
+                  label="船名"
-                  md: { span: 4 }
+                  :labelCol="{
-                }" :wrapperCol="{
+                    xs: { span: 24 },
+                    sm: { span: 4 },
+                    md: { span: 4 }
+                  }"
+                  :wrapperCol="{
                     xs: { span: 24 },
                     sm: { span: 20 },
                     md: { span: 20 }
-                  }" has-feedback prop="vessel">
+                  }"
+                  has-feedback
+                  prop="vessel">
                   <div class="copy-box">
-                    <selectView class="copy-input" ref="vesselView" type="vessel"
+                    <selectView
-                      :disabled="BookingLockOrder['vessel'] && isLockBooking" :defaultVal="details.vessel"
+                      class="copy-input"
-                      searchApi="getVesselInfoService" :searchQuery="{
+                      ref="vesselView"
+                      type="vessel"
+                      :disabled="BookingLockOrder['vessel'] && isLockBooking"
+                      :defaultVal="details.vessel"
+                      searchApi="getVesselInfoService"
+                      :searchQuery="{
                         KeyWord: '',
                         CarrierID: this.details.carrierid || 'CMA',
                         ETD: this.details.etd || ''
-                      }" :showLabel="['vessel']" :openSearch="true" @change="getSelectViewRes"></selectView>
+                      }"
+                      :showLabel="['vessel']"
+                      :openSearch="true"
+                      @change="getSelectViewRes"></selectView>
                   </div>
                 </a-form-model-item>
               </a-col>
               <template v-if="details.carrierid === 'ESL'">
                 <a-col :xs="12" :sm="12" :md="8" :lg="{ span: '4-8' }" :xl="4">
-                  <a-form-model-item class="from-label" label="内部航次" :labelCol="labelCol2" :wrapperCol="wrapperCol2"
+                  <a-form-model-item
-                    has-feedback prop="voynoinner">
+                    class="from-label"
+                    label="内部航次"
+                    :labelCol="labelCol2"
+                    :wrapperCol="wrapperCol2"
+                    has-feedback
+                    prop="voynoinner">
                     <!-- 内部航次暂无接口， 暂时改为输入框 -->
-                    <inputView :ishd="true" type="voynoinner" :parentVal="details.voynoinner"
+                    <inputView
+                      :ishd="true"
+                      type="voynoinner"
+                      :parentVal="details.voynoinner"
                       @getInputChange="inputChange" />
                   </a-form-model-item>
                 </a-col>
               </template>
               <template v-else>
                 <a-col :xs="12" :sm="12" :md="8" :lg="{ span: '4-8' }" :xl="4">
-                  <a-form-model-item class="from-label" label="内部航次" :labelCol="labelCol2" :wrapperCol="wrapperCol2"
+                  <a-form-model-item
-                    has-feedback prop="voynoinner">
+                    class="from-label"
+                    label="内部航次"
+                    :labelCol="labelCol2"
+                    :wrapperCol="wrapperCol2"
+                    has-feedback
+                    prop="voynoinner">
                     <!-- 内部航次暂无接口， 暂时改为输入框 -->
-                    <inputView :ishd="true" type="voynoinner" :parentVal="details.voynoinner"
+                    <inputView
+                      :ishd="true"
+                      type="voynoinner"
+                      :parentVal="details.voynoinner"
                       @getInputChange="inputChange" />
                   </a-form-model-item>
                 </a-col>
               </template>
               <template v-if="details.carrierid === 'ESL'">
                 <a-col :xs="12" :sm="12" :md="12" :lg="{ span: '4-8' }" :xl="4">
-                  <a-form-model-item class="from-label" label="航次" :labelCol="labelCol2" :wrapperCol="wrapperCol2"
+                  <a-form-model-item
-                    has-feedback prop="voyno">
+                    class="from-label"
+                    label="航次"
+                    :labelCol="labelCol2"
+                    :wrapperCol="wrapperCol2"
+                    has-feedback
+                    prop="voyno">
                     <inputView :ishd="true" type="voyno" :parentVal="details.voyno" @getInputChange="inputChange" />
                   </a-form-model-item>
                 </a-col>
               </template>
               <template v-else>
                 <a-col :xs="12" :sm="12" :md="12" :lg="{ span: '4-8' }" :xl="4">
-                  <a-form-model-item class="from-label" label="海关航次" :labelCol="labelCol2" :wrapperCol="wrapperCol2"
+                  <a-form-model-item
-                    has-feedback prop="voyno">
+                    class="from-label"
-                    <inputView :ishd="true" ref="voyno" type="voyno" :parentVal="details.voyno"
+                    label="海关航次"
+                    :labelCol="labelCol2"
+                    :wrapperCol="wrapperCol2"
+                    has-feedback
+                    prop="voyno">
+                    <inputView
+                      :ishd="true"
+                      ref="voyno"
+                      type="voyno"
+                      :parentVal="details.voyno"
                       @getInputChange="inputChange" />
                   </a-form-model-item>
                 </a-col>
               </template>
               <a-col :xs="12" :sm="12" :md="12" :lg="{ span: '4-8' }" :xl="4">
-                <a-form-model-item class="from-label" label="船司航线" :labelCol="labelCol" :wrapperCol="wrapperCol"
+                <a-form-model-item
-                  has-feedback prop="lanename">
+                  class="from-label"
+                  label="船司航线"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  has-feedback
+                  prop="lanename">
                   <!-- 航线暂无接口， 暂时改为输入框-->
-                  <inputView :ishd="BookingLockOrder['lanename'] && isLockBooking" type="lanename"
+                  <inputView
-                    :parentVal="details.lanename" @getInputChange="inputChange" />
+                    :ishd="BookingLockOrder['lanename'] && isLockBooking"
+                    type="lanename"
+                    :parentVal="details.lanename"
+                    @getInputChange="inputChange" />
                 </a-form-model-item>
               </a-col>
             </a-row>
             <a-row :gutter="10">
               <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="4">
-                <a-form-model-item class="from-label" label="揽货人" :labelCol="userLabelCol" :wrapperCol="userWrapperCol"
+                <a-form-model-item
-                  has-feedback prop="sale">
+                  class="from-label"
-                  <selectView type="sale" :disabled="true" :defaultVal="details.sale" searchApi="GetSysUserPage"
+                  label="揽货人"
-                    :searchQuery="{ name: '' }" :showLabel="['name']" :openSearch="true" @change="getSelectViewRes">
+                  :labelCol="userLabelCol"
+                  :wrapperCol="userWrapperCol"
+                  has-feedback
+                  prop="sale">
+                  <selectView
+                    type="sale"
+                    :disabled="true"
+                    :defaultVal="details.sale"
+                    searchApi="GetSysUserPage"
+                    :searchQuery="{ name: '' }"
+                    :showLabel="['name']"
+                    :openSearch="true"
+                    @change="getSelectViewRes">
                   </selectView>
                 </a-form-model-item>
               </a-col>
               <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="4">
-                <a-form-model-item class="from-label" label="客服" :labelCol="userLabelCol1" :wrapperCol="userWrapperCol1"
+                <a-form-model-item
-                  has-feedback prop="custservice">
+                  class="from-label"
-                  <selectView type="custservice" :defaultVal="details.custservice"
+                  label="客服"
-                    :disabled="BookingLockOrder['custservice'] && isLockBooking" searchApi="GetSysUserPage"
+                  :labelCol="userLabelCol1"
-                    :searchQuery="{ name: '' }" :showLabel="['name']" :openSearch="true" @change="getSelectViewRes">
+                  :wrapperCol="userWrapperCol1"
+                  has-feedback
+                  prop="custservice">
+                  <selectView
+                    type="custservice"
+                    :defaultVal="details.custservice"
+                    :disabled="BookingLockOrder['custservice'] && isLockBooking"
+                    searchApi="GetSysUserPage"
+                    :searchQuery="{ name: '' }"
+                    :showLabel="['name']"
+                    :openSearch="true"
+                    @change="getSelectViewRes">
                   </selectView>
                 </a-form-model-item>
               </a-col>
               <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="4">
-                <a-form-model-item class="from-label" label="操作" :labelCol="userLabelCol1" :wrapperCol="userWrapperCol1"
+                <a-form-model-item
-                  has-feedback prop="op">
+                  class="from-label"
-                  <selectView type="op" :defaultVal="details.op" searchApi="GetSysUserPage"
+                  label="操作"
-                    :disabled="BookingLockOrder['op'] && isLockBooking" :searchQuery="{ name: '' }"
+                  :labelCol="userLabelCol1"
-                    :showLabel="['name']" :openSearch="true" @change="getSelectViewRes"></selectView>
+                  :wrapperCol="userWrapperCol1"
+                  has-feedback
+                  prop="op">
+                  <selectView
+                    type="op"
+                    :defaultVal="details.op"
+                    searchApi="GetSysUserPage"
+                    :disabled="BookingLockOrder['op'] && isLockBooking"
+                    :searchQuery="{ name: '' }"
+                    :showLabel="['name']"
+                    :openSearch="true"
+                    @change="getSelectViewRes"></selectView>
                 </a-form-model-item>
               </a-col>
               <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="4">
-                <a-form-model-item class="from-label" label="单证" :labelCol="userLabelCol1" :wrapperCol="userWrapperCol1"
+                <a-form-model-item
-                  has-feedback prop="doc">
+                  class="from-label"
-                  <selectView type="doc" :defaultVal="details.doc" :disabled="BookingLockOrder['doc'] && isLockBooking"
+                  label="单证"
-                    searchApi="GetSysUserPage" :searchQuery="{ name: '' }" :showLabel="['name']" :openSearch="true"
+                  :labelCol="userLabelCol1"
+                  :wrapperCol="userWrapperCol1"
+                  has-feedback
+                  prop="doc">
+                  <selectView
+                    type="doc"
+                    :defaultVal="details.doc"
+                    :disabled="BookingLockOrder['doc'] && isLockBooking"
+                    searchApi="GetSysUserPage"
+                    :searchQuery="{ name: '' }"
+                    :showLabel="['name']"
+                    :openSearch="true"
                     @change="getSelectViewRes"></selectView>
                 </a-form-model-item>
               </a-col>
               <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="4">
-                <a-form-model-item class="from-label" label="航线操作" :labelCol="userLabelCol" :wrapperCol="userWrapperCol"
+                <a-form-model-item
-                  has-feedback prop="route">
+                  class="from-label"
-                  <selectView type="route" :defaultVal="details.route"
+                  label="航线操作"
-                    :disabled="BookingLockOrder['route'] && isLockBooking" searchApi="GetSysUserPage"
+                  :labelCol="userLabelCol"
-                    :searchQuery="{ name: '' }" :showLabel="['name']" :openSearch="true" :isCopy="true"
+                  :wrapperCol="userWrapperCol"
+                  has-feedback
+                  prop="route">
+                  <selectView
+                    type="route"
+                    :defaultVal="details.route"
+                    :disabled="BookingLockOrder['route'] && isLockBooking"
+                    searchApi="GetSysUserPage"
+                    :searchQuery="{ name: '' }"
+                    :showLabel="['name']"
+                    :openSearch="true"
+                    :isCopy="true"
                     @change="getSelectViewRes"></selectView>
                 </a-form-model-item>
               </a-col>
               <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="4">
-                <a-form-model-item class="from-label" label="航线管理" :labelCol="userLabelCol" :wrapperCol="userWrapperCol"
+                <a-form-model-item
-                  has-feedback prop="lineManage">
+                  class="from-label"
-                  <selectView type="lineManage" :defaultVal="details.lineManage"
+                  label="航线管理"
-                    :disabled="BookingLockOrder['LineManage'] && isLockBooking" searchApi="GetSysUserPage"
+                  :labelCol="userLabelCol"
-                    :searchQuery="{ name: '' }" :showLabel="['name']" :openSearch="true" @change="getSelectViewRes">
+                  :wrapperCol="userWrapperCol"
+                  has-feedback
+                  prop="lineManage">
+                  <selectView
+                    type="lineManage"
+                    :defaultVal="details.lineManage"
+                    :disabled="BookingLockOrder['LineManage'] && isLockBooking"
+                    searchApi="GetSysUserPage"
+                    :searchQuery="{ name: '' }"
+                    :showLabel="['name']"
+                    :openSearch="true"
+                    @change="getSelectViewRes">
                   </selectView>
                 </a-form-model-item>
               </a-col>
             </a-row>
             <a-row :gutter="10">
               <a-col :xs="24" :sm="9" :md="9" :lg="9" :xl="7">
-                <a-form-model-item class="from-label" label="操作备注" :labelCol="labelCol3" :wrapperCol="wrapperCol3"
+                <a-form-model-item
-                  has-feedback prop="czRemark">
+                  class="from-label"
-                  <inputView :ishd="BookingLockOrder['czRemark'] && isLockBooking" type="czRemark"
+                  label="操作备注"
-                    :parentVal="details.czRemark" @getInputChange="inputChange" />
+                  :labelCol="labelCol3"
+                  :wrapperCol="wrapperCol3"
+                  has-feedback
+                  prop="czRemark">
+                  <inputView
+                    :ishd="BookingLockOrder['czRemark'] && isLockBooking"
+                    type="czRemark"
+                    :parentVal="details.czRemark"
+                    @getInputChange="inputChange" />
                 </a-form-model-item>
               </a-col>
               <a-col :xs="24" :sm="9" :md="9" :lg="9" :xl="7">
-                <a-form-model-item class="from-label" label="单证备注" :labelCol="labelCol3" :wrapperCol="wrapperCol3"
+                <a-form-model-item
-                  has-feedback prop="dzRemark">
+                  class="from-label"
-                  <inputView :ishd="BookingLockOrder['dzRemark'] && isLockBooking" type="dzRemark"
+                  label="单证备注"
-                    :parentVal="details.dzRemark" @getInputChange="inputChange" />
+                  :labelCol="labelCol3"
+                  :wrapperCol="wrapperCol3"
+                  has-feedback
+                  prop="dzRemark">
+                  <inputView
+                    :ishd="BookingLockOrder['dzRemark'] && isLockBooking"
+                    type="dzRemark"
+                    :parentVal="details.dzRemark"
+                    @getInputChange="inputChange" />
                 </a-form-model-item>
               </a-col>
               <a-col :xs="24" :sm="6" :md="6" :lg="6" :xl="6">
-                <a-form-model-item class="from-label" label="申请箱使" :labelCol="labelCol3" :wrapperCol="wrapperCol3"
+                <a-form-model-item
-                  has-feedback prop="shenQingXiangShi">
+                  class="from-label"
-                  <inputView :ishd="BookingLockOrder['shenQingXiangShi'] && isLockBooking" type="shenQingXiangShi"
+                  label="申请箱使"
-                    :parentVal="details.shenQingXiangShi" @getInputChange="inputChange" />
+                  :labelCol="labelCol3"
+                  :wrapperCol="wrapperCol3"
+                  has-feedback
+                  prop="shenQingXiangShi">
+                  <inputView
+                    :ishd="BookingLockOrder['shenQingXiangShi'] && isLockBooking"
+                    type="shenQingXiangShi"
+                    :parentVal="details.shenQingXiangShi"
+                    @getInputChange="inputChange" />
                 </a-form-model-item>
               </a-col>
               <a-col :xs="24" :sm="9" :md="9" :lg="9" :xl="4">
-                <a-form-model-item class="from-label" label="分单操作" :labelCol="{ span: 8 }" :wrapperCol="{ span: 16 }"
+                <a-form-model-item
-                  has-feedback prop="subOp">
+                  class="from-label"
-                  <selectView type="subOp" :defaultVal="details.subOp" searchApi="GetTenantUserByRole"
+                  label="分单操作"
-                    :searchQuery="{ keyword: '', roleCode: 'OpFen' }" :showLabel="['name']" :openSearch="true"
+                  :labelCol="{ span: 8 }"
+                  :wrapperCol="{ span: 16 }"
+                  has-feedback
+                  prop="subOp">
+                  <selectView
+                    type="subOp"
+                    :defaultVal="details.subOp"
+                    searchApi="GetTenantUserByRole"
+                    :searchQuery="{ keyword: '', roleCode: 'OpFen' }"
+                    :showLabel="['name']"
+                    :openSearch="true"
                     @change="getSelectViewRes">
                   </selectView>
                 </a-form-model-item>
@@ -309,8 +593,14 @@
         </a-form-model>
       </div>
     </x-card>
-    <a-modal :title="customerType === 'add' ? '添加委托单位' : '关系人'" :width="1200" :visible="customerVisible"
+    <a-modal
-      :confirmLoading="customerModelconfirm" :maskClosable="false" @ok="handleModelSubmit" @cancel="handleModelCancel">
+      :title="customerType === 'add' ? '添加委托单位' : '关系人'"
+      :width="1200"
+      :visible="customerVisible"
+      :confirmLoading="customerModelconfirm"
+      :maskClosable="false"
+      @ok="handleModelSubmit"
+      @cancel="handleModelCancel">
       <template slot="footer">
         <a-button key="back" @click="handleModelCancel"> 关闭 </a-button>
       </template>
@@ -324,9 +614,16 @@
             </template>
           </vxe-toolbar>
 
-          <ve-table borderY :columns="columns" :table-data="tableData" :cell-autofill-option="cellAutofillOption"
+          <ve-table
-            :editOption="editOption" rowKeyFieldName="rowKey" :rowStyleOption="rowStyleOption"
+            borderY
-            :checkbox-option="checkboxOption" :clipboard-option="clipboardOption" />
+            :columns="columns"
+            :table-data="tableData"
+            :cell-autofill-option="cellAutofillOption"
+            :editOption="editOption"
+            rowKeyFieldName="rowKey"
+            :rowStyleOption="rowStyleOption"
+            :checkbox-option="checkboxOption"
+            :clipboard-option="clipboardOption" />
           <div class="table-no-data" v-if="tableData.length == 0">暂无数据</div>
         </div>
       </template>

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

@@ -34,7 +34,10 @@
             <div class="sec-order">
               <template v-for="(sedDetail, sindex) in orderList">
                 <div class="order-box" :key="sindex">
-                  <a-checkbox class="check-btn" :checked="sedDetail.checked" @change="checkOrderChange($event, sindex)" />
+                  <a-checkbox
+                    class="check-btn"
+                    :checked="sedDetail.checked"
+                    @change="checkOrderChange($event, sindex)" />
                   <span class="order-label" :class="{ active: sindex == editIndex }" @click.stop="changeOrder(sindex)">
                     <a-tag class="tag" v-if="sedDetail.state" :color="sedDetail.state === '已直发' ? '#00CC00' : ''">{{
                       sedDetail.state
@@ -68,7 +71,11 @@
                         :labelCol="labelCol2"
                         :wrapperCol="wrapperCol2"
                         has-feedback>
-                        <inputView :ishd="true" type="mblno" :parentVal="orderDetails.mblno" @getInputChange="inputChange" />
+                        <inputView
+                          :ishd="true"
+                          type="mblno"
+                          :parentVal="orderDetails.mblno"
+                          @getInputChange="inputChange" />
                       </a-form-model-item>
                     </a-col>
                   </template>
@@ -81,7 +88,11 @@
                         :labelCol="labelCol2"
                         :wrapperCol="wrapperCol2"
                         has-feedback>
-                        <inputView :ishd="orderDetails.state=='已直发'" type="hblno" :parentVal="orderDetails.hblno" @getInputChange="inputChange" />
+                        <inputView
+                          :ishd="orderDetails.state == '已直发'"
+                          type="hblno"
+                          :parentVal="orderDetails.hblno"
+                          @getInputChange="inputChange" />
                       </a-form-model-item>
                     </a-col>
                   </template>
@@ -108,8 +119,7 @@
                         }"
                         :showLabel="['vessel']"
                         :openSearch="true"
-                        @change="getSelectViewRes"
+                        @change="getSelectViewRes"></selectView>
-                      ></selectView>
                     </a-form-model-item>
                   </a-col>
                   <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="5">
@@ -124,11 +134,38 @@
                     </a-form-model-item>
                   </a-col>
                   <a-col
+                    v-if="!showFlag"
+                    :xs="12"
+                    :sm="12"
+                    :md="12"
+                    :lg="8"
+                    :xl="6">
+                    <a-form-model-item
+                      class="pre-from-label"
+                      label="船代"
+                      prop="forwarder"
+                      :labelCol="{ span: 4 }"
+                      :wrapperCol="{ span: 20 }"
+                      has-feedback>
+                      <selectView
+                        ref="shipagency"
+                        type="shipagency"
+                        :defaultVal="orderDetails.forwarder"
+                        searchApi="RelaPortLoadForwarderList"
+                        :searchQuery="{ forwarderCode: '', module:'cangdan',portLoadCode:orderDetails.portloadid }"
+                        :showLabel="['forwarder', 'forwarderCode']"
+                        :openSearch="true"
+                        @change="getSelectViewRes">
+                      </selectView>
+                    </a-form-model-item>
+                  </a-col>
+                  <a-col
+                    v-else
                     :xs="12"
                     :sm="12"
                     :md="12"
                     :lg="8"
-                    :xl="4">
+                    :xl="6">
                     <a-form-model-item
                       class="pre-from-label"
                       label="船代"
@@ -144,11 +181,11 @@
                         :searchQuery="{ forwarderCode: '',module:'Booking',portLoadCode:orderDetails.portloadid }"
                         :showLabel="['forwarder', 'forwarderCode']"
                         :openSearch="true"
-                        @change="getSelectViewRes"
+                        @change="getSelectViewRes">
-                      ></selectView>
+                      </selectView>
                     </a-form-model-item>
                   </a-col>
-                  <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="pre-from-label"
                       label="船公司"
@@ -167,7 +204,7 @@
                         style="flex: 1; margin-top: -4px"></selectView>
                     </a-form-model-item>
                   </a-col>
-                  <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="pre-from-label"
                       label="开船日期"
@@ -382,7 +419,8 @@
                             :showLabel="['title']"
                             :openSearch="true"
                             @change="getSelectViewRes"
-                            style="flex: 1"></selectView>
+                            style="flex: 1">
+                          </selectView>
                           <a-button
                             class="save-btn"
                             type="link"
@@ -830,7 +868,10 @@
                               }"
                               has-feedback
                               prop="remarks">
-                              <inputView type="remarks" :parentVal="orderDetails.remarks" @getInputChange="inputChange" />
+                              <inputView
+                                type="remarks"
+                                :parentVal="orderDetails.remarks"
+                                @getInputChange="inputChange" />
                             </a-form-model-item>
                           </a-col>
                         </a-row>
@@ -937,11 +978,7 @@
           <a-input :allowClear="true" v-model="modelName" />
         </div>
       </a-modal>
-      <a-modal
+      <a-modal title="校验不通过" :width="700" :visible="checkFlag" @cancel="checkFlag = false">
-        title="校验不通过"
-        :width="700"
-        :visible="checkFlag"
-        @cancel="checkFlag=false">
         <div v-for="(item,index) in checkList" :key="index">
           {{ item }}
         </div>
@@ -1642,6 +1679,11 @@ export default {
       immediate: true,
       handler(nD, oD) {
         this.id = this.$route.query.id
+        if (process.env.VUE_APP_TYPE === 'gangjie') {
+          this.showFlag = true
+        } else {
+          this.showFlag = false
+        }
       }
     }
   },
@@ -2107,12 +2149,12 @@ export default {
         GetPortlist({ KeyWord: $data.portdischargeid }).then((res) => {
           if (res.data) {
             res.data.forEach((item, index) => {
-               if (item.countryCode && item.country) {
+              if (item.countryCode && item.country) {
                 $data.consigneecountry = item.countryCode
-            $data.consigneecountryName = `${item.countryCode}/${item.country}`
+                $data.consigneecountryName = `${item.countryCode}/${item.country}`
-            $data.notifypartycountry = item.countryCode
+                $data.notifypartycountry = item.countryCode
-            $data.notifypartycountryName = `${item.countryCode}/${item.country}`
+                $data.notifypartycountryName = `${item.countryCode}/${item.country}`
-               }
+              }
             })
           }
         })
@@ -2300,7 +2342,7 @@ export default {
       this.$forceUpdate()
     },
     getSelectViewRes({ type, res }) {
-       if (['shipagency'].includes(type)) {
+      if (['shipagency'].includes(type)) {
         this.orderDetails.forwarder = res.name || res.forwarder || ''
       } else if (['shippername', 'notifypartyname', 'consigneename'].includes(type)) {
         this.orderDetails[type] = res.title || ''
@@ -2338,7 +2380,7 @@ export default {
           this.orderDetails.voyno = res.voyno.replace('1MA', '') || ''
         } else {
           if (res.voyno.includes('1NC')) {
-          this.orderDetails.voyno = res.voyno.replace('1NC', '') || ''
+            this.orderDetails.voyno = res.voyno.replace('1NC', '') || ''
           } else {
             this.orderDetails.voyno = res.voyno || ''
           }
@@ -2361,7 +2403,7 @@ export default {
         this.orderDetails[type] = res['ediCode'] || ''
         this.orderDetails[type.replace('id', '')] = res['enName'] || ''
         this.orderDetails.forwarder = ''
-        if(type==='portloadid'){
+        if (type === 'portloadid') {
           console.log(res)
         }
       }

src/views/main/BookingLedger/list/modules/initData.js

@@ -535,7 +535,9 @@ export default {
       slots: { default: 'txxp' }
     },
     { field: 'startETA', label: 'startETA', width: 120, title: '起始港ETA', showHeaderOverflow: true, sortable: true },
-    { field: 'startATA', label: 'startATA', width: 120, title: '起始港ATA', showHeaderOverflow: true, sortable: true }
+    { field: 'startATA', label: 'startATA', width: 120, title: '起始港ATA', showHeaderOverflow: true, sortable: true },
+    { field: 'subTenantName', label: 'subTenantName', width: 120, title: '所属公司', showHeaderOverflow: true, sortable: true },
+    { field: 'erpCode', label: 'erpCode', width: 120, title: 'erp代码', showHeaderOverflow: true, sortable: true }
   ],
   // ==== 表单部分 ====
   condAllData: [
@@ -703,6 +705,7 @@ export default {
       resLabel: ['BISSUEDATE', 'EISSUEDATE']
     },
     { title: '真提单号', align: 'center', width: 160, label: 'TMBLNO', type: 'input' },
+    { title: 'erp代码', align: 'center', width: 160, label: 'erpCode', type: 'input' },
     {
       title: '是否占舱',
       align: 'center',
@@ -729,6 +732,14 @@ export default {
       label: 'OrgOp',
       type: 'selectTree'
     },
+    {
+      title: '所属公司',
+      align: 'center',
+      width: 120,
+      label: 'subTenantName',
+      type: 'select',
+      showLabel: 'name'
+    },
     {
       title: '分单操作',
       align: 'center',

src/views/main/Taskmanage/TaskmanageList/index.vue

@@ -1268,7 +1268,6 @@ export default {
         })
         this.gridOptions.loading = true
       } else {
-        // this.init()
       }
     },
     changeTopLevel() {
@@ -1285,7 +1284,6 @@ export default {
       this.activeTreeKey = []
     },
     init(queryParam = {}) {
-      console.log(queryParam)
       this.gridOptions.pagerConfig = {
         total: 0,
         currentPage: 1,
@@ -1310,14 +1308,12 @@ export default {
           if (data.taskCategory) {
             this.activeTopKey = data.taskCategory
             this.changeTopLevel()
-            // taskCategoryList
             this.levelTop.map((item, index) => {
               if (item.code === data.taskCategory) {
                 categoryIndex = index
               }
             })
           }
-          console.log(data)
           setTimeout(() => {
             if (data.status && data.status !== 'Retransmit') {
               this.activeNextKey = data.status
@@ -1325,7 +1321,6 @@ export default {
               this.formRes.status = this.activeNextKey
               this.levelTree = this.selectTreeLevel(this.levelTreeAll, this.activeNextKey, this.activeTopKey)
               this.activeTreeKey = []
-              // statusList
               this.levelNext.map((item, index) => {
                 if (item.code === data.status) {
                   statusIndex = index
@@ -1336,19 +1331,16 @@ export default {
           setTimeout(() => {
             if (data.taskType) {
               this.taskType = data.taskType
-              // sourceList
               this.levelTree.map((item, index) => {
                 if (item.key === data.taskType) {
                   typeIndex = index
                 }
               })
-              console.log('== 三级菜单 ==', this.levelTree, typeIndex)
             }
           }, 600)
           setTimeout(() => {
             if (data.status !== 'Retransmit') {
               const str = `${categoryIndex}-${statusIndex}-${typeIndex}`
-              console.log('修改前的key: ', `${categoryIndex}-${statusIndex}${typeIndex ? '-' + typeIndex : ''}`)
               this.activeTreeKey = [str]
             }
             this.init(this.searchData)
@@ -1457,36 +1449,10 @@ export default {
       return arr
     },
     handlePageChange({ currentPage, pageSize }) {
-      const {
-        form: { validateFields }
-      } = this
-      validateFields((err, values) => {
-        if (!err) {
-          if (values.etd) {
-            const time = values.etd.map((item, index) => {
-              const str = this.dateFtt('YYYY-MM-DD', item._d)
-              return str
-            })
-            console.log(time)
-            values.etdBegin = time[0]
-            values.etdEnd = time[1]
-          }
-          if (values.taskDate) {
-            const _time = values.taskDate.map((item, index) => {
-              const str = this.dateFtt('YYYY-MM-DD', item._d)
-              return str
-            })
-            console.log(_time)
-            values.taskDateBegin = _time[0]
-            values.taskDateEnd = _time[1]
-          }
           this.gridOptions.pagerConfig.currentPage = currentPage
           this.gridOptions.pagerConfig.pageSize = pageSize
-          values.taskCategory = this.formRes.taskCategory
+          const data = { ...this.formRes }
-          values.taskType = this.formRes.taskType
+          this.getList(data)
-          this.getList(values)
-        }
-      })
     },
     getList(queryParam = {}) {
       const { currentPage, pageSize } = this.gridOptions.pagerConfig