海运出口新加三个按钮和三个tabs

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

@@ -48,9 +48,9 @@
             <BillofLadingDetails
                 v-else-if="businesstypeData.reportsType == 'TDXQ' || businesstypeData.reportsType == 'DCWTS'"
                 :documentForm="documentForm"></BillofLadingDetails>
-                <BillofLadingDetailsM
-                v-else-if="businesstypeData.reportsType == 'MBL BOOKING SHEET'"
-                :documentForm="documentForm"></BillofLadingDetailsM>
+            <BillofLadingDetailsM v-else-if="businesstypeData.reportsType == 'MBL BOOKING SHEET'"
+                :documentForm="documentForm">
+            </BillofLadingDetailsM>
             <span slot="footer" class="dialog-footer">
                 <!--<el-button type="success" @click="documentSubmit(true)" >保存并打印</el-button>-->
                 <el-button v-if="addShow" type="success" :disabled="!documentForm.id"
@@ -110,11 +110,11 @@ import { isProcurement } from "@/api/basicData/configuration";
 export default {
     components: {
         businessReports,
-        BillofLadingDetails,BillofLadingDetailsM, reportContainer, reportformsList, bbusinesstype, DispatchNotice, PurchaseNotice
+        BillofLadingDetails, BillofLadingDetailsM, reportContainer, reportformsList, bbusinesstype, DispatchNotice, PurchaseNotice
     },
     data() {
         return {
-            textareaNumber:5,
+            textareaNumber: 5,
             previewDialog: false, // 打印预览弹窗
             PreviewOption: {}, // 打印预览弹窗的配置项
             PreviewOptionBack: {
@@ -315,7 +315,7 @@ export default {
         this.documentOption = await this.getColumnData(this.getColumnName(312.1), this.documentOptionBack);
         this.PreviewOption = await this.getColumnData(this.getColumnName(312.3), this.PreviewOptionBack);
         isProcurement({ "param": "textarea.number" }).then(res => {
-            if(res.data.data){
+            if (res.data.data) {
                 this.textareaNumber = res.data.data
             }
         })
@@ -332,13 +332,14 @@ export default {
             const data = await this.PreviewOnLoad(this.PreviewPage, {
                 businessType: 'HYCK',
                 classifyCode: '单证',
-                groupCode: row.groupCode=='提单详情(H)'?'提单详情':row.groupCode
+                groupCode: row.groupCode == '提单详情(H)' ? '提单详情' : row.groupCode
             });
             this.$nextTick(() => {
                 if (data.length == 1) {
                     this.handleReportPreview(data[0].url, this.documentForm)
                 } else {
                     this.previewDialog = true
+                    this.documentVisible = false
                 }
             })
             // let obj = {businessType:'HYCK',classifyCode:'单证',groupCode:row.groupCode}
@@ -441,7 +442,7 @@ export default {
             reportsGetReportData({
                 billId: this.assemblyForm.id,
                 reportCode: this.businesstypeData.classifyCode,
-                groupCode: this.businesstypeData.groupCode,
+                groupCode: this.businesstypeData.groupCode=='提单详情(H)'?'提单详情':this.businesstypeData.groupCode,
                 reportsType: this.businesstypeData.reportsType,
                 type: 'HYCK'
             }).then(res => {
@@ -497,6 +498,7 @@ export default {
                 obj.groupCode = this.businesstypeData.groupCode
                 obj.reportsType = this.businesstypeData.reportsType
             }
+            console.log(this.documentForm)
             obj.printContent = JSON.stringify({
                 data: {
                     ...this.documentForm,

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

@@ -101,7 +101,7 @@
                                                                 }} {{ item[0].label }}
                                                             </span>
                                                             <span v-else style="color: #1e9fff">{{ item[0].label
-                                                            }}</span>
+                                                                }}</span>
                                                         </span>
                                                         <span v-if="item[0].type == 'button'"></span>
                                                         <!--<el-button v-if="item[0].type == 'button'" :disabled="detailData.seeDisabled || item[0].disabled"-->
@@ -298,7 +298,8 @@
         <!--预览报表弹窗-->
         <el-dialog append-to-body title="预览报表" class="el-dialogDeep" :visible.sync="previewDialog" width="60%"
             :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
-            <business-reports :id="form.id" :classifycode="getReportTypeByBigHandle()" :disabled="detailData.seeDisabled"></business-reports>
+            <business-reports :id="form.id" :classifycode="getReportTypeByBigHandle()"
+                :disabled="detailData.seeDisabled"></business-reports>
         </el-dialog>
     </div>
 </template>
@@ -849,6 +850,9 @@ export default {
         isProcurement({ "param": "verify.symbol" }).then(res => {
             this.verifySymbolStatus = res.data.data
         })
+        if (this.detailData.billType) {
+            this.form.billType = this.detailData.billType
+        }
         // 判断是否员id, 有id 就不显示
         if (!this.form.id) {
             this.deptGetDetailPolfun() // 收货地 装货港 当前登录人的默认
@@ -2482,10 +2486,10 @@ export default {
             }
         },
         getReportTypeByBigHandle() {
-            var rt="";
-            if (this.bigtabs == 'wt') rt="业务";
-            if (this.bigtabs == 'fy') rt="费用";
-            if (this.bigtabs == 'dz') rt="单证";
+            var rt = "";
+            if (this.bigtabs == 'wt') rt = "业务";
+            if (this.bigtabs == 'fy') rt = "费用";
+            if (this.bigtabs == 'dz') rt = "单证";
             return rt;
         },
         // 获取不分页的分单列表

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

@@ -310,7 +310,11 @@
                 <!--#endregion-->
 
                 <template slot="menuLeft">
-                    <el-button type="primary" size="small" @click="addbtnfun()">新建业务
+                    <el-button type="primary" size="small" @click="addbtnfun('MM')">新建主单
+                    </el-button>
+                    <el-button type="success" size="small" @click="addbtnfun('MH')">新建分单
+                    </el-button>
+                    <el-button type="warning" size="small" @click="addbtnfun('DD')">新建直单
                     </el-button>
                     <el-button type="primary" size="small" plain @click="CopyDocumentsfun">复制单据
                     </el-button>
@@ -353,11 +357,20 @@
                             <el-tab-pane label="接单" name="0">
                                 <span slot="label">接单</span>
                             </el-tab-pane>
+                            <el-tab-pane label="出号" name="4">
+                                <span slot="label">出号</span>
+                            </el-tab-pane>
+                            <el-tab-pane label="开船" name="5">
+                                <span slot="label">开船</span>
+                            </el-tab-pane>
+                            <el-tab-pane label="到港" name="6">
+                                <span slot="label">到港</span>
+                            </el-tab-pane>
                             <el-tab-pane label="退舱" name="1">
                                 <span slot="label" style="color: #d86363">退舱</span>
                             </el-tab-pane>
                             <el-tab-pane label="完成" name="3"></el-tab-pane>
-                            <el-tab-pane label="全部" name="4"></el-tab-pane>
+                            <el-tab-pane label="全部" name="7"></el-tab-pane>
                         </el-tabs>
                     </div>
                 </template>
@@ -1620,25 +1633,25 @@ export default {
     },
     methods: {
         rowStyle({ row, column, rowIndex, columnIndex }) {
-            if (row.status ==2) {
+            if (row.status == 2) {
                 return {
                     // color: '#fff',
                     backgroundColor: '#fbd26a',
-                    
+
                 }
             }
-            if (row.status ==3) {
+            if (row.status == 3) {
                 return {
                     // color: '#fff',
                     backgroundColor: '#ced094',
-                    
+
                 }
             }
-            if (row.status ==4) {
+            if (row.status == 4) {
                 return {
                     // color: '#fff',
                     backgroundColor: '#fbc4c4',
-                    
+
                 }
             }
         },
@@ -1946,8 +1959,9 @@ export default {
             this.$store.commit("OUT_SEAFE_DETAIL");
         },
         // 新增弹窗开启
-        addbtnfun() {
+        addbtnfun(type) {
             this.detailData.seeDisabled = false
+            this.detailData.billType = type
             this.isShow = false
             this.$store.commit("IN_SEAFE_DETAIL");
         },

src/views/iosBasicData/financeProfit/index.vue

@@ -194,6 +194,18 @@ export default {
                         name: 'realAmountProfitLoc',
                         type: 'sum',
                         decimals: 2
+                    }, {
+                        name: 'notReceivedDrUsd',
+                        type: 'sum',
+                        decimals: 2
+                    }, {
+                        name: 'notReceivedDr',
+                        type: 'sum',
+                        decimals: 2
+                    }, {
+                        name: 'notReceivedLoc',
+                        type: 'sum',
+                        decimals: 2
                     }],
                 column: [
                     {
@@ -353,6 +365,21 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "未收美元",
+                        prop: "notReceivedDrUsd",
+                        overHidden: true,
+                    },
+                    {
+                        label: "未收人民币",
+                        prop: "notReceivedDr",
+                        overHidden: true,
+                    },
+                    {
+                        label: "未收合计",
+                        prop: "notReceivedLoc",
+                        overHidden: true,
+                    },
+                    {
                         label: "应付美元",
                         prop: "amountCrUsd",
                         overHidden: true,