修改bug

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -47,7 +47,7 @@
                                         <dic-select v-model="form.branchName" placeholder="所属公司" key="id"
                                             label="deptName" url="/blade-system/dept/top-list" :filterable="true"
                                             :remote="true" dataName="deptName"
-                                            :disabled="editSave || !(roleName.includes('admin') || roleName.includes('总部')) || tableData.length"
+                                            :disabled="editSave || !(roleName.includes('admin') || roleName.includes('总部'))"
                                             @selectChange="dicChange('branchName', $event)"></dic-select>
                                     </el-form-item>
                                 </el-col>
@@ -76,7 +76,7 @@
                                 <el-col :span="5">
                                     <el-form-item label="事由" prop="remarks">
                                         <el-input style="width: 100%;" v-model="form.remarks" size="small"
-                                            autocomplete="off" :disabled="editSave || tableData.length" clearable
+                                            autocomplete="off" :disabled="editSave " clearable
                                             placeholder="请输入事由">
                                         </el-input>
                                     </el-form-item>

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

@@ -820,14 +820,14 @@ export default {
         billsGetBillNofun(){
             let billNoFormat = ''
             if (this.form.cargoType == 'dry') {
-                billNoFormat = 'HYCK-PH'
+                billNoFormat = 'HYJK-PH'
             }else if (this.form.cargoType == 'danger') {
-                billNoFormat = 'HYCK-WXP'
+                billNoFormat = 'HYJK-WXP'
             }else if (this.form.cargoType == 'reefer') {
-                billNoFormat = 'HYCK-DG'
+                billNoFormat = 'HYJK-DG'
             }else {}
             billsGetBillNo({
-                businessTypeCode:'HYCK',
+                businessTypeCode:'HYJK',
                 billNoFormat:billNoFormat
             }).then(res=>{
                 this.columnforfun('hpaymode').disabled = false
@@ -1115,8 +1115,8 @@ export default {
         },
         // 主表保存接口大保存
         billsSubmitfun(){
-            this.form.billNoFormat = 'HYCK'
-            this.form.businessTypeCode = 'HYCK'
+            this.form.billNoFormat = 'HYJK'
+            this.form.businessTypeCode = 'HYJK'
             // 把拼接的数据拆开 开始 🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒
             this.searchSplit()
             // 把拼接的数据拆开 结束 💩💩💩💩💩💩💩💩💩💩💩💩💩💩

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

@@ -503,7 +503,7 @@
         </div>
 
         <!--模板弹窗-->
-        <el-dialog title="提示" :visible.sync="templateVisible" append-to-body width="70%" :close-on-click-modal="false"
+        <el-dialog title="费用模板" :visible.sync="templateVisible" append-to-body width="70%" :close-on-click-modal="false"
             :before-close="handleClose">
             <div>
                 <el-row>
@@ -646,7 +646,8 @@ import {
 import {
     feecenterTemplateImport,
     listFeeCountByCorp,
-    losbfeestemplateGetListTemplate
+    losbfeestemplateGetListTemplate,
+    templateImportBatch
 } from "@/api/iosBasicData/bills";
 import {
     losbfeestemplateDetail
@@ -679,6 +680,7 @@ import {
     getToken
 } from "@/util/auth";
 import extractionCost from "@/components/extractionCost/main.vue";
+import { getListTemplate, getListTemplatelist } from "@/api/iosBasicData/losbfeestemplate";
 import dicSelect from "@/components/dicSelect/main";
 import _ from "lodash";
 export default {
@@ -1403,49 +1405,48 @@ export default {
             // 导入弹窗表格的配置
             templateOption: {},
             templateOptionBack: {
+                height: 500,
                 menu: false,
-                stripe: true,
                 addBtn: false,
                 editBtn: false,
                 delBtn: false,
                 viewBtn: false,
+                header: false,
                 index: true,
-                selection: true,
-                column: [{
-                    label: '客户',
-                    prop: 'corpCnName',
-                    overHidden: true,
-                },
-                {
-                    label: '客户类型',
-                    prop: 'corpType',
-                    overHidden: true,
-                },
-                {
-                    label: '费用',
-                    prop: 'feeCnName',
-                    overHidden: true,
-                },
-                {
-                    label: '数量',
-                    prop: 'quantity',
-                    overHidden: true,
-                },
-                {
-                    label: '单价',
-                    prop: 'price',
-                    overHidden: true,
-                },
-                {
-                    label: '计量单位',
-                    prop: 'unitNo',
-                    overHidden: true,
-                },
-                {
-                    label: '币别',
-                    prop: 'curCode',
-                    overHidden: true,
-                }
+                tip: false,
+                // selection: true,
+                column: [
+                    {
+                        label: '类别',
+                        prop: 'type',
+                        overHidden: true,
+                    },
+                    {
+                        label: '费用',
+                        prop: 'feeCnName',
+                        overHidden: true,
+                    },
+                    {
+                        label: '计量单位',
+                        prop: 'unitNo',
+                        overHidden: true,
+                    },
+                    {
+                        label: '单价',
+                        prop: 'salesPrice',
+                        overHidden: true,
+                    },
+                    {
+                        label: '币别',
+                        prop: 'curCode',
+                        overHidden: true,
+                    },
+                    {
+                        label: '结算单位',
+                        prop: 'corpCnName',
+                        overHidden: true,
+                    },
+
                 ]
             },
             // 左侧数据
@@ -1539,6 +1540,7 @@ export default {
             isProfitView: false, // 当前登录人是否有利润查看角色
             idArr: [],
             updateSearchKey: new Date().getTime(),
+            dc: null,
         }
     },
     async created() {
@@ -1714,7 +1716,7 @@ export default {
                 groupCode: this.reportformsObj.groupCode,
                 corpIds: row.id,
                 curCode: row.curCode,
-                type: 'HYCK'
+                type: 'HYJK'
             }).then(res => {
                 this.handleReportPreview(this.reportformsObj.url, res.data.data.data)
             })
@@ -1728,7 +1730,7 @@ export default {
                 reportCode: val.classifyCode,
                 groupCode: val.groupCode,
                 itemIds: this.idArr.join(','),
-                type: 'HYCK'
+                type: 'HYJK'
             }).then(res => {
                 this.handleReportPreview(val.url, res.data.data.data)
             })
@@ -1762,7 +1764,7 @@ export default {
                 }
                 this.$nextTick(() => {
                     this.$refs.reportformsList.onLoad(page, {
-                        businessType: 'HYCK',
+                        businessType: 'HYJK',
                         classifyCode: '费用',
                         groupCode: groupCode
                     })
@@ -1773,7 +1775,7 @@ export default {
                 getFeeCenterCorpIds({
                     billId: this.assemblyForm.id,
                     dc: dc,
-                    type: 'HYCK',
+                    type: 'HYJK',
                 }).then(res => {
                     this.printingLoading = false
                     res.data.data.forEach(e => {
@@ -1783,7 +1785,7 @@ export default {
                     this.PrintingData = res.data.data
                 })
                 this.reportsListfun({
-                    businessType: 'HYCK',
+                    businessType: 'HYJK',
                     classifyCode: '费用',
                     groupCode: groupCode
                 })
@@ -1865,38 +1867,60 @@ export default {
         },
         // 模板导入
         templateExport() {
-
             if (!this.lefttemplate.id) {
                 this.$message.warning('请选择左侧模版名')
                 return
             }
-            if (this.feesselectionList.length > 0) {
-                console.log(this.lefttemplate)
-                feecenterTemplateImport({
-                    ...this.lefttemplate,
-                    feesTemplateItemsList: this.feesselectionList,
-                    billNoId: this.assemblyForm.id
-                }).then(res => {
-                    if (res.data.msg.indexOf('未导入') >= 0) {
-                        this.$message({
-                            type: "error",
-                            message: res.data.msg
-                        });
-                    } else {
-                        this.$message({
-                            type: "success",
-                            message: res.data.msg
-                        });
-                    }
-                    this.feesselectionList = [] // 清空多选
-                    this.templateRightData = [] // 清空数据
-                    this.lefttemplate = {} //左侧数据
-                    this.$emit('billsDetailfun')
-                    this.templateVisible = false
-                })
-            } else {
-                this.$message.warning('请先选择要导入的数据')
+            let obj = {
+                billsIds: this.assemblyForm.id,
+                templateId: this.lefttemplate.id,
+                dc: this.dc,
             }
+            const loading = this.$loading({
+                lock: true,
+                text: '加载中',
+                spinner: 'el-icon-loading',
+                background: 'rgba(255,255,255,0.7)'
+            });
+            templateImportBatch(obj).then(res => {
+                this.$message.success("操作成功!");
+                // this.templateDialog = false
+                this.dc = null
+                this.feesselectionList = [] // 清空多选
+                this.templateRightData = [] // 清空数据
+                this.lefttemplate = {}//左侧数据
+                this.$emit('billsDetailfun')
+                this.templateVisible = false
+            }).finally(() => {
+                loading.close();
+            })
+            // if (this.feesselectionList.length > 0) {
+            //     console.log(this.lefttemplate)
+            //     feecenterTemplateImport({
+            //         ...this.lefttemplate,
+            //         feesTemplateItemsList: this.feesselectionList,
+            //         billNoId: this.assemblyForm.id
+            //     }).then(res => {
+            //         if (res.data.msg.indexOf('未导入') >= 0) {
+            //             this.$message({
+            //                 type: "error",
+            //                 message: res.data.msg
+            //             });
+            //         } else {
+            //             this.$message({
+            //                 type: "success",
+            //                 message: res.data.msg
+            //             });
+            //         }
+            //         this.feesselectionList = [] // 清空多选
+            //         this.templateRightData = [] // 清空数据
+            //         this.lefttemplate = {} //左侧数据
+            //         this.$emit('billsDetailfun')
+            //         this.templateVisible = false
+            //     })
+            // } else {
+            //     this.$message.warning('请先选择要导入的数据')
+            // }
         },
         // 模板
         templateClick(dc) {
@@ -1910,27 +1934,28 @@ export default {
             if (popupReminder(this.assemblyForm, this.messageData)) {
                 return;
             }
+            this.dc = dc
             this.templateVisible = true
-            losbfeestemplateGetListTemplate(1, 50, {
-                dc: dc,
+            let obj = {
                 status: 0,
                 type: 'HYJK',
+                dc: this.dc,
                 shippingCompanyId: this.assemblyForm.carrierId,
-                branchId:this.assemblyForm.branchId
-            }).then(res => {
+            }
+            getListTemplate(obj).then(res => {
                 this.templateData = res.data.data.records
                 this.lefttemplate = res.data.data.records[0]
                 // 查第一条的明细
-                losbfeestemplateDetail(this.templateData[0].id).then(res => {
-                    this.templateRightData = res.data.data.feesTemplateItemsList
+                getListTemplatelist({ current: 1, size: 100, pid: res.data.data.records[0].id }).then(res => {
+                    this.templateRightData = res.data.data.records
                 })
             })
         },
         // 左侧选择
         nodeClick(e) {
             this.lefttemplate = e
-            losbfeestemplateDetail(e.id).then(res => {
-                this.templateRightData = res.data.data.feesTemplateItemsList
+            getListTemplatelist({ current: 1, size: 100, pid: this.lefttemplate.id }).then(res => {
+                this.templateRightData = res.data.data.records
             })
         },
         // 右侧选择回调
@@ -2495,7 +2520,7 @@ export default {
                         //     }
                         // })
                         // 计算金额
-                        this.$set(row, 'amount', Number(row.price?row.price:0) * Number(row.quantity ? row.quantity : 0))
+                        this.$set(row, 'amount', Number(row.price ? row.price : 0) * Number(row.quantity ? row.quantity : 0))
                         if (row.curCode == this.getLocalCurrency()) {
                             this.$set(row, 'rmbAmount', row.amount.toFixed(2))
                             this.$set(row, 'usdAmount', '')
@@ -2615,7 +2640,7 @@ export default {
         },
         // 单价
         priceinputfun(value, row) {
-            let price = Number(row.price?row.price:0), qty = Number(row.quantity?row.quantity:0)
+            let price = Number(row.price ? row.price : 0), qty = Number(row.quantity ? row.quantity : 0)
             if (isNaN(price)) {
                 price = 0.00
                 this.$set(row, 'price', price)
@@ -2659,7 +2684,7 @@ export default {
         },
         // 数量
         quantityinputfun(row) {
-            let price = Number(row.price?row.price:0), qty = Number(row.quantity?row.quantity:0)
+            let price = Number(row.price ? row.price : 0), qty = Number(row.quantity ? row.quantity : 0)
             if (isNaN(price)) {
                 price = 0.00
                 this.$set(row, 'price', price)
@@ -3088,7 +3113,7 @@ export default {
                     let obj = {}
                     obj = {
                         srcId: this.assemblyForm.id,
-                        srcType: 'HYCK',
+                        srcType: 'HYJK',
                         feeCenterList: this.selectionDList,
                         url: '/iosBasicData/OceanFreightImport/bills/index',
                         pageStatus: 'this.$store.getters.approvalDetails',
@@ -3134,7 +3159,7 @@ export default {
                     let obj = {}
                     obj = {
                         srcId: this.assemblyForm.id,
-                        srcType: 'HYCK',
+                        srcType: 'HYJK',
                         feeCenterList: this.selectionCList,
                         url: '/iosBasicData/OceanFreightImport/bills/index',
                         pageStatus: 'this.$store.getters.approvalDetails',

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

@@ -442,7 +442,7 @@
                 </el-tab-pane>
 
                 <el-tab-pane label="费用信息" name="fy" class="scrollable-container"
-                    v-if="!(form.billType == 'MM' && roleName.includes('secondaryAdmin')) && (roleName.includes('admin') || roleName.includes('secondaryAdmin') || roleName.includes('应收修改') || roleName.includes('应付修改') || roleName.includes('应收查看') || roleName.includes('应付查看'))">
+                    v-if="!(form.billType == 'MM' && isHq!=1) && (roleName.includes('admin') || roleName.includes('secondaryAdmin') || roleName.includes('应收修改') || roleName.includes('应付修改') || roleName.includes('应收查看') || roleName.includes('应付查看'))">
                     <feecenter :assemblyForm="form" :copyFormData="copyFormData" :detailData="detailData"
                         :disabled="detailData.seeDisabled || showLock" :pleasereviewType="pleasereviewType"
                         :pid="form.id" @billsDetailfun="billsDetailfun(form.id)">
@@ -885,7 +885,8 @@ export default {
                 ]
             },
             excelBox: false,
-            saberTenantId: 0
+            saberTenantId: 0,
+            isHq: null
         };
     },
     watch: {
@@ -960,6 +961,7 @@ export default {
         this.saberUserInfo = JSON.parse(
             localStorage.getItem("saber-userInfo")
         ).content;
+        this.isHq = JSON.parse(localStorage.getItem('user-Information')).isHq
         this.roleName = localStorage.getItem("roleName").split(",");
         isProcurement({
             param: "verify.symbol"

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

@@ -588,7 +588,7 @@ export default {
                 }
                 item.pid = this.assemblyForm.id
             }
-            if (numberSum != this.assemblyForm.quantity) return this.$message.error('箱型所有的件数不等于总件数')
+            if (numberSum>0&&(numberSum != this.assemblyForm.quantity)) return this.$message.error('箱型所有的件数不等于总件数')
             this.$confirm("批量保存后，需要重新配箱，确认继续?", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",

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

@@ -506,7 +506,7 @@
         </div>
 
         <!--模板弹窗-->
-        <el-dialog title="提示" :visible.sync="templateVisible" append-to-body width="70%" :close-on-click-modal="false"
+        <el-dialog title="费用模板" :visible.sync="templateVisible" append-to-body width="70%" :close-on-click-modal="false"
             :before-close="handleClose">
             <div>
                 <el-row>
@@ -637,7 +637,8 @@ import { getWorkDicts } from "@/api/system/dictbiz";
 import {
     feecenterTemplateImport,
     listFeeCountByCorp,
-    losbfeestemplateGetListTemplate
+    losbfeestemplateGetListTemplate,
+    templateImportBatch
 } from "@/api/iosBasicData/bills";
 import { losbfeestemplateDetail } from "@/api/iosBasicData/losbfeestemplate";
 import { popupReminder, requiredMessage } from "@/util/messageReminder";
@@ -653,6 +654,7 @@ import { getToken } from "@/util/auth";
 import extractionCost from "@/components/extractionCost/main.vue";
 import dicSelect from "@/components/dicSelect/main";
 import mailComponent from "@/components/iosbasic-data/mail-component.vue";
+import { getListTemplate, getListTemplatelist } from "@/api/iosBasicData/losbfeestemplate";
 import _ from "lodash";
 export default {
     components: { extractionCost, dicSelect, reportContainer, SearchQuery, reportformsList, mailComponent },
@@ -1389,23 +1391,20 @@ export default {
             // 导入弹窗表格的配置
             templateOption: {},
             templateOptionBack: {
+                height: 500,
                 menu: false,
-                stripe: true,
                 addBtn: false,
                 editBtn: false,
                 delBtn: false,
                 viewBtn: false,
+                header: false,
                 index: true,
-                selection: true,
+                tip: false,
+                // selection: true,
                 column: [
                     {
-                        label: '客户',
-                        prop: 'corpCnName',
-                        overHidden: true,
-                    },
-                    {
-                        label: '客户类型',
-                        prop: 'corpType',
+                        label: '类别',
+                        prop: 'type',
                         overHidden: true,
                     },
                     {
@@ -1414,25 +1413,26 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: '数量',
-                        prop: 'quantity',
+                        label: '计量单位',
+                        prop: 'unitNo',
                         overHidden: true,
                     },
                     {
                         label: '单价',
-                        prop: 'price',
+                        prop: 'salesPrice',
                         overHidden: true,
                     },
                     {
-                        label: '计量单位',
-                        prop: 'unitNo',
+                        label: '币别',
+                        prop: 'curCode',
                         overHidden: true,
                     },
                     {
-                        label: '币别',
-                        prop: 'curCode',
+                        label: '结算单位',
+                        prop: 'corpCnName',
                         overHidden: true,
-                    }
+                    },
+
                 ]
             },
             // 左侧数据
@@ -1527,6 +1527,7 @@ export default {
             isProfitView: false, // 当前登录人是否有利润查看角色
             idArr: [],
             updateSearchKey: new Date().getTime(),
+            dc: null
         }
     },
     async created() {
@@ -1864,33 +1865,56 @@ export default {
                 this.$message.warning('请选择左侧模版名')
                 return
             }
-            if (this.feesselectionList.length > 0) {
-                console.log(this.lefttemplate)
-                feecenterTemplateImport({
-                    ...this.lefttemplate,
-                    feesTemplateItemsList: this.feesselectionList,
-                    billNoId: this.assemblyForm.id
-                }).then(res => {
-                    if (res.data.msg.indexOf('未导入') >= 0) {
-                        this.$message({
-                            type: "error",
-                            message: res.data.msg
-                        });
-                    } else {
-                        this.$message({
-                            type: "success",
-                            message: res.data.msg
-                        });
-                    }
-                    this.feesselectionList = [] // 清空多选
-                    this.templateRightData = [] // 清空数据
-                    this.lefttemplate = {}//左侧数据
-                    this.$emit('billsDetailfun')
-                    this.templateVisible = false
-                })
-            } else {
-                this.$message.warning('请先选择要导入的数据')
+            let obj = {
+                billsIds: this.assemblyForm.id,
+                templateId: this.lefttemplate.id,
+                dc: this.dc,
             }
+            const loading = this.$loading({
+                lock: true,
+                text: '加载中',
+                spinner: 'el-icon-loading',
+                background: 'rgba(255,255,255,0.7)'
+            });
+            templateImportBatch(obj).then(res => {
+                this.$message.success("操作成功!");
+                // this.templateDialog = false
+                this.dc = null
+                this.feesselectionList = [] // 清空多选
+                this.templateRightData = [] // 清空数据
+                this.lefttemplate = {}//左侧数据
+                this.$emit('billsDetailfun')
+                this.templateVisible = false
+            }).finally(() => {
+                loading.close();
+            })
+            // if (this.feesselectionList.length > 0) {
+            //     console.log(this.lefttemplate)
+            //     feecenterTemplateImport({
+            //         ...this.lefttemplate,
+            //         feesTemplateItemsList: this.feesselectionList,
+            //         billNoId: this.assemblyForm.id
+            //     }).then(res => {
+            //         if (res.data.msg.indexOf('未导入') >= 0) {
+            //             this.$message({
+            //                 type: "error",
+            //                 message: res.data.msg
+            //             });
+            //         } else {
+            //             this.$message({
+            //                 type: "success",
+            //                 message: res.data.msg
+            //             });
+            //         }
+            //         this.feesselectionList = [] // 清空多选
+            //         this.templateRightData = [] // 清空数据
+            //         this.lefttemplate = {}//左侧数据
+            //         this.$emit('billsDetailfun')
+            //         this.templateVisible = false
+            //     })
+            // } else {
+            //     this.$message.warning('请先选择要导入的数据')
+            // }
         },
         getData() {
             this.$emit('billsDetailfun')
@@ -1907,27 +1931,28 @@ export default {
             if (popupReminder(this.assemblyForm, this.messageData)) {
                 return;
             }
+            this.dc = dc
             this.templateVisible = true
-            losbfeestemplateGetListTemplate(1, 50, {
-                dc: dc,
+            let obj = {
                 status: 0,
                 type: 'HYCK',
+                dc: this.dc,
                 shippingCompanyId: this.assemblyForm.carrierId,
-                branchId: this.assemblyForm.branchId
-            }).then(res => {
+            }
+            getListTemplate(obj).then(res => {
                 this.templateData = res.data.data.records
                 this.lefttemplate = res.data.data.records[0]
                 // 查第一条的明细
-                losbfeestemplateDetail(this.templateData[0].id).then(res => {
-                    this.templateRightData = res.data.data.feesTemplateItemsList
+                getListTemplatelist({ current: 1, size: 100, pid: res.data.data.records[0].id }).then(res => {
+                    this.templateRightData = res.data.data.records
                 })
             })
         },
         // 左侧选择
         nodeClick(e) {
             this.lefttemplate = e
-            losbfeestemplateDetail(e.id).then(res => {
-                this.templateRightData = res.data.data.feesTemplateItemsList
+            getListTemplatelist({ current: 1, size: 100, pid:this.lefttemplate.id }).then(res => {
+                this.templateRightData = res.data.data.records
             })
         },
         // 右侧选择回调

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

@@ -281,7 +281,7 @@
                     </div>
                 </el-tab-pane>
                 <el-tab-pane label="费用信息" name="fy" class="scrollable-container"
-                    v-if="!(form.billType == 'MM' && roleName.includes('secondaryAdmin')) && (roleName.includes('admin') || roleName.includes('应收修改') || roleName.includes('应付修改') || roleName.includes('应收查看') || roleName.includes('应付查看'))">
+                    v-if="!(form.billType == 'MM' && isHq != 1) && (roleName.includes('admin') || roleName.includes('应收修改') || roleName.includes('应付修改') || roleName.includes('应收查看') || roleName.includes('应付查看'))">
                     <feecenter :assemblyForm="form" :copyFormData="copyFormData" :detailData="detailData"
                         :disabled="detailData.seeDisabled || showLock" :pleasereviewType="pleasereviewType"
                         :pid="form.id" @billsDetailfun="billsDetailfun(form.id)">
@@ -301,8 +301,8 @@
         <!--导入模板-->
         <el-dialog title="导入模板" append-to-body :visible.sync="excelBox" width="555px" :close-on-click-modal="false"
             v-dialog-drag>
-            <avue-form :option="excelOption" v-model="excelForm" :table-loading="excelLoading"
-                :upload-before="uploadBefore" :upload-after="onSuccess">
+            <avue-form v-if="excelBox" :option="excelOption" v-model="excelForm" :upload-before="uploadBefore"
+                :upload-after="onSuccess">
             </avue-form>
         </el-dialog>
         <!--审核弹窗-->
@@ -738,7 +738,7 @@ export default {
                 // { id: 1, name: '导入 PIL 订舱模板' },
                 // { id: 2, name: '导入截单格式' },
                 // { id: 3, name: '导入海信提单' },
-                { id: 4, name: '导入提单样本改名提单样本' }
+                { id: 4, name: '提单样本' }
             ],
             excelForm: {},
             excelLoading: false,
@@ -764,6 +764,7 @@ export default {
             excelBox: false,
             saberTenantId: 0,
             importTemplate: null,
+            isHq: null
         }
     },
     watch: {
@@ -837,6 +838,7 @@ export default {
         let Obj = JSON.parse(localStorage.getItem('saber-tenantId'))
         this.saberTenantId = Obj ? Obj.content : 0;
         this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
+        this.isHq = JSON.parse(localStorage.getItem('user-Information')).isHq
         isProcurement({ "param": "verify.symbol" }).then(res => {
             this.verifySymbolStatus = res.data.data
         })
@@ -991,10 +993,10 @@ export default {
             }
             this.excelBox = true
         },
-        uploadBefore(file, done, loading) {
-            done();
-            loading = true;
-        },
+        // uploadBefore(file, done, loading) {
+        //     done();
+        //     loading = true;
+        // },
         removeEmptyValues(obj) {
             Object.keys(obj).forEach(key => {
                 if (obj[key] === null || obj[key] === undefined || obj[key] === '') {
@@ -1005,7 +1007,9 @@ export default {
         },
         // 上传成功
         onSuccess(res, done, loading, column) {
+            loading = true
             if (Object.keys(res).length) {
+                //   loading = false;
                 this.$confirm('此操作将覆盖数据, 是否继续?', '提示', {
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',

src/views/iosBasicData/loloTemplate/feesTemplateItems.vue

@@ -47,8 +47,8 @@
                     </template>
                     <template slot="corpTypeForm" slot-scope="{row,index}">
                         <dic-select v-if="row.$cellEdit" v-model="row.corpType" label="cnName" res="records"
-                             url="/blade-los/bcorpstypedefine/list?status=0&current=1&size=20"
-                            :filterable="true" :remote="true" dataName="cnName"
+                            url="/blade-los/bcorpstypedefine/list?status=0&current=1&size=20" :filterable="true"
+                            :remote="true" dataName="cnName"
                             @selectChange="rowDicChange('corpType', $event, row)"></dic-select>
                         <span v-else>{{ row.corpType }}</span>
                     </template>
@@ -66,10 +66,31 @@
                     </template>
                     <template slot="unitNoForm" slot-scope="{row,index}">
                         <dic-select v-if="row.$cellEdit" v-model="row.unitNo" key="id" label="cnName"
-                            url="/blade-los//bunits/listAll" :filterable="true"
+                            url="/blade-los//bunits/listAll" :filterable="true" :disabled="row.quantityRule == '按箱型'"
                             @selectChange="rowDicChange('unitNo', $event, row)"></dic-select>
                         <span v-else>{{ row.unitNo }}</span>
                     </template>
+                    <template slot="quantityForm" slot-scope="{row,index}">
+                        <el-input-number style="width: 100%;" v-if="row.$cellEdit" v-model="row.quantity"
+                            :disabled="row.quantityRule == '按箱型'" :controls="false" size="small"></el-input-number>
+                        <span v-else>{{ row.quantity }}</span>
+                    </template>
+                    <template slot="priceForm" slot-scope="{row,index}">
+                        <el-input-number style="width: 100%;" v-if="row.$cellEdit" v-model="row.price"
+                            :disabled="row.quantityRule == '按箱型'" :controls="false" size="small"></el-input-number>
+                        <span v-else>{{ row.price }}</span>
+                    </template>
+                    <template slot="costPriceForm" slot-scope="{row,index}">
+                        <el-input-number style="width: 100%;" v-if="row.$cellEdit" v-model="row.costPrice"
+                            :disabled="row.quantityRule == '按箱型'" :controls="false" size="small"></el-input-number>
+                        <span v-else>{{ row.costPrice }}</span>
+                    </template>
+                    <template slot="curCodeForm" slot-scope="{ row }">
+                        <dic-select v-if="row.$cellEdit" :disabled="row.quantityRule == '按箱型'" v-model="row.curCode"
+                            placeholder="币别" label="dictValue"
+                            url="/blade-system/dict-biz/dictionary?code=currency"></dic-select>
+                        <span v-else>{{ row.curCode }}</span>
+                    </template>
                     <template slot="menu" slot-scope="{ row, index }">
                         <el-button v-if="row.quantityRule == '按箱型'" type="text" size="small"
                             :disabled="basicData.disabled"
@@ -115,12 +136,33 @@
                             url="/blade-system/dict-biz/dictionary?code=number_rule" :filterable="true"></dic-select>
                         <span v-else>{{ row.quantityRule }}</span>
                     </template>
-                    <template slot="unitNoForm" slot-scope="{row,index}">
+                       <template slot="unitNoForm" slot-scope="{row,index}">
                         <dic-select v-if="row.$cellEdit" v-model="row.unitNo" key="id" label="cnName"
-                            url="/blade-los//bunits/listAll" :filterable="true"
+                            url="/blade-los//bunits/listAll" :filterable="true" :disabled="row.quantityRule == '按箱型'"
                             @selectChange="rowDicChange('unitNo', $event, row)"></dic-select>
                         <span v-else>{{ row.unitNo }}</span>
                     </template>
+                    <template slot="quantityForm" slot-scope="{row,index}">
+                        <el-input-number style="width: 100%;" v-if="row.$cellEdit" v-model="row.quantity"
+                            :disabled="row.quantityRule == '按箱型'" :controls="false" size="small"></el-input-number>
+                        <span v-else>{{ row.quantity }}</span>
+                    </template>
+                    <template slot="priceForm" slot-scope="{row,index}">
+                        <el-input-number style="width: 100%;" v-if="row.$cellEdit" v-model="row.price"
+                            :disabled="row.quantityRule == '按箱型'" :controls="false" size="small"></el-input-number>
+                        <span v-else>{{ row.price }}</span>
+                    </template>
+                    <template slot="costPriceForm" slot-scope="{row,index}">
+                        <el-input-number style="width: 100%;" v-if="row.$cellEdit" v-model="row.costPrice"
+                            :disabled="row.quantityRule == '按箱型'" :controls="false" size="small"></el-input-number>
+                        <span v-else>{{ row.costPrice }}</span>
+                    </template>
+                    <template slot="curCodeForm" slot-scope="{ row }">
+                        <dic-select v-if="row.$cellEdit" :disabled="row.quantityRule == '按箱型'" v-model="row.curCode"
+                            placeholder="币别" label="dictValue"
+                            url="/blade-system/dict-biz/dictionary?code=currency"></dic-select>
+                        <span v-else>{{ row.curCode }}</span>
+                    </template>
                     <template slot="menu" slot-scope="{ row, index }">
                         <el-button v-if="row.quantityRule == '按箱型'" type="text" size="small"
                             :disabled="basicData.disabled"
@@ -464,10 +506,13 @@ export default {
                     {
                         label: "数量",
                         prop: "quantity",
-                        width: "120",
+                        width: "80",
                         cell: true,
-                        type: 'number',
-                        controls: false,
+                        slot: true,
+                        formslot: true,
+                        // cell: true,
+                        // type: 'number',
+                        // controls: false,
                         overHidden: true,
                         rules: [{
                             required: true,
@@ -480,8 +525,11 @@ export default {
                         prop: "price",
                         width: "120",
                         cell: true,
-                        type: 'number',
-                        controls: false,
+                        slot: true,
+                        formslot: true,
+                        // cell: true,
+                        // type: 'number',
+                        // controls: false,
                         overHidden: true,
                         rules: [{
                             required: true,
@@ -494,8 +542,11 @@ export default {
                         prop: "costPrice",
                         width: "120",
                         cell: true,
-                        type: 'number',
-                        controls: false,
+                        slot: true,
+                        formslot: true,
+                        // cell: true,
+                        // type: 'number',
+                        // controls: false,
                         overHidden: true,
                         rules: [{
                             required: true,
@@ -504,16 +555,35 @@ export default {
                         }]
                     },
                     {
+                        label: "计量单位",
+                        prop: "unitNo",
+                        width: "120",
+                        overHidden: true,
+                        cell: true,
+                        slot: true,
+                        formslot: true,
+                        rules: [{
+                            required: true,
+                            message: "请选择计量单位",
+                            trigger: "blur"
+                        }]
+                    },
+                    {
                         label: "币别",
                         prop: "curCode",
-                        width: "120",
+                        width: "100",
                         cell: true,
-                        type: "select",
-                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=currency",
-                        props: {
-                            label: "dictValue",
-                            value: "dictKey"
-                        },
+                        slot: true,
+                        formslot: true,
+                        // cell: true,
+                        // type: 'select',
+                        // dicData: [{
+                        //     label: 'CNY',
+                        //     value: 'CNY'
+                        // }, {
+                        //     label: 'USD',
+                        //     value: 'USD'
+                        // }],
                         overHidden: true,
                         rules: [{
                             required: true,

src/views/iosBasicData/losbfeestemplate/feesTemplateItems.vue

@@ -30,8 +30,8 @@
                     </tempalte>
                     <tempalte slot="branchName">
                         <dic-select v-model="form.branchName" placeholder="所属公司" key="id" label="deptName"
-                            url="/blade-system/dept/top-list" :filterable="true"  :multiple="true"
-                            :collapseTags="true" dataType="string" :disabled="basicData.disabled"
+                            url="/blade-system/dept/top-list" :filterable="true" :multiple="true" :collapseTags="true"
+                            dataType="string" :disabled="basicData.disabled"
                             @selectChange="dicChange('branchName', $event)" :multipleStrings="true"></dic-select>
                     </tempalte>
                     <tempalte slot="addressCname">
@@ -87,10 +87,25 @@
                     </template>
                     <template slot="unitNoForm" slot-scope="{row,index}">
                         <dic-select v-if="row.$cellEdit" v-model="row.unitNo" key="id" label="cnName"
-                            url="/blade-los/bunits/listAll" :filterable="true"
+                            url="/blade-los/bunits/listAll" :filterable="true" :disabled="row.quantityRule == '按箱型'"
                             @selectChange="rowDicChange('unitNo', $event, row)"></dic-select>
                         <span v-else>{{ row.unitNo }}</span>
                     </template>
+                    <template slot="quantityForm" slot-scope="{row,index}">
+                        <el-input-number style="width: 100%;" v-if="row.$cellEdit" v-model="row.quantity"
+                            :disabled="row.quantityRule == '按箱型'" :controls="false" size="small"></el-input-number>
+                        <span v-else>{{ row.quantity }}</span>
+                    </template>
+                    <template slot="priceForm" slot-scope="{row,index}">
+                        <el-input-number style="width: 100%;" v-if="row.$cellEdit" v-model="row.price"
+                            :disabled="row.quantityRule == '按箱型'" :controls="false" size="small"></el-input-number>
+                        <span v-else>{{ row.price }}</span>
+                    </template>
+                    <template slot="curCodeForm" slot-scope="{ row }">
+                        <dic-select v-if="row.$cellEdit" :disabled="row.quantityRule == '按箱型'"  v-model="row.curCode" placeholder="币别" label="dictValue"
+                            url="/blade-system/dict-biz/dictionary?code=currency"></dic-select>
+                        <span v-else>{{ row.curCode }}</span>
+                    </template>
                     <template slot="menu" slot-scope="{ row, index }">
                         <!-- <el-button type="text" size="small" :disabled="basicData.disabled"
                             @click="feestemplateCompanyEdit(index, row)">详情</el-button> -->
@@ -192,6 +207,7 @@ export default {
 
     data() {
         return {
+            deptId: JSON.parse(localStorage.getItem('sysitemData')).deptId,
             unitNoListAll: [],
             sonOption: {
                 calcHeight: 30,
@@ -487,8 +503,11 @@ export default {
                         prop: "quantity",
                         width: "80",
                         cell: true,
-                        type: 'number',
-                        controls: false,
+                        slot: true,
+                        formslot: true,
+                        // cell: true,
+                        // type: 'number',
+                        // controls: false,
                         overHidden: true,
                         rules: [{
                             required: true,
@@ -501,8 +520,11 @@ export default {
                         prop: "price",
                         width: "80",
                         cell: true,
-                        type: 'number',
-                        controls: false,
+                        slot: true,
+                        formslot: true,
+                        // cell: true,
+                        // type: 'number',
+                        // controls: false,
                         overHidden: true,
                         rules: [{
                             required: true,
@@ -529,14 +551,17 @@ export default {
                         prop: "curCode",
                         width: "100",
                         cell: true,
-                        type: 'select',
-                        dicData: [{
-                            label: 'CNY',
-                            value: 'CNY'
-                        }, {
-                            label: 'USD',
-                            value: 'USD'
-                        }],
+                        slot: true,
+                        formslot: true,
+                        // cell: true,
+                        // type: 'select',
+                        // dicData: [{
+                        //     label: 'CNY',
+                        //     value: 'CNY'
+                        // }, {
+                        //     label: 'USD',
+                        //     value: 'USD'
+                        // }],
                         overHidden: true,
                         rules: [{
                             required: true,
@@ -839,10 +864,10 @@ export default {
         copyItem(index, row) {
             let item = this.deepClone(row)
             item.id = null;
-            item.pid = null;
-            this.feestemplateForm = item
-            this.feestemplateVisible = true
-            // this.form.feesTemplateItemsList.push(item)
+            // item.pid = null;
+            // this.feestemplateForm = item
+            // this.feestemplateVisible = true
+            this.form.feesTemplateItemsList.push(item)
         },
         getCopyTemplate(id) {
             this.pageLoading = true
@@ -1101,7 +1126,7 @@ export default {
                 price: 1,
                 quantityRule: '按箱型',
                 curCode: 'CNY',
-                unitNo: '箱量',
+                unitNo: '20GP',
                 sonItemsList: [],
                 $cellEdit: true
             })

src/views/iosBasicData/podTemplate/feesTemplateItems.vue

@@ -53,8 +53,8 @@
                     </template>
                     <template slot="corpTypeForm" slot-scope="{row,index}">
                         <dic-select v-if="row.$cellEdit" v-model="row.corpType" label="cnName" res="records"
-                             url="/blade-los/bcorpstypedefine/list?status=0&current=1&size=20"
-                            :filterable="true" :remote="true" dataName="cnName"
+                            url="/blade-los/bcorpstypedefine/list?status=0&current=1&size=20" :filterable="true"
+                            :remote="true" dataName="cnName"
                             @selectChange="rowDicChange('corpType', $event, row)"></dic-select>
                         <span v-else>{{ row.corpType }}</span>
                     </template>
@@ -72,10 +72,31 @@
                     </template>
                     <template slot="unitNoForm" slot-scope="{row,index}">
                         <dic-select v-if="row.$cellEdit" v-model="row.unitNo" key="id" label="cnName"
-                            url="/blade-los//bunits/listAll" :filterable="true"
+                            url="/blade-los/bunits/listAll" :filterable="true" :disabled="row.quantityRule == '按箱型'"
                             @selectChange="rowDicChange('unitNo', $event, row)"></dic-select>
                         <span v-else>{{ row.unitNo }}</span>
                     </template>
+                    <template slot="quantityForm" slot-scope="{row,index}">
+                        <el-input-number style="width: 100%;" v-if="row.$cellEdit" v-model="row.quantity"
+                            :disabled="row.quantityRule == '按箱型'" :controls="false" size="small"></el-input-number>
+                        <span v-else>{{ row.quantity }}</span>
+                    </template>
+                    <template slot="priceForm" slot-scope="{row,index}">
+                        <el-input-number style="width: 100%;" v-if="row.$cellEdit" v-model="row.price"
+                            :disabled="row.quantityRule == '按箱型'" :controls="false" size="small"></el-input-number>
+                        <span v-else>{{ row.price }}</span>
+                    </template>
+                    <template slot="costPriceForm" slot-scope="{row,index}">
+                        <el-input-number style="width: 100%;" v-if="row.$cellEdit" v-model="row.costPrice"
+                            :disabled="row.quantityRule == '按箱型'" :controls="false" size="small"></el-input-number>
+                        <span v-else>{{ row.costPrice }}</span>
+                    </template>
+                    <template slot="curCodeForm" slot-scope="{ row }">
+                        <dic-select v-if="row.$cellEdit" :disabled="row.quantityRule == '按箱型'" v-model="row.curCode"
+                            placeholder="币别" label="dictValue"
+                            url="/blade-system/dict-biz/dictionary?code=currency"></dic-select>
+                        <span v-else>{{ row.curCode }}</span>
+                    </template>
                     <template slot="menu" slot-scope="{ row, index }">
                         <el-button v-if="row.quantityRule == '按箱型'" type="text" size="small"
                             :disabled="basicData.disabled" @click="feestemplateCompanyEdit(index, row)">集装箱</el-button>
@@ -707,10 +728,10 @@ export default {
         copyItem(index, row) {
             let item = this.deepClone(row)
             item.id = null;
-            item.pid = null;
-            this.feestemplateForm = item
-            this.feestemplateVisible = true
-            // this.form.feesTemplateItemsList.push(item)
+            // item.pid = null;
+            // this.feestemplateForm = item
+            // this.feestemplateVisible = true
+            this.form.feesTemplateItemsList.push(item)
         },
         getCopyTemplate(id) {
             this.pageLoading = true

src/views/iosBasicData/polTemplate/feesTemplateItems.vue

@@ -70,12 +70,32 @@
                             url="/blade-system/dict-biz/dictionary?code=number_rule" :filterable="true"></dic-select>
                         <span v-else>{{ row.quantityRule }}</span>
                     </template>
-                    <template slot="unitNoForm" slot-scope="{row,index}">
+                   <template slot="unitNoForm" slot-scope="{row,index}">
                         <dic-select v-if="row.$cellEdit" v-model="row.unitNo" key="id" label="cnName"
-                            url="/blade-los//bunits/listAll" :filterable="true"
+                            url="/blade-los/bunits/listAll" :filterable="true" :disabled="row.quantityRule == '按箱型'"
                             @selectChange="rowDicChange('unitNo', $event, row)"></dic-select>
                         <span v-else>{{ row.unitNo }}</span>
                     </template>
+                    <template slot="quantityForm" slot-scope="{row,index}">
+                        <el-input-number style="width: 100%;" v-if="row.$cellEdit" v-model="row.quantity"
+                            :disabled="row.quantityRule == '按箱型'" :controls="false" size="small"></el-input-number>
+                        <span v-else>{{ row.quantity }}</span>
+                    </template>
+                    <template slot="priceForm" slot-scope="{row,index}">
+                        <el-input-number style="width: 100%;" v-if="row.$cellEdit" v-model="row.price"
+                            :disabled="row.quantityRule == '按箱型'" :controls="false" size="small"></el-input-number>
+                        <span v-else>{{ row.price }}</span>
+                    </template>
+                    <template slot="costPriceForm" slot-scope="{row,index}">
+                        <el-input-number style="width: 100%;" v-if="row.$cellEdit" v-model="row.costPrice"
+                            :disabled="row.quantityRule == '按箱型'" :controls="false" size="small"></el-input-number>
+                        <span v-else>{{ row.costPrice }}</span>
+                    </template>
+                    <template slot="curCodeForm" slot-scope="{ row }">
+                        <dic-select v-if="row.$cellEdit" :disabled="row.quantityRule == '按箱型'"  v-model="row.curCode" placeholder="币别" label="dictValue"
+                            url="/blade-system/dict-biz/dictionary?code=currency"></dic-select>
+                        <span v-else>{{ row.curCode }}</span>
+                    </template>
                     <template slot="menu" slot-scope="{ row, index }">
                         <el-button v-if="row.quantityRule == '按箱型'" type="text" size="small"
                             :disabled="basicData.disabled" @click="feestemplateCompanyEdit(index, row)">集装箱</el-button>
@@ -419,13 +439,16 @@ export default {
                             trigger: "blur"
                         }]
                     },
-                    {
+                       {
                         label: "数量",
                         prop: "quantity",
-                        width: "120",
+                        width: "80",
                         cell: true,
-                        type: 'number',
-                        controls: false,
+                        slot: true,
+                        formslot: true,
+                        // cell: true,
+                        // type: 'number',
+                        // controls: false,
                         overHidden: true,
                         rules: [{
                             required: true,
@@ -438,8 +461,11 @@ export default {
                         prop: "price",
                         width: "120",
                         cell: true,
-                        type: 'number',
-                        controls: false,
+                        slot: true,
+                        formslot: true,
+                        // cell: true,
+                        // type: 'number',
+                        // controls: false,
                         overHidden: true,
                         rules: [{
                             required: true,
@@ -447,13 +473,16 @@ export default {
                             trigger: "blur"
                         }]
                     },
-                    {
+                      {
                         label: "成本价",
                         prop: "costPrice",
                         width: "120",
                         cell: true,
-                        type: 'number',
-                        controls: false,
+                        slot: true,
+                        formslot: true,
+                        // cell: true,
+                        // type: 'number',
+                        // controls: false,
                         overHidden: true,
                         rules: [{
                             required: true,
@@ -462,18 +491,35 @@ export default {
                         }]
                     },
                     {
+                        label: "计量单位",
+                        prop: "unitNo",
+                        width: "120",
+                        overHidden: true,
+                        cell: true,
+                        slot: true,
+                        formslot: true,
+                        rules: [{
+                            required: true,
+                            message: "请选择计量单位",
+                            trigger: "blur"
+                        }]
+                    },
+                    {
                         label: "币别",
                         prop: "curCode",
-                        width: "120",
+                        width: "100",
                         cell: true,
-                        type: 'select',
-                        dicData: [{
-                            label: 'CNY',
-                            value: 'CNY'
-                        }, {
-                            label: 'USD',
-                            value: 'USD'
-                        }],
+                        slot: true,
+                        formslot: true,
+                        // cell: true,
+                        // type: 'select',
+                        // dicData: [{
+                        //     label: 'CNY',
+                        //     value: 'CNY'
+                        // }, {
+                        //     label: 'USD',
+                        //     value: 'USD'
+                        // }],
                         overHidden: true,
                         rules: [{
                             required: true,
@@ -707,10 +753,10 @@ export default {
         copyItem(index, row) {
             let item = this.deepClone(row)
             item.id = null;
-            item.pid = null;
-            this.feestemplateForm = item
-            this.feestemplateVisible = true
-            // this.form.feesTemplateItemsList.push(item)
+            // item.pid = null;
+            // this.feestemplateForm = item
+            // this.feestemplateVisible = true
+            this.form.feesTemplateItemsList.push(item)
         },
         getCopyTemplate(id) {
             this.pageLoading = true

src/views/ow/owPut/detailsPage.vue

@@ -84,8 +84,8 @@
               </tempalte>
               <tempalte slot="podCname">
                 <dic-select v-model="form.podCname" placeholder="港口" label="cnName"
-                  url="/blade-los/bports/listAll?status=0" :filterable="true"  :multiple="true"
-                  :collapseTags="true" dataType="string" @selectChange="dicChange('podCname', $event)"
+                  url="/blade-los/bports/listAll?status=0" :filterable="true" :multiple="true" :collapseTags="true"
+                  dataType="string" @selectChange="dicChange('podCname', $event)"
                   :disabled="editDisabled || form.whetherEnable == '是'" :slotRight="true"
                   rightLabel="code"></dic-select>
               </tempalte>
@@ -249,10 +249,10 @@
                 <span>{{ index + 1 }}</span>
               </template>
               <template slot="billTypeForm" slot-scope="{row,index}">
-                <dic-select v-if="row.$cellEdit && !(row.automaticGenerated==1)"
-                  v-model="row.billType" key="id" label="cnName" res="records"
-                  url="/blade-los/bcorpstypedefine/list?status=0&current=1&size=20" :filterable="true" :remote="true"
-                  dataName="cnName" @selectChange="rowDicChange('billType', $event, row)"></dic-select>
+                <dic-select v-if="row.$cellEdit && !(row.automaticGenerated == 1)" v-model="row.billType" key="id"
+                  label="cnName" res="records" url="/blade-los/bcorpstypedefine/list?status=0&current=1&size=20"
+                  :filterable="true" :remote="true" dataName="cnName"
+                  @selectChange="rowDicChange('billType', $event, row)"></dic-select>
                 <span v-else>{{ row.billType }}</span>
               </template>
               <template slot="cntrNoForm" slot-scope="{row,index}">
@@ -263,9 +263,9 @@
                 <span v-else>{{ row.cntrNo }}</span>
               </template>
               <template slot="corpCnNameForm" slot-scope="{ row,index }">
-                <dic-select v-if="row.$cellEdit && !(row.automaticGenerated==1)"
-                  :key="updateSearchKey" v-model="row.corpCnName" placeholder="付费对象" label="shortName" res="records"
-                  :slotRight="true" rightLabel="code"
+                <dic-select v-if="row.$cellEdit && !(row.automaticGenerated == 1)" :key="updateSearchKey"
+                  v-model="row.corpCnName" placeholder="付费对象" label="shortName" res="records" :slotRight="true"
+                  rightLabel="code"
                   :url="'/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=' + row.billType"
                   :filterable="true" :remote="true" dataName="shortName"
                   @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
@@ -287,9 +287,8 @@
                 <span v-else>{{ row.curCode }}</span>
               </template>
               <template slot="exrateForm" slot-scope="{ row }">
-                <el-input-number v-if="row.$cellEdit && !(row.automaticGenerated==1)"
-                  v-model="row.exrate" :controls="false" placeholder="请输入 汇率" size="small"
-                  style="width: 100%;"></el-input-number>
+                <el-input-number v-if="row.$cellEdit && !(row.automaticGenerated == 1)" v-model="row.exrate"
+                  :controls="false" placeholder="请输入 汇率" size="small" style="width: 100%;"></el-input-number>
                 <span v-else>{{ row.exrate }}</span>
               </template>
               <template slot="unitNoForm" slot-scope="{row,index}">
@@ -300,20 +299,20 @@
                 <span v-else>{{ row.unitNo }}</span>
               </template>
               <template slot="priceForm" slot-scope="{ row }">
-                <el-input-number v-if="row.$cellEdit && !(row.automaticGenerated==1)"
-                  v-model="row.price" :controls="false" placeholder="请输入 成本价" size="small" style="width: 100%;"
-                  :precision="2" @change="countChange(row)"></el-input-number>
+                <el-input-number v-if="row.$cellEdit && !(row.automaticGenerated == 1)" v-model="row.price"
+                  :controls="false" placeholder="请输入 成本价" size="small" style="width: 100%;" :precision="2"
+                  @change="countChange(row)"></el-input-number>
                 <span v-else>{{ row.price }}</span>
               </template>
               <template slot="quantityForm" slot-scope="{ row }">
-                <el-input-number v-if="row.$cellEdit && !(row.automaticGenerated==1)"
-                  v-model="row.quantity" :controls="false" placeholder="请输入 成本价" size="small" style="width: 100%;"
-                  :precision="0" @change="countChange(row)"></el-input-number>
+                <el-input-number v-if="row.$cellEdit && !(row.automaticGenerated == 1)" v-model="row.quantity"
+                  :controls="false" placeholder="请输入 成本价" size="small" style="width: 100%;" :precision="0"
+                  @change="countChange(row)"></el-input-number>
                 <span v-else>{{ row.quantity }}</span>
               </template>
               <template slot="remarks" slot-scope="{ row }">
-                <el-input v-if="row.$cellEdit && !(row.automaticGenerated==1)"
-                  v-model="row.remarks" placeholder="请输入 备注" size="small" style="width: 100%;"></el-input>
+                <el-input v-if="row.$cellEdit && !(row.automaticGenerated == 1)" v-model="row.remarks"
+                  placeholder="请输入 备注" size="small" style="width: 100%;"></el-input>
                 <span v-else>{{ row.remarks }}</span>
               </template>
             </avue-crud>
@@ -350,10 +349,10 @@
                 <span>{{ index + 1 }}</span>
               </template>
               <template slot="billTypeForm" slot-scope="{row,index}">
-                <dic-select v-if="row.$cellEdit && !(row.automaticGenerated==1)"
-                  v-model="row.billType" key="id" label="cnName" res="records"
-                  url="/blade-los/bcorpstypedefine/list?status=0&current=1&size=20" :filterable="true" :remote="true"
-                  dataName="cnName" @selectChange="rowDicChange('billType', $event, row, index)"></dic-select>
+                <dic-select v-if="row.$cellEdit && !(row.automaticGenerated == 1)" v-model="row.billType" key="id"
+                  label="cnName" res="records" url="/blade-los/bcorpstypedefine/list?status=0&current=1&size=20"
+                  :filterable="true" :remote="true" dataName="cnName"
+                  @selectChange="rowDicChange('billType', $event, row, index)"></dic-select>
                 <span v-else>{{ row.billType }}</span>
               </template>
               <template slot="cntrNoForm" slot-scope="{row,index}">
@@ -364,9 +363,9 @@
                 <span v-else>{{ row.cntrNo }}</span>
               </template>
               <template slot="corpCnNameForm" slot-scope="{ row,index }">
-                <dic-select v-if="row.$cellEdit && !(row.automaticGenerated==1)"
-                  :key="updateSearchKey" v-model="row.corpCnName" placeholder="付费对象" label="shortName" res="records"
-                  :slotRight="true" rightLabel="code"
+                <dic-select v-if="row.$cellEdit && !(row.automaticGenerated == 1)" :key="updateSearchKey"
+                  v-model="row.corpCnName" placeholder="付费对象" label="shortName" res="records" :slotRight="true"
+                  rightLabel="code"
                   :url="'/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=' + row.billType"
                   :filterable="true" :remote="true" dataName="shortName"
                   @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
@@ -388,9 +387,8 @@
                 <span v-else>{{ row.curCode }}</span>
               </template>
               <template slot="exrateForm" slot-scope="{ row }">
-                <el-input-number v-if="row.$cellEdit && !(row.automaticGenerated==1)"
-                  v-model="row.exrate" :controls="false" placeholder="请输入 汇率" size="small"
-                  style="width: 100%;"></el-input-number>
+                <el-input-number v-if="row.$cellEdit && !(row.automaticGenerated == 1)" v-model="row.exrate"
+                  :controls="false" placeholder="请输入 汇率" size="small" style="width: 100%;"></el-input-number>
                 <span v-else>{{ row.exrate }}</span>
               </template>
               <template slot="unitNoForm" slot-scope="{row,index}">
@@ -401,20 +399,20 @@
                 <span v-else>{{ row.unitNo }}</span>
               </template>
               <template slot="priceForm" slot-scope="{ row }">
-                <el-input-number v-if="row.$cellEdit && !(row.automaticGenerated==1)"
-                  v-model="row.price" :controls="false" placeholder="请输入 成本价" size="small" style="width: 100%;"
-                  :precision="2" @change="countChange(row)"></el-input-number>
+                <el-input-number v-if="row.$cellEdit && !(row.automaticGenerated == 1)" v-model="row.price"
+                  :controls="false" placeholder="请输入 成本价" size="small" style="width: 100%;" :precision="2"
+                  @change="countChange(row)"></el-input-number>
                 <span v-else>{{ row.price }}</span>
               </template>
               <template slot="quantityForm" slot-scope="{ row }">
-                <el-input-number v-if="row.$cellEdit && !(row.automaticGenerated==1)"
-                  v-model="row.quantity" :controls="false" placeholder="请输入 成本价" size="small" style="width: 100%;"
-                  :precision="0" @change="countChange(row)"></el-input-number>
+                <el-input-number v-if="row.$cellEdit && !(row.automaticGenerated == 1)" v-model="row.quantity"
+                  :controls="false" placeholder="请输入 成本价" size="small" style="width: 100%;" :precision="0"
+                  @change="countChange(row)"></el-input-number>
                 <span v-else>{{ row.quantity }}</span>
               </template>
               <template slot="remarks" slot-scope="{ row }">
-                <el-input v-if="row.$cellEdit && !(row.automaticGenerated==1)"
-                  v-model="row.remarks" placeholder="请输入 备注" size="small" style="width: 100%;"></el-input>
+                <el-input v-if="row.$cellEdit && !(row.automaticGenerated == 1)" v-model="row.remarks"
+                  placeholder="请输入 备注" size="small" style="width: 100%;"></el-input>
                 <span v-else>{{ row.remarks }}</span>
               </template>
             </avue-crud>
@@ -2430,6 +2428,12 @@ export default {
     },
     rtSubmit() {
       for (let row of this.form.rentTermList) {
+        if (Number(row.riseDays) == 0) {
+          return this.$message.error("起必须大于0");
+        }
+        if (Number(row.stopDays) == 0) {
+          return this.$message.error("止必须大于0");
+        }
         if (!row.curCode) {
           return this.$message.error("请完善币别");
         }
@@ -2722,7 +2726,7 @@ export default {
       }
       if (name == 'D费用批量删除') {
         for (let row of this.selectionfeedList) {
-          if (row.automaticGenerated==1) {
+          if (row.automaticGenerated == 1) {
             return this.$message.error("系统自动生成的费用不允许删除");
           }
           if (row.stlPid && row.accStatus != 0) {
@@ -2802,7 +2806,7 @@ export default {
       }
       if (name == 'C费用批量删除') {
         for (let row of this.selectionfeecList) {
-          if (row.automaticGenerated==1) {
+          if (row.automaticGenerated == 1) {
             return this.$message.error("系统自动生成的费用不允许删除");
           }
           if (row.stlPid && row.accStatus != 0) {

src/views/wel/index.vue

@@ -91,11 +91,17 @@ export default {
             this.billType = res.data.data.billType;
             localStorage.setItem('sysitemType', this.billType)
             localStorage.setItem('sysitemData', JSON.stringify(res.data.data))
+            getLazyList().then(res => {
+                res.data.data.forEach(row => {
+                    if (row.id == JSON.parse(localStorage.getItem('sysitemData')).deptId) {
+                        localStorage.setItem('user-Information', row ? JSON.stringify(row) : null)
+                    }
+                })
+
+            })
             this.$router.$avueRouter.setTitle('首页');
         });
-        getLazyList().then(res => {
-            localStorage.setItem('user-Information', res.data.data.length ? JSON.stringify(res.data.data[0]) : null)
-        })
+
         if (!localStorage.getItem('areaTypeTree')) {
             areaTypeTree().then(res => {
                 localStorage.setItem('areaTypeTree', JSON.stringify(res.data.data));