修改货代

src/util/date.js

@@ -227,8 +227,13 @@ function addZero(num) {
   }
   return num;
 }
-
+//验证英文
 export function verifyEnglish(str) {
-  const regex = /^[A-Za-z0-9\n .,!?:()|/+-_;'"$&@%*#]+$/;
+  const regex = /^[A-Za-z0-9\n .,!?:()|/+-_;'"$&@%*#，。！？：（）——]+$/;
   return regex.test(str?str:null);
 }
+//验证符号
+export function verifySymbol(str) {
+  const regex = /^[A-Za-z0-9\n .,!?:()|/+-_;'"$&@%*#]+$/;
+  return regex.test(str?str:null);
+}

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

@@ -8,9 +8,11 @@
                 </el-button>
             </div>
             <div class="add-customer-btn">
-                <el-button size="small" type="primary" style="margin-right: 8px" @click="addEdit">新 建
+                <el-button size="small" type="primary" @click="addEdit">新 建
                 </el-button>
-                <el-button size="small" style="margin-right: 8px" :loading="saveLoading" @click="previewDialogfun">预 览
+                <el-button type="success" size="small" @click="CopyDocumentsfun">复制单据
+                </el-button>
+                <el-button size="small" :loading="saveLoading" @click="previewDialogfun">预 览
                 </el-button>
                 <el-button size="small" type="warning" :disabled="!form.id || detailData.seeDisabled"
                     v-if="form.status == 1" @click.stop="revokeDocumentApproval">撤销单据请核
@@ -1665,16 +1667,57 @@ export default {
                 this.pageLoading = false
             })
         },
+        CopyDocumentsfun() {
+            if (!this.form.id) {
+                return this.$message.error("请保存数据");
+            }
+            this.$DialogForm.show({
+                title: '复制单据',
+                width: '300px',
+                menuPosition: 'right',
+                data: { checkbox: '复制费用' },
+                option: {
+                    submitText: '确认',
+                    emptyText: '取消',
+                    span: 24,
+                    column: [{
+                        label: "复制类型",
+                        prop: "checkbox",
+                        type: 'checkbox',
+                        dicData: [{
+                            label: '复制费用',
+                            value: '复制费用',
+                        }],
+                        dataType: 'string',
+                        span: 24,
+                    }]
+                },
+                beforeClose: (done) => {
+                    done()
+                },
+                callback: (res) => {
+                    console.log(res.data,1111111111111)
+                    res.done()
+                    this.billsCopyBillsfun(this.form.id,res.data.checkbox)
+                    res.close()
+                }
+            })
+        },
         // 复制单据接口
-        billsCopyBillsfun(id) {
+        billsCopyBillsfun(id,type) {
             aeabillsCopyBills({ id }).then(res => {
+                console.log(type == '',123455)
+                if (type == '') {
+                    this.$set(res.data.data, 'feeCenterListD', [])
+                    this.$set(res.data.data, 'feeCenterListC', [])
+                }
                 this.form = res.data.data;
                 this.pageLoading = false
                 // this.searchMontage() // 下拉 中文名称和编号拼接
-                // 配箱最上面可以编辑
-                for (let item of this.form.containersList) {
-                    item.edit = false
-                }
+                // // 配箱最上面可以编辑
+                // for (let item of this.form.containersList) {
+                //     item.edit = false
+                // }
                 // 先把状态改成可以编辑，然后判断是否可以编辑
                 this.generateBillsfalse = false
                 // 应收

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

@@ -1608,7 +1608,7 @@ export default {
             this.isShow = false
             this.$nextTick(() => {
                 this.$refs.billsDetails.pageLoading = true
-                this.$refs.billsDetails.billsCopyBillsfun(this.selectionList[0].id)
+                this.$refs.billsDetails.billsCopyBillsfun(this.selectionList[0].id,'复制费用')
             })
         },
         // 编辑详情打开

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

@@ -8,9 +8,11 @@
                 </el-button>
             </div>
             <div class="add-customer-btn">
-                <el-button size="small" type="primary" style="margin-right: 8px" @click="addEdit">新 建
+                <el-button size="small" type="primary" @click="addEdit">新 建
                 </el-button>
-                <el-button size="small" style="margin-right: 8px" :loading="saveLoading" @click="previewDialogfun">预 览
+                <el-button type="success" size="small" @click="CopyDocumentsfun">复制单据
+                </el-button>
+                <el-button size="small" :loading="saveLoading" @click="previewDialogfun">预 览
                 </el-button>
                 <el-button size="small" type="warning" :disabled="!form.id || detailData.seeDisabled"
                     v-if="form.status == 1" @click.stop="revokeDocumentApproval">撤销单据请核
@@ -1630,9 +1632,48 @@ export default {
                 this.pageLoading = false
             })
         },
+        CopyDocumentsfun() {
+            if (!this.form.id) {
+                return this.$message.error("请保存数据");
+            }
+            this.$DialogForm.show({
+                title: '复制单据',
+                width: '300px',
+                menuPosition: 'right',
+                data: { checkbox: '复制费用' },
+                option: {
+                    submitText: '确认',
+                    emptyText: '取消',
+                    span: 24,
+                    column: [{
+                        label: "复制类型",
+                        prop: "checkbox",
+                        type: 'checkbox',
+                        dicData: [{
+                            label: '复制费用',
+                            value: '复制费用',
+                        }],
+                        dataType: 'string',
+                        span: 24,
+                    }]
+                },
+                beforeClose: (done) => {
+                    done()
+                },
+                callback: (res) => {
+                    res.done()
+                    this.billsCopyBillsfun(this.form.id,res.data.checkbox)
+                    res.close()
+                }
+            })
+        },
         // 复制单据接口
-        billsCopyBillsfun(id) {
+        billsCopyBillsfun(id,type) {
             aeabillsCopyBills({ id }).then(res => {
+                if (type == '') {
+                    res.data.data.feeCenterListD=[]
+                    res.data.data.feeCenterListC=[]
+                }
                 this.form = res.data.data;
                 this.pageLoading = false
                 // 配箱最上面可以编辑

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

@@ -1665,7 +1665,7 @@ import { getDeptTree } from "@/api/system/dept";
             this.isShow = false
             this.$nextTick(()=>{
                 this.$refs.billsDetails.pageLoading = true
-                this.$refs.billsDetails.billsCopyBillsfun(this.selectionList[0].id)
+                this.$refs.billsDetails.billsCopyBillsfun(this.selectionList[0].id,'复制费用')
             })
         },
         // 编辑详情打开

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

@@ -1262,7 +1262,7 @@ export default {
         },
         // 包装数据
         packingUnitBpackagesListfun(cnName) {
-            bpackagesList(1, 10, { cnName, status: 0 }).then(res => {
+            bpackagesList(1, 10, { cnName, status: 0, whetherDg: 0  }).then(res => {
                 this.packingUnitData = res.data.data.records
             })
         },

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

@@ -27,9 +27,11 @@
                 <!--        </el-dropdown-item>-->
                 <!--    </el-dropdown-menu>-->
                 <!--</el-dropdown>-->
-                <el-button size="small" type="primary" style="margin-right: 8px" @click="addEdit">新 建
+                <el-button size="small" type="primary" @click="addEdit">新 建
                 </el-button>
-                <el-button size="small" style="margin-right: 8px" :loading="saveLoading" @click="previewDialogfun">预 览
+                <el-button type="success" size="small" @click="CopyDocumentsfun">复制单据
+                </el-button>
+                <el-button size="small" :loading="saveLoading" @click="previewDialogfun">预 览
                 </el-button>
                 <el-button size="small" type="warning" :disabled="!form.id || detailData.seeDisabled || showLock"
                     v-if="form.status == 1" @click.stop="revokeDocumentApproval">撤销单据请核
@@ -1656,9 +1658,54 @@ export default {
                 this.pageLoading = false
             })
         },
+        CopyDocumentsfun() {
+            if (!this.form.id) {
+                return this.$message.error("请保存数据");
+            }
+            this.$DialogForm.show({
+                title: '复制单据',
+                width: '300px',
+                menuPosition: 'right',
+                data: { checkbox: '复制费用,复制箱型箱量' },
+                option: {
+                    submitText: '确认',
+                    emptyText: '取消',
+                    span: 24,
+                    column: [{
+                        label: "复制类型",
+                        prop: "checkbox",
+                        type: 'checkbox',
+                        dicData: [{
+                            label: '复制费用',
+                            value: '复制费用',
+                        }, {
+                            label: '复制箱型箱量',
+                            value: '复制箱型箱量'
+                        }],
+                        dataType: 'string',
+                        span: 24,
+                    }]
+                },
+                beforeClose: (done) => {
+                    done()
+                },
+                callback: (res) => {
+                    res.done()
+                    this.billsCopyBillsfun(this.form.id,res.data.checkbox)
+                    res.close()
+                }
+            })
+        },
         // 复制单据接口
-        billsCopyBillsfun(id) {
+        billsCopyBillsfun(id,type) {
             billsCopyBills({ id }).then(res => {
+                if (type == '复制费用'||type == '') {
+                    res.data.data.preContainersList=[]
+                }
+                if (type == '复制箱型箱量'||type == '') {
+                    res.data.data.feeCenterListD=[]
+                    res.data.data.feeCenterListC=[]
+                }
                 this.form = res.data.data;
                 this.pageLoading = false
                 // this.searchMontage() // 下拉 中文名称和编号拼接

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

@@ -386,7 +386,7 @@
                     <span
                         style="color: #1e9fff;cursor: pointer;width: 100%;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;"
                         @click.stop="rowCellfun(scope.row.id, scope.row)">
-                        {{ scope.row.corpCnName }}
+                        {{ scope.row.shortName }}
                     </span>
                 </template>
                 <template slot="billNo" slot-scope="scope">
@@ -615,6 +615,12 @@ export default {
                         searchOrder: 2,
                     },
                     {
+                        label: "MPayMode",
+                        prop: "mpaymode",
+                        width: "100",
+                        overHidden: true,
+                    },
+                    {
                         label: "HB/L NO",
                         prop: "hblno",
                         width: "80",
@@ -624,6 +630,12 @@ export default {
                         searchOrder: 3,
                     },
                     {
+                        label: "HPayMode",
+                        prop: "hpaymode",
+                        width: "100",
+                        overHidden: true,
+                    },
+                    {
                         label: "单据类型",
                         prop: "billType",
                         type: 'select',
@@ -654,7 +666,7 @@ export default {
                     },
                     {
                         label: "船名",
-                        prop: "vesselEnName",
+                        prop: "vesselCnName",
                         overHidden: true,
                         type: 'select',
                         dicData: [],
@@ -669,6 +681,13 @@ export default {
                         search: true,
                         span: 6,
                         searchOrder: 6,
+                        hide: true,
+                        showColumn: false,
+                    },
+                    {
+                        label: "船名",
+                        prop: "vesselEnName",
+                        overHidden: true,
                     },
                     {
                         label: "航次",
@@ -727,6 +746,13 @@ export default {
                         search: true,
                         span: 6,
                         searchOrder: 10,
+                        hide: true,
+                        showColumn: false,
+                    },
+                    {
+                        label: "船公司",
+                        prop: "carrierEnName",
+                        overHidden: true,
                     },
                     {
                         label: "装货港",
@@ -736,7 +762,7 @@ export default {
                     },
                     {
                         label: "卸货港",
-                        prop: "podCnName",
+                        prop: "podEnName",
                         width: "120",
                         overHidden: true,
                     },
@@ -759,12 +785,12 @@ export default {
                         span: 6,
                         searchOrder: 11,
                     },
-                    {
-                        label: "交货地",
-                        prop: "placeDeliveryName",
-                        width: "120",
-                        overHidden: true,
-                    },
+                    // {
+                    //     label: "交货地",
+                    //     prop: "placeDeliveryName",
+                    //     width: "120",
+                    //     overHidden: true,
+                    // },
                     {
                         label: "航线",
                         prop: "lineCnName",
@@ -802,6 +828,13 @@ export default {
                         search: true,
                         span: 6,
                         searchOrder: 13,
+                        hide: true,
+                        showColumn: false,
+                    },
+                    {
+                        label: "场站",
+                        prop: "cyEnName",
+                        overHidden: true,
                     },
                     {
                         label: "箱型/箱量",
@@ -1734,7 +1767,7 @@ export default {
             this.isShow = false
             this.$nextTick(() => {
                 this.$refs.billsDetails.pageLoading = true
-                this.$refs.billsDetails.billsCopyBillsfun(this.selectionList[0].id)
+                this.$refs.billsDetails.billsCopyBillsfun(this.selectionList[0].id,'复制费用,复制箱型箱量')
             })
             this.$store.commit("IN_OCEANFI_DETAIL");
         },

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

@@ -15,10 +15,10 @@
                         </el-table-column>
                         <el-table-column prop="corpCnName" label="客户">
                             <template slot-scope="{ row }">
-                                <span class="textoverflow">{{ row.corpCnName }}</span>
+                                <span class="textoverflow">{{ row.shortName }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column prop="polCnName" label="目的港">
+                        <el-table-column prop="polEnName" label="目的港">
                         </el-table-column>
                         <el-table-column prop="editQuantity" label="件数">
                             <template slot-scope="scope">
@@ -131,7 +131,8 @@
                     <tempalte slot-scope="{type,disabled}" slot="dgPackingUnitForm">
                         <dic-select style="width: 100%;" v-model="Detailform.dgPackingUnit" placeholder="危险品包装" key="id"
                             label="cnName" url="/blade-los/bpackages/list?whetherDg=1" :filterable="true" :remote="true"
-                            res="records" dataName="cnName" @selectChange="dicChange('dgPackingUnit', $event)"></dic-select>
+                            res="records" dataName="cnName"
+                            @selectChange="dicChange('dgPackingUnit', $event)"></dic-select>
                     </tempalte>
                     <tempalte slot-scope="{type,disabled}" slot="dgPackingLevelForm">
                         <dic-select v-model="Detailform.dgPackingLevel" placeholder="危险品包装等级" key="dictKey"
@@ -311,9 +312,11 @@ export default {
                         },
                         remote: true,
                         dicUrl: '/api/blade-los/bcommodity/list?hsCode={{key}}',
-                        // dicFormatter: (res => {
-                        //     return res.data.records
-                        // }),
+                        rules: [{
+                            required: true,
+                            message: "",
+                            trigger: "blur"
+                        }]
                     },
                     {
                         label: "商品简称",
@@ -330,6 +333,11 @@ export default {
                         width: "120",
                         // display: false,
                         overHidden: true,
+                        rules: [{
+                            required: true,
+                            message: "",
+                            trigger: "blur"
+                        }]
                     },
                     {
                         label: "商品英文名称",
@@ -354,6 +362,11 @@ export default {
                         width: "120",
                         overHidden: true,
                         cell: true,
+                        rules: [{
+                            required: true,
+                            message: "",
+                            trigger: "blur"
+                        }]
                     },
                     {
                         label: "货物描述",
@@ -362,6 +375,11 @@ export default {
                         width: "120",
                         overHidden: true,
                         cell: true,
+                        rules: [{
+                            required: true,
+                            message: "",
+                            trigger: "blur"
+                        }]
                     },
                     {
                         label: "唛头",
@@ -370,6 +388,11 @@ export default {
                         width: "120",
                         overHidden: true,
                         cell: true,
+                        rules: [{
+                            required: true,
+                            message: "",
+                            trigger: "blur"
+                        }]
                     },
                     {
                         label: "装箱件数",
@@ -380,6 +403,11 @@ export default {
                         controls: false,
                         overHidden: true,
                         cell: true,
+                        rules: [{
+                            required: true,
+                            message: "",
+                            trigger: "blur"
+                        }]
                     },
                     {
                         label: "包装单位",
@@ -399,6 +427,11 @@ export default {
                         dicFormatter: (res => {
                             return res.data.records
                         }),
+                        rules: [{
+                            required: true,
+                            message: "",
+                            trigger: "blur"
+                        }]
                     },
                     {
                         label: "装箱毛重(KGM)",
@@ -409,6 +442,11 @@ export default {
                         controls: false,
                         overHidden: true,
                         cell: true,
+                        rules: [{
+                            required: true,
+                            message: "",
+                            trigger: "blur"
+                        }]
                     },
                     {
                         label: "装箱净重(KGM)",
@@ -429,6 +467,11 @@ export default {
                         controls: false,
                         overHidden: true,
                         cell: true,
+                        rules: [{
+                            required: true,
+                            message: "",
+                            trigger: "blur"
+                        }]
                     },
                     {
                         label: "是否危险品",
@@ -820,14 +863,14 @@ export default {
             }
             if (name == 'dgPackingUnit') {
                 if (row) {
-                    // this.$set(this.Detailform, 'dgPackingUnitId', row.id)
+                    this.$set(this.Detailform, 'dgPackingUnitId', row.id)
                     this.$set(this.Detailform, 'dgPackingUnit', row.cnName)
                 } else {
-                    // this.$set(this.Detailform, 'dgPackingUnitId', null)
+                    this.$set(this.Detailform, 'dgPackingUnitId', null)
                     this.$set(this.Detailform, 'dgPackingUnit', null)
                 }
             }
-            
+
         },
         // 行编辑保存
         addUpdateDetail(row, index, done, loading) {

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

@@ -1132,19 +1132,19 @@ export default {
         },
         // 件数聚焦
         quantityFocus() {
-            console.log(this.assemblyForm.waitingBoxList,11111)
-            if (this.assemblyForm.waitingBoxList){
+            console.log(this.assemblyForm.waitingBoxList, 11111)
+            if (this.assemblyForm.waitingBoxList) {
                 if (Number(this.assemblyForm.waitingBoxList[0].quantity) == 0) {
-                this.$alert('当前数据已经均分箱量，请撤销之后再修改', '提示', {
-                    confirmButtonText: '确定',
-                });
-                this.$nextTick(() => {
-                    this.$refs.quantityRef.blur()
-                    this.$refs.grossWeightRef.blur()
-                    this.$refs.measurementRef.blur()
-                })
-                return
-            }
+                    this.$alert('当前数据已经均分箱量，请撤销之后再修改', '提示', {
+                        confirmButtonText: '确定',
+                    });
+                    this.$nextTick(() => {
+                        this.$refs.quantityRef.blur()
+                        this.$refs.grossWeightRef.blur()
+                        this.$refs.measurementRef.blur()
+                    })
+                    return
+                }
             }
 
         },
@@ -1708,7 +1708,7 @@ export default {
         // 包装数据
         packingUnitBpackagesListfun(cnName) {
             console.log(cnName)
-            bpackagesList(1, 10, { cnName, status: 0 }).then(res => {
+            bpackagesList(1, 10, { cnName, status: 0, whetherDg: 0 }).then(res => {
                 this.packingUnitData = res.data.data.records
             })
         },

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

@@ -15,7 +15,9 @@
                 <!--    <div>-->
 
                 <!--    </div>-->
-                <el-button size="small" type="primary" style="margin-right: 8px" @click="addEdit">新 建
+                <el-button size="small" type="primary" @click="addEdit">新 建
+                </el-button>
+                <el-button type="success" size="small" style="margin-right: 8px" @click="CopyDocumentsfun">复制单据
                 </el-button>
                 <el-dropdown style="line-height: 0" v-if="saberTenantId == '409341'">
                     <el-button size="small" type="warning" style="margin-right: 8px"
@@ -330,7 +332,7 @@ import businessReports from "@/views/iosBasicData/SeafreightExportF/bills/assemb
 import { popupReminder } from "@/util/messageReminder";
 import editypes from "@/views/iosBasicData/editypes/index.vue";
 import { editypesList } from "@/api/iosBasicData/editypes";
-import { verifyEnglish } from "@/util/date";
+import { verifyEnglish, verifySymbol } from "@/util/date";
 import { contrastObj, contrastList } from "@/util/contrastData";
 import { selectListLos } from "@/api/approval/processConfig";
 import _ from "lodash";
@@ -379,7 +381,7 @@ export default {
                 operatorName: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_name, // OP 默认登录人
                 operatorId: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id, // OP 默认登录人
                 businessType: 'SE', // 业务类型 默认 海运出口
-                businessTypes:'海运',
+                businessTypes: '海运',
                 billType: 'DD', // 单据类型 默认 直单
                 accDeptName: '',// 核算部门 默认登录人的部门
                 issueType: "ORI", // 签单方式 默认 正本提单
@@ -418,7 +420,7 @@ export default {
                 operatorName: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_name, // OP 默认登录人
                 operatorId: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id, // OP 默认登录人
                 businessType: 'SE', // 业务类型 默认 海运出口
-                businessTypes:'海运',
+                businessTypes: '海运',
                 billType: 'DD', // 单据类型 默认 直单
                 accDeptName: '',// 核算部门 默认登录人的部门
                 issueType: "ORI", // 签单方式 默认 正本提单
@@ -893,6 +895,44 @@ export default {
                 }
             }
         },
+        CopyDocumentsfun() {
+            if (!this.form.id) {
+                return this.$message.error("请保存数据");
+            }
+            this.$DialogForm.show({
+                title: '复制单据',
+                width: '300px',
+                menuPosition: 'right',
+                data: { checkbox: '复制费用,复制箱型箱量' },
+                option: {
+                    submitText: '确认',
+                    emptyText: '取消',
+                    span: 24,
+                    column: [{
+                        label: "复制类型",
+                        prop: "checkbox",
+                        type: 'checkbox',
+                        dicData: [{
+                            label: '复制费用',
+                            value: '复制费用',
+                        }, {
+                            label: '复制箱型箱量',
+                            value: '复制箱型箱量'
+                        }],
+                        dataType: 'string',
+                        span: 24,
+                    }]
+                },
+                beforeClose: (done) => {
+                    done()
+                },
+                callback: (res) => {
+                    res.done()
+                    this.billsCopyBillsfun(this.form.id,res.data.checkbox)
+                    res.close()
+                }
+            })
+        },
         //文档导入
         importData(row) {
             if (row == 0) {
@@ -952,13 +992,13 @@ export default {
         editypesSendingEdifun(row) {
             row.billId = this.form.id
             let msgsList = []
-            if (!verifyEnglish(this.form.hshipperDetails)) {
+            if (!verifyEnglish(this.form.detail.hshipperDetails)) {
                 msgsList.push('发货人')
             }
-            if (!verifyEnglish(this.form.hconsigneeDetails)) {
+            if (!verifyEnglish(this.form.detail.hconsigneeDetails)) {
                 msgsList.push('收货人')
             }
-            if (!verifyEnglish(this.form.hnotifyDetails)) {
+            if (!verifyEnglish(this.form.detail.hnotifyDetails)) {
                 msgsList.push('通知人')
             }
             if (!verifyEnglish(this.form.marks)) {
@@ -971,7 +1011,29 @@ export default {
                 msgsList.push('FORWARDING')
             }
             if (msgsList.length > 0) {
-                this.$message.error(`请正确输入${msgsList.join(",")}的英文和英文符号`);
+                this.$message.error(`请正确输入${msgsList.join(",")}的英文`);
+                return;
+            }
+            if (!verifySymbol(this.form.detail.hshipperDetails)) {
+                msgsList.push('发货人')
+            }
+            if (!verifySymbol(this.form.detail.hconsigneeDetails)) {
+                msgsList.push('收货人')
+            }
+            if (!verifySymbol(this.form.detail.hnotifyDetails)) {
+                msgsList.push('通知人')
+            }
+            if (!verifySymbol(this.form.marks)) {
+                msgsList.push('唛头')
+            }
+            if (!verifySymbol(this.form.commodityDescr)) {
+                msgsList.push('货描')
+            }
+            if (!verifySymbol(this.form.forwarding)) {
+                msgsList.push('FORWARDING')
+            }
+            if (msgsList.length > 0) {
+                this.$message.error(`请正确输入${msgsList.join(",")}的英文符号`);
                 return;
             }
             this.saveLoading = true
@@ -984,7 +1046,7 @@ export default {
                     this.$message({
                         type: 'warning',
                         dangerouslyUseHTMLString: true,
-                        message:text,
+                        message: text,
                         // message: `<p>${text.slice(text.indexOf('非空'), text.indexOf('特殊字符'))}</p><p>${text.slice(text.indexOf('特殊字符'), text.indexOf('长度超长'))}</p><p>${text.slice(text.indexOf('长度超长'), text.indexOf('其他'))}</p><p>${text.slice(text.indexOf('其他'))}</p>`,
                         duration: 5000
                     });
@@ -1893,8 +1955,21 @@ export default {
             })
         },
         // 复制单据接口
-        billsCopyBillsfun(id) {
+        billsCopyBillsfun(id,type) {
+            const loading = this.$loading({
+                lock: true,
+                text: '加载中',
+                spinner: 'el-icon-loading',
+                background: 'rgba(255,255,255,0.7)'
+            });
             billsCopyBills({ id }).then(res => {
+                if (type == '复制费用'||type == '') {
+                    res.data.data.preContainersList=[]
+                }
+                if (type == '复制箱型箱量'||type == '') {
+                    res.data.data.feeCenterListD=[]
+                    res.data.data.feeCenterListC=[]
+                }
                 this.form = res.data.data;
                 this.pageLoading = false
                 // this.searchMontage() // 下拉 中文名称和编号拼接
@@ -1956,6 +2031,8 @@ export default {
                 for (let item of this.form.filesList) {
                     this.$set(item, 'edit', false)
                 }
+            }).finally(() => {
+                loading.close();
             })
         },
         // 详情接口

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

@@ -393,7 +393,7 @@
                     <span
                         style="color: #1e9fff;cursor: pointer;width: 100%;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;"
                         @click.stop="rowCellfun(scope.row.id, scope.row)">
-                        {{ scope.row.corpCnName }}
+                        {{ scope.row.shortName }}
                     </span>
                 </template>
                 <template slot="billNo" slot-scope="scope">
@@ -717,6 +717,12 @@ export default {
                         searchOrder: 2,
                     },
                     {
+                        label: "MPayMode",
+                        prop: "mpaymode",
+                        width: "100",
+                        overHidden: true,
+                    },
+                    {
                         label: "HB/L NO",
                         prop: "hblno",
                         width: "80",
@@ -726,6 +732,12 @@ export default {
                         searchOrder: 3,
                     },
                     {
+                        label: "HPayMode",
+                        prop: "hpaymode",
+                        width: "100",
+                        overHidden: true,
+                    },
+                    {
                         label: "单据类型",
                         prop: "billType",
                         type: 'select',
@@ -755,20 +767,27 @@ export default {
                     },
                     {
                         label: "船名",
-                        prop: "vesselEnName",
+                        prop: "vesselCnName",
                         overHidden: true,
                         type: 'select',
                         filterable: true,
                         remote: true,
-                        dicUrl: "/api/blade-los/bvessels/list?enName={{key}}",
+                        dicUrl: "/api/blade-los/bvessels/list?cnName={{key}}",
                         props: {
-                            label: 'enName',
-                            value: 'enName',
+                            label: 'cnName',
+                            value: 'cnName',
                             res: 'data.records'
                         },
                         search: true,
                         span: 6,
                         searchOrder: 5,
+                        hide: true,
+                        showColumn: false,
+                    },
+                    {
+                        label: "船名",
+                        prop: "vesselEnName",
+                        overHidden: true,
                     },
                     {
                         label: "航次",
@@ -835,6 +854,13 @@ export default {
                         search: true,
                         span: 6,
                         searchOrder: 10,
+                        hide: true,
+                        showColumn: false,
+                    },
+                    {
+                        label: "船公司",
+                        prop: "carrierEnName",
+                        overHidden: true,
                     },
                     {
                         label: "装货港",
@@ -844,7 +870,7 @@ export default {
                     },
                     {
                         label: "卸货港",
-                        prop: "podCnName",
+                        prop: "podEnName",
                         width: "120",
                         overHidden: true,
                     },
@@ -868,7 +894,7 @@ export default {
                     },
                     {
                         label: "交货地",
-                        prop: "placeDeliveryName",
+                        prop: "placeDeliveryEnName",
                         width: "120",
                         overHidden: true,
                     },
@@ -907,6 +933,13 @@ export default {
                         search: true,
                         span: 6,
                         searchOrder: 13,
+                        hide: true,
+                        showColumn: false,
+                    },
+                    {
+                        label: "场站",
+                        prop: "cyEnName",
+                        overHidden: true,
                     },
                     {
                         label: "箱型/箱量",
@@ -1862,7 +1895,7 @@ export default {
             this.isShow = false
             this.$nextTick(() => {
                 this.$refs.billsDetails.pageLoading = true
-                this.$refs.billsDetails.billsCopyBillsfun(this.selectionList[0].id)
+                this.$refs.billsDetails.billsCopyBillsfun(this.selectionList[0].id, '复制费用,复制箱型箱量')
             })
             this.$store.commit("IN_SEAFE_DETAIL");
         },

src/views/tirePartsMall/basicData/sharedSales/detailsPage.vue

@@ -71,13 +71,13 @@
                                     <avue-crud :data="inventoryList" :option="inventoryOption">
                                     </avue-crud>
                                     <el-button slot="reference" type="primary" plain size="small"
-                                        :disabled="selectionMultilist.length != 1 || form.businessSource == '外部销售'">查看库存</el-button>
+                                        :disabled="selectionMultilist.length != 1">查看库存</el-button>
                                 </el-popover>
                                 <el-button type="primary" plain size="small"
-                                    :disabled="selectionMultilist.length == 0 || editButton || form.status == '已发货' || form.businessSource == '外部销售'"
+                                    :disabled="selectionMultilist.length == 0 || editButton || form.status == '已发货' "
                                     @click="allClick('派发销售单')">派发销售单</el-button>
                                 <el-button type="danger" plain size="small" @click="allClick('撤销派发')"
-                                    :disabled="selectionMultilist.length == 0 || editButton || form.goodsTotalShipNum == 0 || form.businessSource == '外部销售'">撤销派发</el-button>
+                                    :disabled="selectionMultilist.length == 0 || editButton || form.goodsTotalShipNum == 0">撤销派发</el-button>
                                 <el-button type="primary" icon="el-icon-printer" size="small"
                                     @click="handlePrint">打印</el-button>
                                 <el-button type="danger" plain size="small" @click="batchDelete"

src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -80,7 +80,7 @@
                     <tempalte slot="salerName">
                         <dic-select v-model="form.salerName" placeholder="业务员" key="id" label="name"
                             url="/blade-user/salerList" :filterable="true" @selectChange="dicChange('salerName', $event)"
-                            :disabled="isContacts">
+                            :disabled="form.generateTask == '已生成'||form.businessSource == '外部销售' || isDisabledTask">
                         </dic-select>
                     </tempalte>
                 </avue-form>
@@ -639,11 +639,11 @@ export default {
                     // },
                     // dicUrl: "/api/blade-user/salerList",
                     // filterable: true,
-                    // rules: [{
-                    //     required: true,
-                    //     message: " ",
-                    //     trigger: "blur"
-                    // }]
+                    rules: [{
+                        required: true,
+                        message: " ",
+                        trigger: "blur"
+                    }]
                 }, {
                     label: '仓库',
                     prop: "storageId",
@@ -1967,7 +1967,7 @@ export default {
             this.isAdd = false
             if (this.form.billType == 1) {
                 this.optionForm.column.forEach(its => {
-                    if (its.prop == 'customerName' || its.prop == 'businesDate' || its.prop == 'businessSource' || its.prop == 'returnsNumber' || its.prop == 'returnsAmount' || its.prop == 'srcOrdNo'|| its.prop == 'phone'|| its.prop == 'recAddress'|| its.prop == 'storageId'|| its.prop == 'receivableType') {
+                    if (its.prop == 'customerName' || its.prop == 'businesDate' || its.prop == 'businessSource' || its.prop == 'returnsNumber' || its.prop == 'returnsAmount' || its.prop == 'srcOrdNo'|| its.prop == 'phone'|| its.prop == 'recAddress'|| its.prop == 'receivableType') {
                         this.$set(its, 'disabled', true)
                         this.isSaveBtn = false;
                         this.isDisabledTask = false;