箱型箱量4行 箱号限制输入 默认核算部门

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

@@ -1,6 +1,6 @@
 <template>
     <basic-container>
-        <avue-crud style="height: 200px;" :option="option" :table-loading="loading"
+        <avue-crud style="height: 230px;" :option="option" :table-loading="loading"
             :data="assemblyForm.preContainersList" :page.sync="page" :permission="permissionList"
             :before-open="beforeOpen" v-model="form" ref="crud" :cell-style="{ padding: '0px', textAlign: 'center' }"
             @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel" @selection-change="selectionChange"
@@ -111,8 +111,8 @@ export default {
             selectionList: [],
             option: {},
             optionBack: {
-                height: '150',
-                maxHeight: '150',
+                // height: '150',
+                maxHeight: '180',
                 // calcHeight: 30,
                 tip: false,
                 searchShow: true,

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

@@ -623,7 +623,7 @@ import { similarValues } from "@/util/verifyData";
 import dicSelect from "@/components/dicSelect/main";
 import _ from "lodash";
 export default {
-    components: { reportContainer, SearchQuery, reportformsList,dicSelect },
+    components: { reportContainer, SearchQuery, reportformsList, dicSelect },
     props: {
         pid: {
 
@@ -2751,13 +2751,15 @@ export default {
                 });
                 return
             }
-            let similarDataD = similarValues(this.assemblyForm.feeCenterListD, 'feeCnName', 'curCode')
-            if (similarDataD) {
-                return this.$message.error(`应收费用简称:${similarDataD.feeCnName}的币别不一致,请重新选择`);
-            }
-            let similarDataC = similarValues(this.assemblyForm.feeCenterListC, 'feeCnName', 'curCode')
-            if (similarDataC) {
-                return this.$message.error(`应付费用简称:${similarDataC.feeCnName}的币别不一致,请重新选择`);
+            if (this.business == 1) {
+                let similarDataD = similarValues(this.assemblyForm.feeCenterListD, 'feeCnName', 'curCode')
+                if (similarDataD) {
+                    return this.$message.error(`应收费用简称:${similarDataD.feeCnName}的币别不一致,请重新选择`);
+                }
+                let similarDataC = similarValues(this.assemblyForm.feeCenterListC, 'feeCnName', 'curCode')
+                if (similarDataC) {
+                    return this.$message.error(`应付费用简称:${similarDataC.feeCnName}的币别不一致,请重新选择`);
+                }
             }
             // 判断必填项
             let sum = '请输入'

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

@@ -120,33 +120,33 @@
                                                                 item[0].prop
                                                             ]
                                                                 " :filterable="true" :allowCreate="item[0]
-                                                                        .allowCreate ||
-                                                                        false
-                                                                        " :clearable="false" :remote="true" :disabled="detailData.seeDisabled ||
-                                                                        item[0]
-                                                                            .disabled ||
-                                                                        showLock
-                                                                        " :buttonIf="false" :placeholder="`${item[0]
-                                                                        .text ||
-                                                                        ''}`
-                                                                        " :forParameter="item[0]
-                                                                        .forParameter
-                                                                        " @remoteMethod="
-                                                                        remoteMethod(
-                                                                            $event,
-                                                                            item[0].prop
-                                                                        )
-                                                                        " @corpChange="
-                                                                        corpChange(
-                                                                            $event,
-                                                                            item[0].prop
-                                                                        )
-                                                                        " @corpFocus="
-                                                                        remoteMethod(
-                                                                            $event,
-                                                                            item[0].prop
-                                                                        )
-                                                                        ">
+                                                                    .allowCreate ||
+                                                                    false
+                                                                    " :clearable="false" :remote="true" :disabled="detailData.seeDisabled ||
+                                                                            item[0]
+                                                                                .disabled ||
+                                                                            showLock
+                                                                            " :buttonIf="false" :placeholder="`${item[0]
+                                                                            .text ||
+                                                                            ''}`
+                                                                            " :forParameter="item[0]
+                                                                            .forParameter
+                                                                            " @remoteMethod="
+                                                                            remoteMethod(
+                                                                                $event,
+                                                                                item[0].prop
+                                                                            )
+                                                                            " @corpChange="
+                                                                            corpChange(
+                                                                                $event,
+                                                                                item[0].prop
+                                                                            )
+                                                                            " @corpFocus="
+                                                                            remoteMethod(
+                                                                                $event,
+                                                                                item[0].prop
+                                                                            )
+                                                                            ">
                                                         </search-query>
                                                         <el-input v-else type="age" style="width: 100%;" v-model="form[
                                                             item[0].prop
@@ -193,8 +193,8 @@
                                                             " :selectValue="form[
                                                                 item[1].prop
                                                             ]
-                                                                " :filterable="true" :clearable="false"
-                                                            :remote="true" :disabled="detailData.seeDisabled ||
+                                                                " :filterable="true" :clearable="false" :remote="true"
+                                                            :disabled="detailData.seeDisabled ||
                                                                 item[1]
                                                                     .disabled ||
                                                                 showLock
@@ -204,21 +204,21 @@
                                                                     " :forParameter="item[1]
                                                                         .forParameter
                                                                         " @remoteMethod="
-                                                                        remoteMethod(
-                                                                            $event,
-                                                                            item[1].prop
-                                                                        )
-                                                                        " @corpChange="
-                                                                        corpChange(
-                                                                            $event,
-                                                                            item[1].prop
-                                                                        )
-                                                                        " @corpFocus="
-                                                                        remoteMethod(
-                                                                            $event,
-                                                                            item[1].prop
-                                                                        )
-                                                                        ">
+                                                                            remoteMethod(
+                                                                                $event,
+                                                                                item[1].prop
+                                                                            )
+                                                                            " @corpChange="
+                                                                            corpChange(
+                                                                                $event,
+                                                                                item[1].prop
+                                                                            )
+                                                                            " @corpFocus="
+                                                                            remoteMethod(
+                                                                                $event,
+                                                                                item[1].prop
+                                                                            )
+                                                                            ">
                                                         </search-query>
 
                                                         <tree-select v-else-if="
@@ -229,21 +229,21 @@
                                                         ]
                                                             " filterable :data="item[1].dicData
                                                                 " :props="item[1]
-                                                                        .forParameter
-                                                                        " nodeKey="title" size="small" :disabled="detailData.seeDisabled ||
-                                                                        item[1]
-                                                                            .disabled ||
-                                                                        showLock
-                                                                        " :multiple="false" :clearable="false"
+                                                                    .forParameter
+                                                                    " nodeKey="title" size="small" :disabled="detailData.seeDisabled ||
+                                                                            item[1]
+                                                                                .disabled ||
+                                                                            showLock
+                                                                            " :multiple="false" :clearable="false"
                                                             :placeholder="`${item[1]
                                                                 .text ||
                                                                 ''}`
                                                                 " @input="
-                                                                        corpChange(
-                                                                            $event,
-                                                                            item[1].prop
-                                                                        )
-                                                                        ">
+                                                                    corpChange(
+                                                                        $event,
+                                                                        item[1].prop
+                                                                    )
+                                                                    ">
                                                         </tree-select>
 
                                                         <el-input v-else type="age" style="width: 100%;" v-model="form[
@@ -282,8 +282,8 @@
                                                             " :selectValue="form[
                                                                 item[2].prop
                                                             ]
-                                                                " :filterable="true" :clearable="false"
-                                                            :remote="true" :disabled="detailData.seeDisabled ||
+                                                                " :filterable="true" :clearable="false" :remote="true"
+                                                            :disabled="detailData.seeDisabled ||
                                                                 item[2]
                                                                     .disabled ||
                                                                 showLock
@@ -293,21 +293,21 @@
                                                                         .text ||
                                                                         ''}`
                                                                         " @remoteMethod="
-                                                                        remoteMethod(
-                                                                            $event,
-                                                                            item[2].prop
-                                                                        )
-                                                                        " @corpChange="
-                                                                        corpChange(
-                                                                            $event,
-                                                                            item[2].prop
-                                                                        )
-                                                                        " @corpFocus="
-                                                                        remoteMethod(
-                                                                            $event,
-                                                                            item[2].prop
-                                                                        )
-                                                                        ">
+                                                                            remoteMethod(
+                                                                                $event,
+                                                                                item[2].prop
+                                                                            )
+                                                                            " @corpChange="
+                                                                            corpChange(
+                                                                                $event,
+                                                                                item[2].prop
+                                                                            )
+                                                                            " @corpFocus="
+                                                                            remoteMethod(
+                                                                                $event,
+                                                                                item[2].prop
+                                                                            )
+                                                                            ">
                                                         </search-query>
                                                         <el-input v-else type="age" style="width: 100%;" v-model="form[
                                                             item[2].prop
@@ -339,25 +339,25 @@
                                                         " :buttonIf="item.buttonIf" :forParameter="item.forParameter
                                                             " :joinData="item.joinData" :placeholder="`${item.text || ''}`
                                                                 " @remoteMethod="
-                                                                remoteMethod(
-                                                                    $event,
-                                                                    item.prop
-                                                                )
-                                                                " @corpChange="
-                                                                corpChange(
-                                                                    $event,
-                                                                    item.prop
-                                                                )
-                                                                " @corpFocus="
-                                                                remoteMethod(
-                                                                    $event,
-                                                                    item.prop
-                                                                )
-                                                                " @eldialogConfirm="
-                                                                eldialogConfirm(
-                                                                    item.slot
-                                                                )
-                                                                ">
+                                                                    remoteMethod(
+                                                                        $event,
+                                                                        item.prop
+                                                                    )
+                                                                    " @corpChange="
+                                                                    corpChange(
+                                                                        $event,
+                                                                        item.prop
+                                                                    )
+                                                                    " @corpFocus="
+                                                                    remoteMethod(
+                                                                        $event,
+                                                                        item.prop
+                                                                    )
+                                                                    " @eldialogConfirm="
+                                                                    eldialogConfirm(
+                                                                        item.slot
+                                                                    )
+                                                                    ">
                                                     <bcorps v-show="item.slot ==
                                                         'bcorps'
                                                         " ref="bcorps" :eldialog="true" @selectionChange="
@@ -570,7 +570,10 @@ export default {
                 businessTypes: "海运",
                 seaType: "I", // 进出口 默认出口 E=出口 I=进口"
                 billType: "DD", // 单据类型 默认 直单
-                accDeptName: "", // 核算部门 默认登录人的部门
+                accDeptName: JSON.parse(localStorage.getItem('sysitemData')).deptName,
+                accDept: JSON.parse(localStorage.getItem('sysitemData')).deptId,
+                operatorDeptName: JSON.parse(localStorage.getItem('sysitemData')).deptName,
+                operatorDept: JSON.parse(localStorage.getItem('sysitemData')).deptId,
                 issueType: "ORI", // 签单方式 默认 正本
                 mpaymode: "PP", // 主单付费方式 默认PP
                 hpaymode: "PP", // 分单付费方式 默认 PP
@@ -611,7 +614,10 @@ export default {
                 businessTypes: "海运",
                 seaType: "I", // 进出口 默认出口 E=出口 I=进口"
                 billType: "DD", // 单据类型 默认 直单
-                accDeptName: "", // 核算部门 默认登录人的部门
+                accDeptName: JSON.parse(localStorage.getItem('sysitemData')).deptName,
+                accDept: JSON.parse(localStorage.getItem('sysitemData')).deptId,
+                operatorDeptName: JSON.parse(localStorage.getItem('sysitemData')).deptName,
+                operatorDept: JSON.parse(localStorage.getItem('sysitemData')).deptId,
                 issueType: "ORI", // 签单方式 默认 正本
                 mpaymode: "PP", // 主单付费方式 默认PP
                 hpaymode: "PP", // 分单付费方式 默认 PP
@@ -994,7 +1000,7 @@ export default {
         // 判断是否员id, 有id 就不显示
         if (!this.form.id) {
             this.deptGetDetailPolfun(); // 目的地 卸货港 当前登录人的默认
-            this.userGetListfun(undefined, true); // 获取用户管理数据
+            // this.userGetListfun(undefined, true); // 获取用户管理数据
         }
         this.ownDeptLazyTreefun(); // 获取公司数据
         this.getLazylistfun(); // 获取审核数据

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

@@ -77,7 +77,8 @@
                 </template>
                 <template slot-scope="scope" slot="cntrNo">
                     <el-input v-if="scope.row.edit" v-model="scope.row.cntrNo" maxlength='11' size="small" clearable
-                        placeholder="请输入箱号" @input="cntrNoInput(scope.row, 'cntrNo')"></el-input>
+                        placeholder="请输入箱号" @input="cntrNoInput(scope.row, 'cntrNo')"
+                        @change="verifyChange(scope.row, 'cntrNo')"></el-input>
                     <span v-else>{{ scope.row.cntrNo }}</span>
                 </template>
                 <template slot-scope="scope" slot="sealNo">
@@ -491,7 +492,16 @@ export default {
         cntrNoInput(row, name) {
             this.$set(row, name, row[name].toLocaleUpperCase().replace(/[\W]/g, ''))
         },
-        oepnexcelBox(){
+        verifyChange(row, name) {
+            if (name == 'cntrNo') {
+                const regex = /^([a-zA-Z]{4})([0-9]{7})$/;
+                if (row[name] && !regex.test(row[name])) {
+                    this.$set(row, [name], null)
+                    this.$message.error('请输入4个字母+7个数字!')
+                }
+            }
+        },
+        oepnexcelBox() {
             if (!this.assemblyForm.id) {
                 this.$message({
                     message: '请先点击右上角保存按钮，保存数据之后才能添加！',
@@ -499,10 +509,11 @@ export default {
                 });
                 return
             }
-            this.findObject(this.excelOption.column, "excelFile").action = "/api/blade-los/containers/importBoxNo?billId="+this.assemblyForm.id
+            this.findObject(this.excelOption.column, "excelFile").action = "/api/blade-los/containers/importBoxNo?billId=" + this.assemblyForm.id
             this.excelBox = true
         },
-        uploadBefore(file, done, loading) {681169
+        uploadBefore(file, done, loading) {
+            681169
             done();
             loading = true;
         },

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

@@ -1,6 +1,6 @@
 <template>
     <basic-container>
-        <avue-crud style="height: 200px;" :option="option" :table-loading="loading"
+        <avue-crud style="height: 230px;" :option="option" :table-loading="loading"
             :data="assemblyForm.preContainersList" :page.sync="page" :permission="permissionList"
             :before-open="beforeOpen" v-model="form" :cell-style="{ padding: '0px', textAlign: 'center' }" ref="crud"
             @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel" @selection-change="selectionChange"
@@ -132,9 +132,9 @@ export default {
             selectionList: [],
             option: {},
             optionBack: {
-                height: '150',
+                // height: '200',
                 // calcHeight: 30,
-                maxHeight: '150',
+                maxHeight: '180',
                 tip: false,
                 searchShow: true,
                 searchMenuSpan: 6,

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

@@ -2828,14 +2828,15 @@ export default {
                 });
                 return
             }
-
-            let similarDataD = similarValues(this.assemblyForm.feeCenterListD, 'feeCnName', 'curCode')
-            if (similarDataD) {
-                return this.$message.error(`应收费用简称:${similarDataD.feeCnName}的币别不一致,请重新选择`);
-            }
-            let similarDataC = similarValues(this.assemblyForm.feeCenterListC, 'feeCnName', 'curCode')
-            if (similarDataC) {
-                return this.$message.error(`应付费用简称:${similarDataC.feeCnName}的币别不一致,请重新选择`);
+            if (this.business == 1) {
+                let similarDataD = similarValues(this.assemblyForm.feeCenterListD, 'feeCnName', 'curCode')
+                if (similarDataD) {
+                    return this.$message.error(`应收费用简称:${similarDataD.feeCnName}的币别不一致,请重新选择`);
+                }
+                let similarDataC = similarValues(this.assemblyForm.feeCenterListC, 'feeCnName', 'curCode')
+                if (similarDataC) {
+                    return this.$message.error(`应付费用简称:${similarDataC.feeCnName}的币别不一致,请重新选择`);
+                }
             }
             // 判断必填项
             let sum = '请输入'

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

@@ -25,9 +25,8 @@
                         导入模板<i class="el-icon-arrow-down el-icon--right"></i>
                     </el-button>
                     <el-dropdown-menu slot="dropdown">
-                        <el-dropdown-item v-for="item in imporiData" :key="item.id"
-                            @click.native="importData(item)">{{
-                                item.name }}
+                        <el-dropdown-item v-for="item in imporiData" :key="item.id" @click.native="importData(item)">{{
+                            item.name }}
                         </el-dropdown-item>
                     </el-dropdown-menu>
                 </el-dropdown>
@@ -398,7 +397,10 @@ export default {
                 businessType: 'SE', // 业务类型 默认 海运出口
                 businessTypes: '海运',
                 billType: 'DD', // 单据类型 默认 直单
-                accDeptName: '',// 核算部门 默认登录人的部门
+                accDeptName: JSON.parse(localStorage.getItem('sysitemData')).deptName,
+                accDept: JSON.parse(localStorage.getItem('sysitemData')).deptId,
+                operatorDeptName: JSON.parse(localStorage.getItem('sysitemData')).deptName,
+                operatorDept: JSON.parse(localStorage.getItem('sysitemData')).deptId,
                 issueType: "ORI", // 签单方式 默认 正本提单
                 mpaymode: 'PP', // 主单付费方式 默认PP
                 hpaymode: 'PP', // 分单付费方式 默认 PP
@@ -439,7 +441,10 @@ export default {
                 businessType: 'SE', // 业务类型 默认 海运出口
                 businessTypes: '海运',
                 billType: 'DD', // 单据类型 默认 直单
-                accDeptName: '',// 核算部门 默认登录人的部门
+                accDeptName: JSON.parse(localStorage.getItem('sysitemData')).deptName,
+                accDept: JSON.parse(localStorage.getItem('sysitemData')).deptId,
+                operatorDeptName: JSON.parse(localStorage.getItem('sysitemData')).deptName,
+                operatorDept: JSON.parse(localStorage.getItem('sysitemData')).deptId,
                 issueType: "ORI", // 签单方式 默认 正本提单
                 mpaymode: 'PP', // 主单付费方式 默认PP
                 hpaymode: 'PP', // 分单付费方式 默认 PP
@@ -874,7 +879,7 @@ export default {
         // 判断是否员id, 有id 就不显示
         if (!this.form.id) {
             this.deptGetDetailPolfun() // 收货地 装货港 当前登录人的默认
-            this.userGetListfun(undefined, true) // 获取用户管理数据
+            // this.userGetListfun(undefined, true) // 获取用户管理数据
         }
         this.ownDeptLazyTreefun() // 获取公司数据
         this.getLazylistfun() // 获取审核数据
@@ -976,7 +981,7 @@ export default {
         },
         //文档导入
         importData(row) {
-            if(!row) return
+            if (!row) return
 
             this.excelOption.column[0].action = `/api/blade-los/templateImport/${row.document}?billId=${this.form.id}`
             // this.excelOption.column[0].action = `/api/blade-los/templateImport/${row.document}?billId=${this.form.id}`
@@ -1002,7 +1007,7 @@ export default {
         // 上传成功
         onSuccess(res, done, loading, column) {
             if (Object.keys(res).length) {
-                if(this.currentImportDataRow.showCoverDlg===true) {
+                if (this.currentImportDataRow.showCoverDlg === true) {
                     this.$confirm('此操作将覆盖数据, 是否继续?', '提示', {
                         confirmButtonText: '确定',
                         cancelButtonText: '取消',
@@ -1035,7 +1040,7 @@ export default {
                         loading = false;
                         done();
                     });
-                }else{
+                } else {
                     console.log('onSuccess 1')
                     // this.form = res;
                     Object.keys(res).forEach(key => {

src/views/wel/index.vue

@@ -90,6 +90,7 @@ export default {
         getUserInfo().then(res => {
             this.billType = res.data.data.billType;
             localStorage.setItem('sysitemType', this.billType)
+            localStorage.setItem('sysitemData', JSON.stringify(res.data.data))
         });
         getLazyList().then(res=>{
             localStorage.setItem('user-Information', res.data.data.length?JSON.stringify(res.data.data[0]):null)