Merge branch 'master' of http://git.echepei.com/caojunjie/digital_transformation_ui

src/views/iosBasicData/businessCenter/bookingCabin/detailsPage.vue

@@ -13,9 +13,9 @@
                 <el-button v-if="roleName.indexOf('admin') != -1" size="small" style="margin-right: 8px"
                     :disabled="!form.id" @click="$refs.report.openDialog()">报表设计
                 </el-button> -->
-        <el-button class="el-button--small-yh" style="margin-left: 6px;" type="danger" size="small"
+<!--        <el-button class="el-button&#45;&#45;small-yh" style="margin-left: 6px;" type="danger" size="small"
           @click="allClick('预定订舱')">预定订舱
-        </el-button>
+        </el-button>-->
         <el-button class="el-button--small-yh" style="margin-left: 6px;" type="primary" size="small" v-if="editButton"
           :disabled="showLock || !(roleName.indexOf('admin') != -1 || roleName.indexOf('允许修改他人业务') != -1 || saberUserInfo.user_id == form.createUser)"
           @click="inEdit">编 辑
@@ -120,6 +120,11 @@
               dataName="cnName" @selectChange="dicChange('bookingAgentCnName', $event)" :slotRight="true"
               rightLabel="code" :disabled="editDisabled"></dic-select>
           </tempalte>
+          <tempalte slot="cabinType">
+              <dic-select v-model="form.cabinType" placeholder="舱位类型" key="id" label="dictValue"
+                          url="/blade-system/dict-biz/dictionary?code=cabinType" :disabled="editDisabled"
+                          @selectChange="dicChange('cabinType', $event)"></dic-select>
+          </tempalte>
         </avue-form>
       </trade-card>
       <trade-card title="箱明细">
@@ -276,11 +281,13 @@ export default {
             prop: "operatorName",
             disabled: false,
           },
+/*
           {
             label: '客服',
             prop: "customerServiceName",
             disabled: false,
           },
+*/
           {
             label: '承运人',
             prop: "actualShippingCompanyCname",
@@ -345,11 +352,6 @@ export default {
             }]
           },
           {
-            label: '付费方式',
-            prop: "mpaymode",
-            disabled: false,
-          },
-          {
             label: '箱属',
             prop: "boxBelongsTo",
             type: 'select',
@@ -361,17 +363,24 @@ export default {
             disabled: false,
           },
           {
+              label: '舱位类型',
+              prop: "cabinType",
+              width: "80",
+              overHidden: true,
+          },
+          {
             label: "运输条款",
             prop: "serviceTerms",
             width: "80",
             overHidden: true,
           },
-          {
+
+           {
             label: '总TEU',
             prop: "teu",
             disabled: false,
           },
-
+ /*
           {
             label: '件数',
             prop: "quantity",
@@ -382,17 +391,20 @@ export default {
             prop: "packingUnit",
             disabled: false,
           },
+*/
 
           {
             label: '毛重(KGS)',
             prop: "grossWeight",
             disabled: false,
           },
+/*
           {
             label: '尺码(CBM)',
             prop: "measurement",
             disabled: false,
           },
+*/
           {
             label: '订舱代理',
             prop: "bookingAgentCnName",
@@ -407,6 +419,11 @@ export default {
             span: 2
           },
           {
+              label: '付费方式',
+              prop: "mpaymode",
+              disabled: false,
+          },
+          {
             label: '订舱备注',
             prop: "cyRemarks",
             type: 'textarea',