修改货代

src/views/iosBasicData/OceanFreightImport/bills/assembly/EntrustmentLnformation/precontainers.vue

@@ -241,6 +241,69 @@ export default {
                         }]
                     },
                     {
+                        label: "是否冻代干",
+                        prop: "nor",
+                        width: '100',
+                        type: 'select',
+                        cell: true,
+                        dicData: [{
+                            label: '否',
+                            value: 0
+                        }, {
+                            label: '是',
+                            value: 1
+                        }]
+                    },
+                    {
+                        label: "是否超尺寸特种箱",
+                        prop: "oog",
+                        width: '120',
+                        type: 'select',
+                        cell: true,
+                        dicData: [{
+                            label: '否',
+                            value: 0
+                        }, {
+                            label: '是',
+                            value: 1
+                        }]
+                    },
+                    {
+                        label: "左超(CM)",
+                        prop: "overLeft",
+                        type: "number",
+                        cell: true,
+                        controls: false,
+                    },
+                    {
+                        label: "右超(CM)",
+                        prop: "overRight",
+                        type: "number",
+                        cell: true,
+                        controls: false,
+                    },
+                    {
+                        label: "前超(CM)",
+                        prop: "overFront",
+                        type: "number",
+                        cell: true,
+                        controls: false,
+                    },
+                    {
+                        label: "后超(CM)",
+                        prop: "overBack",
+                        type: "number",
+                        cell: true,
+                        controls: false,
+                    },
+                    {
+                        label: "超高(CM)",
+                        prop: "overHeight",
+                        type: "number",
+                        cell: true,
+                        controls: false,
+                    },
+                    {
                         label: "是否单程",
                         prop: "isOneway",
                         type: 'select',

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

@@ -456,7 +456,8 @@ export default {
                             type: 'select',
                             dicData: [],
                             span: 10,
-                            disabled: true,
+                            disabled: false,
+                            allowCreate: true,
                             forParameter: {
                                 key: 'id',
                                 label: 'cname',
@@ -468,7 +469,7 @@ export default {
                             prop: "corpAttnTel",
                             text: "电话",
                             labelWidth: '10px',
-                            disabled: true,
+                            disabled: false,
                             span: 7,
                             // rules: [{
                             //     required: true,
@@ -481,7 +482,7 @@ export default {
                             prop: "corpAttnEmail",
                             text: "邮箱",
                             labelWidth: '10px',
-                            disabled: true,
+                            disabled: false,
                             span: 7,
                             // rules: [{
                             //     required: true,
@@ -928,20 +929,20 @@ export default {
             })
         },
         // 获取客户联系人 客户OP
-        getBcorpsattnListfun(cnName) {
-            getBcorpsattnList(1, 10, { pid: this.form.corpId, cnName }).then(res => {
+        getBcorpsattnListfun(cname) {
+            getBcorpsattnList(1, 10, { cname }).then(res => {
                 this.columnforfun('corpAttnName').dicData = res.data.data.records
-                if (res.data.data.records.length == 0) {
-                    this.form.corpAttnName = ''
-                    this.form.corpAttnId = ''
-                    this.$set(this.form, 'corpAttnTel', '')
-                    this.$set(this.form, 'corpAttnEmail', '')
-                    return
-                }
-                this.form.corpAttnName = res.data.data.records[0].cname
-                this.form.corpAttnId = res.data.data.records[0].id
-                this.$set(this.form, 'corpAttnTel', res.data.data.records[0].tel)
-                this.$set(this.form, 'corpAttnEmail', res.data.data.records[0].email)
+                // if (res.data.data.records.length == 0) {
+                //     this.form.corpAttnName = ''
+                //     this.form.corpAttnId = ''
+                //     this.$set(this.form, 'corpAttnTel', '')
+                //     this.$set(this.form, 'corpAttnEmail', '')
+                //     return
+                // }
+                // this.form.corpAttnName = res.data.data.records[0].cname
+                // this.form.corpAttnId = res.data.data.records[0].id
+                // this.$set(this.form, 'corpAttnTel', res.data.data.records[0].tel)
+                // this.$set(this.form, 'corpAttnEmail', res.data.data.records[0].email)
             })
         },
         // 获取业务来源数据
@@ -1007,7 +1008,7 @@ export default {
                     this.form.corpCode = this.$refs.bcorps[0].selectionList[0].code
                     this.form.corpSource = this.$refs.bcorps[0].selectionList[0].corpSource
                     // 获取 客户op数据
-                    this.getBcorpsattnListfun()
+                    // this.getBcorpsattnListfun()
                     // 业务来源参数带出
                     this.$set(this.form, 'srcType', this.$refs.bcorps[0].selectionList[0].sourceType)
                     this.$set(this.form, 'srcId', this.$refs.bcorps[0].selectionList[0].srcId)
@@ -1105,20 +1106,20 @@ export default {
             }
             else if (name == 'corpCnName') {
                 if (value) {
-                    this.columnforfun('corpAttnName').disabled = false
-                    this.columnforfun('corpAttnTel').disabled = false
-                    this.columnforfun('corpAttnEmail').disabled = false
+                    // this.columnforfun('corpAttnName').disabled = false
+                    // this.columnforfun('corpAttnTel').disabled = false
+                    // this.columnforfun('corpAttnEmail').disabled = false
                 } else {
-                    this.columnforfun('corpAttnName').disabled = true
-                    this.columnforfun('corpAttnTel').disabled = true
-                    this.columnforfun('corpAttnEmail').disabled = true
+                    // this.columnforfun('corpAttnName').disabled = true
+                    // this.columnforfun('corpAttnTel').disabled = true
+                    // this.columnforfun('corpAttnEmail').disabled = true
                     // 如果点击清空按钮把值赋值为空
                     this.form.corpCnName = ''
                     this.form.corpEnName = ''
                     this.form.corpId = ''
                     this.form.corpCode = ''
                     this.form.shortName=''
-                         this.form.corpSource = ""
+                    this.form.corpSource = ""
                     // 清空 客户OP
                     this.form.corpAttnName = ''
                     this.form.corpAttnId = ''
@@ -1140,7 +1141,7 @@ export default {
                         this.form.shortName = item.shortName
                         this.form.corpSource = item.corpSource
                         // 获取 客户op数据
-                        this.getBcorpsattnListfun()
+                        // this.getBcorpsattnListfun()
                         // 业务来源参数带出
                         this.$set(this.form, 'srcType', item.sourceType)
                         this.$set(this.form, 'srcId', item.srcId)
@@ -1162,12 +1163,19 @@ export default {
                 }
             }
             else if (name == 'corpAttnName') {
-                for (let item of this.columnforfun('corpAttnName').dicData) {
-                    if (item.cname == value) {
-                        this.form.corpAttnName = item.cname
-                        this.form.corpAttnId = item.id
-                        this.$set(this.form, 'corpAttnTel', item.tel)
-                        this.$set(this.form, 'corpAttnEmail', item.email)
+                if (this.columnforfun('corpAttnName').dicData.length) {
+                    for (let item of this.columnforfun('corpAttnName').dicData) {
+                        if (item.cname == value) {
+                            this.form.corpAttnName = item.cname
+                            this.form.corpAttnId = item.id
+                            this.$set(this.form, 'corpAttnTel', item.tel)
+                            this.$set(this.form, 'corpAttnEmail', item.email)
+                        }
+                    }
+                } else {
+                    if (value) {
+                        this.form.corpAttnName = value
+                        this.form.corpAttnId = null
                     }
                 }
             }

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

@@ -3,11 +3,18 @@
         <basic-container v-if="isShow">
             <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" id="out-table"
                 :header-cell-class-name="headerClassName" :permission="permissionList" :before-open="beforeOpen"
-                v-model="form" ref="crud" :search.sync="query" @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
-                @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
-                @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"
-                @expand-change="expandChange" @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 309.11)"
+                v-model="form" ref="crud" :search.sync="query" @row-update="rowUpdate" @row-save="rowSave"
+                @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
+                @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+                @refresh-change="refreshChange" @on-load="onLoad" @expand-change="expandChange"
+                @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 309.11)"
                 @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 309.11)">
+                <template slot-scope="{disabled,size}" slot="billSortSearch">
+                    <el-radio-group v-model="query.billSort">
+                        <el-radio label="1">ETD</el-radio>
+                        <el-radio label="2">提单号</el-radio>
+                    </el-radio-group>
+                </template>
                 <!--#region-->
                 <!--<template slot="search" slot-scope="{row,size}">-->
                 <!--    <el-form ref="form" :model="row" label-width="80px" :style="fold?'width: 100%':'width: 70%'">-->
@@ -310,7 +317,8 @@
                     </el-button>
                     <el-button type="success" size="small" plain @click="increaseMawb">分单->主单
                     </el-button>
-                    <el-button type="warning" size="small" plain v-if="query.billStatus == 0" @click="Disembarkingfun">退 舱
+                    <el-button type="warning" size="small" plain v-if="query.billStatus == 0" @click="Disembarkingfun">退
+                        舱
                     </el-button>
                     <el-button type="primary" size="small" plain v-if="query.billStatus == 1"
                         @click="revokeWithdrawalfun">撤销退舱
@@ -340,7 +348,8 @@
                 </template>
 
                 <template slot="expand" slot-scope="{row}">
-                    <SplitList :typeMenu="true" :data="row.billsListAllData" :loading="SplitLoading" @corpfun="rowCellfun">
+                    <SplitList :typeMenu="true" :data="row.billsListAllData" :loading="SplitLoading"
+                        @corpfun="rowCellfun">
                     </SplitList>
                 </template>
                 <temolate slot="billStatus" slot-scope="{row}">
@@ -396,8 +405,8 @@
             </avue-crud>
         </basic-container>
 
-        <bills-details ref="billsDetails" v-if="!isShow" :detailData="detailData" @goBack="goBack" @toAddEdit="toAddEdit"
-            :key="datekey"></bills-details>
+        <bills-details ref="billsDetails" v-if="!isShow" :detailData="detailData" @goBack="goBack"
+            @toAddEdit="toAddEdit" :key="datekey"></bills-details>
 
         <el-dialog title="主单列表" :visible.sync="dialogVisible" append-to-body width="60%" :before-close="handleClose">
             <avue-crud :option="mawbOption" :table-loading="mawbloading" :data="mawbData" :page.sync="mawbPage"
@@ -510,6 +519,7 @@ export default {
             // 表格的检索条件
             query: {
                 billStatus: '0',
+                billSort: '1',
             },
             // 弹窗的搜索项
             mawbQuery: {
@@ -1109,8 +1119,38 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "客户来源",
+                        prop: "corpSource",
+                        width: 140,
+                        overHidden: true,
+                        search: true,
+                        type: "select",
+                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=corp_Source",
+                        props: {
+                            label: 'dictValue',
+                            value: 'dictKey',
+                        },
+                    },
+                    {
+                        label: "客户OP",
+                        prop: "operatorName",
+                        width: 140,
+                        overHidden: true,
+                        search: true,
+                        type: "select",
+                        filterable: true,
+                        remote: true,
+                        dicUrl: "/api/blade-los/bcorpsattn/list?cname={{key}}",
+                        props: {
+                            label: 'cname',
+                            value: 'cname',
+                            res: 'data.records'
+                        },
+                    },
+                    {
                         label: "创建人",
                         prop: "createUserName",
+                        search: true,
                         rules: [{
                             required: true,
                             message: "请输入创建人",
@@ -1125,6 +1165,15 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "排序方式",
+                        prop: "billSort",
+                        hide: true,
+                        showColumn: false,
+                        search: true,
+                        searchValue: '1',
+                        overHidden: true,
+                    },
+                    {
                         label: "更新人",
                         prop: "updateUserName",
                         overHidden: true,
@@ -1816,6 +1865,7 @@ export default {
         },
         searchReset() {
             this.query = {};
+            this.query.billSort = this.query.billSort ? this.query.billSort : '1'
             this.onLoad(this.page);
         },
         // 搜索
@@ -1871,6 +1921,10 @@ export default {
                     item.status = item.status + ''
                     return item
                 })
+                this.$nextTick(() => {
+                    this.$refs.crud.doLayout();
+                    this.$refs.crud.dicInit();
+                });
                 this.loading = false;
                 this.selectionClear();
             });

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

@@ -239,6 +239,69 @@ export default {
                         }]
                     },
                     {
+                        label: "是否冻代干",
+                        prop: "nor",
+                        width: '100',
+                        type: 'select',
+                        cell: true,
+                        dicData: [{
+                            label: '否',
+                            value: 0
+                        }, {
+                            label: '是',
+                            value: 1
+                        }]
+                    },
+                    {
+                        label: "是否超尺寸特种箱",
+                        prop: "oog",
+                        width: '120',
+                        type: 'select',
+                        cell: true,
+                        dicData: [{
+                            label: '否',
+                            value: 0
+                        }, {
+                            label: '是',
+                            value: 1
+                        }]
+                    },
+                    {
+                        label: "左超(CM)",
+                        prop: "overLeft",
+                        type: "number",
+                        cell: true,
+                        controls: false,
+                    },
+                    {
+                        label: "右超(CM)",
+                        prop: "overRight",
+                        type: "number",
+                        cell: true,
+                        controls: false,
+                    },
+                    {
+                        label: "前超(CM)",
+                        prop: "overFront",
+                        type: "number",
+                        cell: true,
+                        controls: false,
+                    },
+                    {
+                        label: "后超(CM)",
+                        prop: "overBack",
+                        type: "number",
+                        cell: true,
+                        controls: false,
+                    },
+                    {
+                        label: "超高(CM)",
+                        prop: "overHeight",
+                        type: "number",
+                        cell: true,
+                        controls: false,
+                    },
+                    {
                         label: "是否单程",
                         prop: "isOneway",
                         type: 'select',

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

@@ -484,8 +484,9 @@ export default {
                             type: 'select',
                             dicData: [],
                             span: 10,
-                            disabled: true,
+                            disabled: false,
                             clearable: false,
+                            allowCreate: true,
                             forParameter: {
                                 key: 'id',
                                 label: 'cname',
@@ -497,7 +498,7 @@ export default {
                             prop: "corpAttnTel",
                             text: "电话",
                             labelWidth: '10px',
-                            disabled: true,
+                            disabled: false,
                             clearable: false,
                             span: 7,
                             // rules: [{
@@ -511,7 +512,7 @@ export default {
                             prop: "corpAttnEmail",
                             text: "邮箱",
                             labelWidth: '10px',
-                            disabled: true,
+                            disabled: false,
                             clearable: false,
                             span: 7,
                             // rules: [{
@@ -1075,20 +1076,20 @@ export default {
             })
         },
         // 获取客户联系人 客户OP
-        getBcorpsattnListfun(cnName) {
-            getBcorpsattnList(1, 10, { pid: this.form.corpId, cnName }).then(res => {
+        getBcorpsattnListfun(cname) {
+            getBcorpsattnList(1, 10, { cname }).then(res => {
                 this.columnforfun('corpAttnName').dicData = res.data.data.records
-                if (res.data.data.records.length == 0) {
-                    this.form.corpAttnName = ''
-                    this.form.corpAttnId = ''
-                    this.$set(this.form, 'corpAttnTel', '')
-                    this.$set(this.form, 'corpAttnEmail', '')
-                    return
-                }
-                this.form.corpAttnName = res.data.data.records[0].cname
-                this.form.corpAttnId = res.data.data.records[0].id
-                this.$set(this.form, 'corpAttnTel', res.data.data.records[0].tel)
-                this.$set(this.form, 'corpAttnEmail', res.data.data.records[0].email)
+                // if (res.data.data.records.length == 0) {
+                //     this.form.corpAttnName = ''
+                //     this.form.corpAttnId = ''
+                //     this.$set(this.form, 'corpAttnTel', '')
+                //     this.$set(this.form, 'corpAttnEmail', '')
+                //     return
+                // }
+                // this.form.corpAttnName = res.data.data.records[0].cname
+                // this.form.corpAttnId = res.data.data.records[0].id
+                // this.$set(this.form, 'corpAttnTel', res.data.data.records[0].tel)
+                // this.$set(this.form, 'corpAttnEmail', res.data.data.records[0].email)
             })
         },
         // 获取地点信息
@@ -1167,7 +1168,7 @@ export default {
                     this.form.corpCode = this.$refs.bcorps[0].selectionList[0].code
                     this.form.corpSource = this.$refs.bcorps[0].selectionList[0].corpSource
                     // 获取 客户op数据
-                    this.getBcorpsattnListfun()
+                    // this.getBcorpsattnListfun()
                     // 业务来源参数带出
                     this.$set(this.form, 'srcType', this.$refs.bcorps[0].selectionList[0].sourceType)
                     this.$set(this.form, 'srcId', this.$refs.bcorps[0].selectionList[0].srcId)
@@ -1198,7 +1199,7 @@ export default {
                     this.form.corpCode = this.$refs.bcorps[0].$refs.detail.formData.code
                     this.form.corpSource = this.$refs.bcorps[0].$refs.detail.formData.corpSource
                     // 获取 客户op数据
-                    this.getBcorpsattnListfun()
+                    // this.getBcorpsattnListfun()
                     // 业务来源参数带出
                     this.$set(this.form, 'srcType', this.$refs.bcorps[0].$refs.detail.formData.sourceType)
                     this.$set(this.form, 'srcId', this.$refs.bcorps[0].$refs.detail.formData.srcId)
@@ -1296,13 +1297,13 @@ export default {
             }
             else if (name == 'corpCnName') {
                 if (value) {
-                    this.columnforfun('corpAttnName').disabled = false
-                    this.columnforfun('corpAttnTel').disabled = false
-                    this.columnforfun('corpAttnEmail').disabled = false
+                    // this.columnforfun('corpAttnName').disabled = false
+                    // this.columnforfun('corpAttnTel').disabled = false
+                    // this.columnforfun('corpAttnEmail').disabled = false
                 } else {
-                    this.columnforfun('corpAttnName').disabled = true
-                    this.columnforfun('corpAttnTel').disabled = true
-                    this.columnforfun('corpAttnEmail').disabled = true
+                    // this.columnforfun('corpAttnName').disabled = true
+                    // this.columnforfun('corpAttnTel').disabled = true
+                    // this.columnforfun('corpAttnEmail').disabled = true
                     // 如果点击清空按钮把值赋值为空
                     this.form.corpCnName = ''
                     this.form.corpEnName = ''
@@ -1311,7 +1312,7 @@ export default {
                     this.form.shortName = ''
                     this.form.corpSource = ""
                     // 清空 客户OP
-                    this.form.corpAttnName = ''
+                    // this.form.corpAttnName = ''
                     this.form.corpAttnId = ''
                     this.$set(this.form, 'corpAttnTel', '')
                     this.$set(this.form, 'corpAttnEmail', '')
@@ -1331,7 +1332,7 @@ export default {
                         this.form.shortName = item.shortName
                         this.form.corpSource = item.corpSource
                         // 获取 客户op数据
-                        this.getBcorpsattnListfun()
+                        // this.getBcorpsattnListfun()
                         // 业务来源参数带出
                         this.$set(this.form, 'srcType', item.sourceType)
                         this.$set(this.form, 'srcId', item.srcId)
@@ -1355,12 +1356,19 @@ export default {
                 }
             }
             else if (name == 'corpAttnName') {
-                for (let item of this.columnforfun('corpAttnName').dicData) {
-                    if (item.cname == value) {
-                        this.form.corpAttnName = item.cname
-                        this.form.corpAttnId = item.id
-                        this.$set(this.form, 'corpAttnTel', item.tel)
-                        this.$set(this.form, 'corpAttnEmail', item.email)
+                if (this.columnforfun('corpAttnName').dicData.length) {
+                    for (let item of this.columnforfun('corpAttnName').dicData) {
+                        if (item.cname == value) {
+                            this.form.corpAttnName = item.cname
+                            this.form.corpAttnId = item.id
+                            this.$set(this.form, 'corpAttnTel', item.tel)
+                            this.$set(this.form, 'corpAttnEmail', item.email)
+                        }
+                    }
+                } else {
+                    if (value) {
+                        this.form.corpAttnName = value
+                        this.form.corpAttnId = null
                     }
                 }
             }

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

@@ -8,6 +8,12 @@
                 @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
                 @refresh-change="refreshChange" @on-load="onLoad" @expand-change="expandChange"
                 @resetColumn="resetColumnTwo('crud', 309)" @saveColumn="saveColumnTwo('crud', optionBack, 309)">
+                <template slot-scope="{disabled,size}" slot="billSortSearch">
+                    <el-radio-group v-model="query.billSort">
+                        <el-radio label="1">ETD</el-radio>
+                        <el-radio label="2">提单号</el-radio>
+                    </el-radio-group>
+                </template>
                 <!--#region-->
                 <!--<template slot="search" slot-scope="{row,size}">-->
                 <!--    <el-form ref="form" :model="row" label-width="80px" :style="fold?'width: 100%':'width: 70%'">-->
@@ -616,6 +622,7 @@ export default {
             // 表格的检索条件
             query: {
                 billStatus: '0',
+                billSort: '1',
             },
             // 弹窗的搜索项
             mawbQuery: {
@@ -654,7 +661,7 @@ export default {
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 12,
+                searchMenuSpan: 24,
                 searchLabelWidth: '100',
                 border: true,
                 index: true,
@@ -1240,10 +1247,10 @@ export default {
                         type: "select",
                         filterable: true,
                         remote: true,
-                        dicUrl: "/api/blade-user/page?cnName={{key}}",
+                        dicUrl: "/api/blade-los/bcorpsattn/list?cname={{key}}",
                         props: {
-                            label: 'cnName',
-                            value: 'cnName',
+                            label: 'cname',
+                            value: 'cname',
                             res: 'data.records'
                         },
                     },
@@ -1256,6 +1263,7 @@ export default {
                     {
                         label: "创建人",
                         prop: "createUserName",
+                        search: true,
                         rules: [{
                             required: true,
                             message: "请输入创建人",
@@ -1269,6 +1277,15 @@ export default {
                         width: "160",
                         overHidden: true,
                     },
+                    {
+                        label: "排序方式",
+                        prop: "billSort",
+                        hide: true,
+                        showColumn: false,
+                        search: true,
+                        searchValue: '1',
+                        overHidden: true,
+                    },
                     //   {
                     //       label: "更新人",
                     //       prop: "updateUserName",
@@ -1954,6 +1971,7 @@ export default {
         },
         searchReset() {
             this.query = {};
+            this.query.billSort = this.query.billSort ? this.query.billSort : '1'
             this.onLoad(this.page);
         },
         // 搜索