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

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -485,15 +485,15 @@
                             </el-date-picker>
                         </el-form-item> -->
 
-                        <el-form-item label="船公司" prop="carrierCnName">
+                        <el-form-item label="承运人" prop="carrierCnName">
                             <span slot="label">
                                 <span style="color: #4c9e44;cursor: pointer;text-decoration: underline"
-                                    @click="emailJump('carrier')">船公司</span>
+                                    @click="emailJump('carrier')">承运人</span>
                             </span>
                             <search-query :datalist="carrierData" :selectValue="assemblyForm.carrierCnName"
                                 :filterable="true" :clearable="true" :remote="true" :joinData="true"
                                 :disabled="detailData.seeDisabled || generateBillsfalse || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0) || assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"
-                                :buttonIf="false" placeholder="请选择船公司"
+                                :buttonIf="false" placeholder="请选择承运人"
                                 :forParameter="{ key: 'id', short: 'shortName', label: 'cnName', value: 'cnName' }"
                                 @remoteMethod="remoteMethod($event, 'carrier')"
                                 @corpChange="corpChange($event, 'carrier')"

src/views/iosBasicData/SeafreightExportF/bills/assembly/mbinformation.vue

@@ -38,14 +38,14 @@
                             </el-form-item>
                         </el-col>
                     </el-row>
-                    <el-form-item label="船公司" prop="carrierCnName">
+                    <el-form-item label="承运人" prop="carrierCnName">
                         <span slot="label">
-                            <span style="color: #1e9fff">船公司</span>
+                            <span style="color: #1e9fff">承运人</span>
                         </span>
                         <search-query :datalist="carrierData" :selectValue="assemblyForm.carrierCnName"
                             :filterable="true" :clearable="true" :remote="true" :disabled="detailData.seeDisabled"
                             :buttonIf="false" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
-                            placeholder="请选择船公司" @remoteMethod="remoteMethod($event, 'carrier')"
+                            placeholder="请选择承运人" @remoteMethod="remoteMethod($event, 'carrier')"
                             @corpChange="corpChange($event, 'carrier')" @corpFocus="remoteMethod($event, 'carrier')">
                         </search-query>
                     </el-form-item>

src/views/iosBasicData/SeafreightExportF/bills/index.vue

@@ -644,7 +644,7 @@ export default {
                     {
                         label: "MB/L NO",
                         prop: "mblno",
-                        width: "80",
+                        width: "160",
                         overHidden: true,
                         search: true,
                         span: 6,
@@ -660,7 +660,7 @@ export default {
                     {
                         label: "HB/L NO",
                         prop: "hblno",
-                        width: "80",
+                        width: "160",
                         overHidden: true,
                         search: true,
                         span: 6,
@@ -719,6 +719,7 @@ export default {
                     {
                         label: "船名",
                         prop: "vesselCnName",
+                        width: "120",
                         overHidden: true,
                         type: "select",
                         filterable: true,
@@ -737,6 +738,7 @@ export default {
                     },
                     {
                         label: "船名",
+                        width: "120",
                         prop: "vesselEnName",
                         overHidden: true
                     },
@@ -761,6 +763,7 @@ export default {
                     {
                         label: "开船日期",
                         prop: "etd",
+                        width: "120",
                         searchProp: "etdList",
                         type: "date",
                         unlinkPanels: true,
@@ -790,7 +793,7 @@ export default {
                         searchOrder: 9
                     },
                     {
-                        label: "船公司",
+                        label: "承运人",
                         prop: "carrierCnName",
                         overHidden: true,
                         type: "select",
@@ -810,7 +813,7 @@ export default {
                         showColumn: false
                     },
                     {
-                        label: "船公司",
+                        label: "承运人",
                         prop: "carrierShortName",
                         overHidden: true
                     },
@@ -1001,7 +1004,7 @@ export default {
                         span: 6,
                         searchOrder: 15
                     },
-                    {
+/*                    {
                         label: "装箱方式",
                         prop: "loadType",
                         type: "select",
@@ -1016,7 +1019,7 @@ export default {
                             }
                         ],
                         overHidden: true
-                    },
+                    },*/
                     {
                         label: "货物类别",
                         prop: "cargoType",
@@ -1037,7 +1040,7 @@ export default {
                         ],
                         overHidden: true
                     },
-                    {
+/*                    {
                         label: "创建部门",
                         prop: "createDeptName",
                         width: "120",
@@ -1052,7 +1055,7 @@ export default {
                         search: true,
                         span: 6,
                         searchOrder: 16
-                    },
+                    },*/
                     {
                         label: "订舱代理",
                         prop: "bookingAgentCnName",
@@ -1112,12 +1115,12 @@ export default {
                         width: "120",
                         overHidden: true
                     },
-                    {
+/*                    {
                         label: "净重 (KGM)",
                         prop: "netWeight",
                         width: "120",
                         overHidden: true
-                    },
+                    },*/
                     {
                         label: "体积 (CBM)",
                         prop: "measurement",
@@ -1338,7 +1341,7 @@ export default {
                             value: "dictKey"
                         }
                     },
-                    {
+/*                    {
                         label: "客户OP",
                         prop: "operatorName",
                         width: 140,
@@ -1353,7 +1356,7 @@ export default {
                             value: "cname",
                             res: "data.records"
                         }
-                    },
+                    },*/
                     // {
                     //   label: "进项发票状态",
                     //   prop: "invoiceCrStatusDescr",
@@ -1399,7 +1402,7 @@ export default {
                     //       width:"160",
                     //       overHidden:true,
                     //   },
-                    {
+  /*                  {
                         label: "edi发送状态",
                         prop: "ediStatus",
                         type: "select",
@@ -1415,7 +1418,7 @@ export default {
                         ],
                         width: "100",
                         overHidden: true
-                    },
+                    },*/
                     {
                         label: "业务状态",
                         prop: "billStatus",
@@ -1512,6 +1515,7 @@ export default {
                     {
                         label: "开船日期",
                         prop: "etd",
+                        width: "80",
                         overHidden: true
                     },
                     {

src/views/iosBasicData/costcenter/coc/detailsPage.vue

@@ -756,7 +756,7 @@ export default {
                                             overHidden: true
                                         },*/
                     {
-                        label: "海运费",
+                        label: "底价",
                         prop: "oceanFreight",
                         width: "80",
                         overHidden: true,
@@ -765,6 +765,12 @@ export default {
                         formslot: true,
                     },
                     {
+                        label: "备注",
+                        prop: "remarks",
+                        cell: true,
+                        overHidden: true
+                    },
+                    {
                         label: "销售价",
                         prop: "salesPrice",
                         width: "80",
@@ -815,12 +821,6 @@ export default {
                         prop: "updateTime",
                         width: "120",
                         overHidden: true
-                    },
-                    {
-                        label: "备注",
-                        prop: "remarks",
-                        cell: true,
-                        overHidden: true
                     }
                 ]
             },