Merge remote-tracking branch 'origin/dev' into dev

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

@@ -276,7 +276,7 @@
                 </el-tab-pane>
                 <el-tab-pane label="单证中心" name="dz" class="scrollable-container">
                     <document-center ref="documentCenter" :detailData="detailData" :assemblyForm="form"
-                        :disabled="detailData.seeDisabled || showLock"></document-center>
+                        :disabled="false"></document-center>
                 </el-tab-pane>
                 <el-tab-pane label="分单列表" name="fd" v-if="form.billType == 'MM'" class="scrollable-container">
                     <Split-list :detailData="detailData" :assemblyForm="form" :data="billsListAllData"

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

@@ -2031,8 +2031,8 @@ export default {
             // this.detailData.copyId=this.selectionList[0].id
             this.isShow = false;
             this.$store.commit("IN_SEAFE_DETAIL");
-            if (this.selectionList.length == 1 && type == 'MH') {
-                console.log(this.selectionList[0].id, 1111)
+            if (this.selectionList.length == 1 && this.selectionList[0].billType=="MM" && type == 'MH') {
+                console.log(this.selectionList[0].id, this.selectionList[0].billType, 1111)
                 this.$nextTick(() => {
                     console.log(this.selectionList[0].id, 2222)
                     this.$refs.billsDetails.pageLoading = true;