修改代理报表 新加字段 检索条件 货代修改请核校验 配箱明细

src/components/tradeAgency/businessReportsJK.vue

@@ -35,7 +35,8 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove, reportsGetReportDat, reportsGetReportData } from "@/api/iosBasicData/reports";
+import { getList, getDetail, add, update, remove } from "@/api/iosBasicData/reports";
+import { reportsGetReportData } from "@/api/tradeAgency/tradeAgency";
 import { getUserApprovalList } from "@/api/approval/processConfig";
 import { mapGetters } from "vuex";
 import { billsDetail } from '@/api/iosBasicData/bills'

src/components/tradeAgency/reportsJK.vue

@@ -51,8 +51,8 @@ import { mapGetters } from "vuex";
 import { billsDetail } from '@/api/iosBasicData/bills'
 import { bbusinesstypeList } from "@/api/iosBasicData/bbusinesstype";
 import reportContainer from "@/views/iosBasicData/report-container/report-container.vue"
-// import { reportsGetReportData } from "@/api/tradeAgency/tradeAgency";
-import { reportsGetReportData } from "@/api/iosBasicData/reports";
+import { reportsGetReportData } from "@/api/tradeAgency/tradeAgency";
+// import { reportsGetReportData } from "@/api/iosBasicData/reports";
 export default {
   components: {
     reportContainer

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/PackingBusiness.vue

@@ -18,7 +18,7 @@
                                 <span class="textoverflow">{{ row.shortName }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column prop="polEnName" label="目的港">
+                        <el-table-column prop="podEnName" label="目的港">
                         </el-table-column>
                         <el-table-column prop="editQuantity" label="件数">
                             <template slot-scope="scope">

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

@@ -1136,7 +1136,6 @@ export default {
         },
         // 件数聚焦
         quantityFocus() {
-            console.log(this.assemblyForm.waitingBoxList, 11111)
             if (this.assemblyForm.waitingBoxList) {
                 if (Number(this.assemblyForm.waitingBoxList[0].quantity) == 0) {
                     this.$alert('当前数据已经均分箱量，请撤销之后再修改', '提示', {

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

@@ -51,9 +51,6 @@
                 <el-button size="small" type="success" :disabled="!form.id || detailData.seeDisabled || showLock"
                     v-if="form.status == 0 || form.status == 4" @click.stop="DocumentApproval">单据请核
                 </el-button>
-                <!--<el-button  size="small" type="primary" style="margin-right: 8px" v-if="detailData.seeDisabled"-->
-                <!--            :loading="saveLoading" @click="editHandle">编 辑-->
-                <!--</el-button>-->
                 <el-button size="small" type="primary" style="margin-right: 8px"
                     :disabled="detailData.seeDisabled || showLock" :loading="saveLoading" @click="editCustomer">保 存
                 </el-button>
@@ -62,8 +59,6 @@
                         审 批<i class="el-icon-arrow-down el-icon--right"></i>
                     </el-button>
                     <el-dropdown-menu slot="dropdown">
-                        <!--<el-dropdown-item @click.native="examineBtn('审批')" :disabled="isExamineBtn && !detailData.check">审批-->
-                        <!--</el-dropdown-item>-->
                         <el-dropdown-item @click.native="checkScheduleDialog = true, checkId = form.id">审核进度
                         </el-dropdown-item>
                     </el-dropdown-menu>
@@ -709,10 +704,10 @@ export default {
                     name: 'MBLNO',
                     value: 'mblno',
                 },
-                {
-                    name: 'booking NO',
-                    value: 'bookingNo',
-                },
+                // {
+                //     name: 'booking NO',
+                //     value: 'bookingNo',
+                // },
                 // {
                 //     name: 'REF MBLNO',
                 //     value: 'refno',

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

@@ -441,17 +441,17 @@
                         </span>
                     </div>
                 </template>
-                <template slot="stlDrStatusDescr" slot-scope="{ row }">
+                <template slot="stlCrStatusDescr" slot-scope="{ row }">
                     <div>
-                        <span v-if="row.stlDrStatusDescr == '未结'"
+                        <span v-if="row.stlCrStatusDescr == '未结'"
                             style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #67C23A;">
                             未结
                         </span>
-                        <span v-if="row.stlDrStatusDescr == '结清'"
+                        <span v-if="row.stlCrStatusDescr == '结清'"
                             style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #409EFF;">
                             结清
                         </span>
-                        <span v-if="row.stlDrStatusDescr == '部分'"
+                        <span v-if="row.stlCrStatusDescr == '部分'"
                             style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #F56C6C;">
                             部分
                         </span>
@@ -661,7 +661,7 @@ export default {
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 24,
+                searchMenuSpan: 12,
                 searchLabelWidth: '100',
                 border: true,
                 index: true,
@@ -1256,13 +1256,39 @@ export default {
                     {
                         label: "应收结算状态",
                         prop: "stlDrStatusDescr",
-                        width: "160",
+                        type: 'select',
+                        search: true,
+                        dicData: [{
+                            label: '未结',
+                            value: '未结'
+                        }, {
+                            label: '部分',
+                            value: '部分'
+                        }, {
+                            label: '结清',
+                            value: '结清'
+                        }],
+                        width: "100",
+                        searchLabelWidth:'100',
                         overHidden: true,
                     },
                     {
                         label: "应付结算状态",
                         prop: "stlCrStatusDescr",
-                        width: "160",
+                        type: 'select',
+                        search: true,
+                        dicData: [{
+                            label: '未结',
+                            value: '未结'
+                        }, {
+                            label: '部分',
+                            value: '部分'
+                        }, {
+                            label: '结清',
+                            value: '结清'
+                        }],
+                        width: "100",
+                        searchLabelWidth:'100',
                         overHidden: true,
                     },
                     {

src/views/tradeAgency/oceanFreightImport/detailsPage.vue

@@ -575,11 +575,21 @@ export default {
                         }]
                     },
                     {
-                        label: "委托编号",
+                        label: "业务编号",
                         prop: "billNo",
                         disabled: true,
                     },
                     {
+                        label: "委托编号",
+                        prop: "hblno",
+                        disabled: false,
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }]
+                    },
+                    {
                         label: "提单号",
                         prop: "mblno",
                         disabled: false,

src/views/tradeAgency/oceanFreightImport/index.vue

@@ -27,6 +27,38 @@
                         </span>
                     </div>
                 </template>
+                <template slot="stlDrStatusDescr" slot-scope="{ row }">
+                    <div>
+                        <span v-if="row.stlDrStatusDescr == '未结'"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #67C23A;">
+                            未结
+                        </span>
+                        <span v-if="row.stlDrStatusDescr == '已结'"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #409EFF;">
+                            已结
+                        </span>
+                        <span v-if="row.stlDrStatusDescr == '部分结'"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #F56C6C;">
+                            部分结
+                        </span>
+                    </div>
+                </template>
+                <template slot="stlCrStatusDescr" slot-scope="{ row }">
+                    <div>
+                        <span v-if="row.stlCrStatusDescr == '未结'"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #67C23A;">
+                            未结
+                        </span>
+                        <span v-if="row.stlCrStatusDescr == '结清'"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #409EFF;">
+                            结清
+                        </span>
+                        <span v-if="row.stlCrStatusDescr == '部分'"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #F56C6C;">
+                            部分
+                        </span>
+                    </div>
+                </template>
                 <template slot="menuLeft">
                     <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">新 增
                     </el-button>
@@ -109,7 +141,7 @@ export default {
                 menuWidth: 140,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 6,
+                searchMenuSpan: 12,
                 border: true,
                 index: true,
                 addBtn: false,
@@ -170,7 +202,7 @@ export default {
                         searchOrder: 2,
                     },
                     {
-                        label: "委托编号",
+                        label: "业务编号",
                         prop: "billNo",
                         width: "120",
                         overHidden: true,
@@ -178,6 +210,14 @@ export default {
                         searchOrder: 9,
                     },
                     {
+                        label: "委托编号",
+                        prop: "hblno",
+                        width: "120",
+                        overHidden: true,
+                        search: true,
+                        searchOrder: 9.1,
+                    },
+                    {
                         label: "放单方式",
                         prop: "mconsigneeCntyCode",
                         width: "90",
@@ -186,13 +226,41 @@ export default {
                     {
                         label: "应收结算状态",
                         prop: "stlDrStatusDescr",
-                        width: "160",
+                        type: 'select',
+                        search: true,
+                        searchOrder: 14,
+                        dicData: [{
+                            label: '未结',
+                            value: '未结'
+                        }, {
+                            label: '部分',
+                            value: '部分'
+                        }, {
+                            label: '结清',
+                            value: '结清'
+                        }],
+                        width: "100",
+                        searchLabelWidth:'100',
                         overHidden: true,
                     },
                     {
                         label: "应付结算状态",
                         prop: "stlCrStatusDescr",
-                        width: "160",
+                        type: 'select',
+                        search: true,
+                        searchOrder: 15,
+                        dicData: [{
+                            label: '未结',
+                            value: '未结'
+                        }, {
+                            label: '部分',
+                            value: '部分'
+                        }, {
+                            label: '结清',
+                            value: '结清'
+                        }],
+                        width: "100",
+                        searchLabelWidth:'100',
                         overHidden: true,
                     },
                     {
@@ -435,7 +503,7 @@ export default {
                         overHidden: true,
                         search: true,
                         searchSpan: 12,
-                        searchOrder: 14,
+                        searchOrder: 16,
                         hide: true,
                         showColumn: false,
                     }