1.超期费标准 画页面 联调接口

2.航线成本SOC COC 列表页调整顺序 新加字段
3.航线成本SOC COC 箱利润里面销售价，允许录入0
4.航线成本SOC COC 起运港和目的港，加一个反转键
5.财务把币别传值type1改为type2

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -1271,7 +1271,7 @@ export default {
         // 获取币别数据
         // 获取币别数据
         async getRateListfun(cnName) {
-            await this.checkRate()
+            await this.checkRate(null,null,null,2)
             this.curCodeData = this.getCheckRate()
             // getRateList({ current: 1, size: 10, cnName }).then(res => {
             //     this.curCodeData = res.data.data.records

src/views/iosBasicData/PaymentApplication/assembly/finstlbillsitems.vue

@@ -14,7 +14,7 @@
             <el-table-column prop="lineNo" label="行号" width="50px">
                 <template slot-scope="scope">{{ Number(scope.$index) + 1 }}</template>
             </el-table-column>
-             <el-table-column prop="branchName" label="所属公司" width="80px">
+            <el-table-column prop="branchName" label="所属公司" width="80px">
             </el-table-column>
             <el-table-column prop="isCleared" label="核销" width="70px">
                 <template slot-scope="{ row }">
@@ -72,8 +72,9 @@
             <el-table-column prop="currentStlAmountUSD" label="本次外币" width="100px">
                 <template slot-scope="scope">
                     <el-input style="width: 100%;" v-model="scope.row.currentStlAmountUSD"
-                        :disabled="scope.row.curCode == getLocalCurrency() || settlementdistar" v-if="(brfalse && !editSave)"
-                        size="mini" autocomplete="off" clearable placeholder="请输入USD" @change="ausdChange(scope.row)">
+                        :disabled="scope.row.curCode == getLocalCurrency() || settlementdistar"
+                        v-if="(brfalse && !editSave)" size="mini" autocomplete="off" clearable placeholder="请输入USD"
+                        @change="ausdChange(scope.row)">
                     </el-input>
                     <span v-else>{{ scope.row.currentStlAmountUSD }}</span>
                 </template>
@@ -364,9 +365,9 @@ export default {
             })
         },
         // 获取币别数据
-               // 获取币别数据
+        // 获取币别数据
         async getRateListfun(cnName) {
-            await this.checkRate()
+            await this.checkRate(null, null, null, 2)
             this.curCodeData = this.getCheckRate()
             // getRateList({ current: 1, size: 10, cnName }).then(res => {
             //     this.curCodeData = res.data.data.records

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -1177,7 +1177,7 @@ export default {
         // 获取币别数据
         // 获取币别数据
         async getRateListfun(cnName) {
-            await this.checkRate()
+            await this.checkRate(null, null, null, 2)
             this.curCodeData = this.getCheckRate()
             // getRateList({ current: 1, size: 10, cnName }).then(res => {
             //     this.curCodeData = res.data.data.records

src/views/iosBasicData/costcenter/coc/detailsPage.vue

@@ -1512,7 +1512,7 @@ export default {
                     return this.$message.error("请添加数据");
                 }
                 for (let row of this.form.costItemList) {
-                    if (!row.boxType || !row.curCode || !row.salesPrice) {
+                    if (!row.boxType || !row.curCode || row.salesPrice==null) {
                         this.$refs.crud.rowCell(row, row.$index)
                         return this.$message.error("请完善明细信息");
                     }
@@ -1822,7 +1822,7 @@ export default {
                 done();
                 if (valid) {
                     for (let row of this.form.costItemList) {
-                        if (!row.boxType || !row.curCode || !row.salesPrice) {
+                        if (!row.boxType || !row.curCode || row.salesPrice==null) {
                             this.$refs.crud.rowCell(row, row.$index)
                             return this.$message.error("请完善明细信息");
                         }

src/views/iosBasicData/costcenter/coc/index.vue

@@ -22,6 +22,8 @@
                     </el-button>
                     <el-button type="warning" size="small" @click="outExport">导 出
                     </el-button>
+                    <el-button type="danger" size="small" @click="swap">反 转
+                    </el-button>
                 </template>
                 <template slot="menu" slot-scope="{ row, index }">
                     <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
@@ -113,7 +115,7 @@ export default {
                     {
                         label: "起运港",
                         prop: "podCname",
-                        width: "100",
+                        width: "80",
                         overHidden: true,
                         search: true,
                         searchOrder: 1,
@@ -131,7 +133,7 @@ export default {
                     {
                         label: "目的港",
                         prop: "destinationCname",
-                        width: "100",
+                        width: "80",
                         overHidden: true,
                         search: true,
                         searchOrder: 2,
@@ -147,21 +149,9 @@ export default {
                         },
                     },
                      {
-                        label: "利润20GP",
-                        prop: "profit20",
-                        width: "100",
-                        overHidden: true,
-                    },
-                    {
-                        label: "利润40GP",
-                        prop: "profit40",
-                        width: "100",
-                        overHidden: true,
-                    },
-                    {
                         label: "船公司",
                         prop: "shippingCompanyCname",
-                        width: "100",
+                        width: "80",
                         overHidden: true,
                         search: true,
                         searchOrder: 4,
@@ -177,46 +167,33 @@ export default {
                         },
                     },
                     {
-                        label: "船名",
-                        prop: "shipCname",
+                        label: "利润20GP",
+                        prop: "profit20",
                         width: "80",
                         overHidden: true,
-                        search: true,
-                        searchOrder: 5,
-                        type: 'select',
-                        filterable: true,
-                        remote: true,
-                        dicUrl: "/api/blade-los/bvessels/list?cnName={{key}}",
-                        props: {
-                            label: 'cnName',
-                            value: 'cnName',
-                            res: 'data.records'
-                        },
                     },
                     {
-                        label: "航次",
-                        prop: "voyage",
+                        label: "利润40GP",
+                        prop: "profit40",
                         width: "80",
                         overHidden: true,
-                        search: true,
-                        searchOrder: 6,
                     },
                     {
-                        label: "航线天数",
-                        prop: "navigateDay",
-                        width: "100",
+                        label: "运输条款",
+                        prop: "transportationTerms",
+                        width: "80",
                         overHidden: true,
                     },
                     {
-                        label: "班次",
-                        prop: "classes",
+                        label: "中转港",
+                        prop: "transitPortCname",
                         width: "80",
                         overHidden: true,
                     },
                     {
                         label: "有效期起",
                         prop: "effectiveStartDate",
-                        width: "120",
+                        width: "100",
                         overHidden: true,
                         search: true,
                         searchOrder: 7,
@@ -228,7 +205,7 @@ export default {
                     {
                         label: "有效期止",
                         prop: "effectiveEndDate",
-                        width: "120",
+                        width: "100",
                         overHidden: true,
                         search: true,
                         searchOrder: 8,
@@ -237,6 +214,37 @@ export default {
                         valueFormat: "yyyy-MM-dd 23:59:59",
                     },
                     {
+                        label: "船名",
+                        prop: "shipCname",
+                        width: "80",
+                        overHidden: true,
+                        search: true,
+                        searchOrder: 5,
+                        type: 'select',
+                        filterable: true,
+                        remote: true,
+                        dicUrl: "/api/blade-los/bvessels/list?cnName={{key}}",
+                        props: {
+                            label: 'cnName',
+                            value: 'cnName',
+                            res: 'data.records'
+                        },
+                    },
+                    {
+                        label: "航次",
+                        prop: "voyage",
+                        width: "80",
+                        overHidden: true,
+                        search: true,
+                        searchOrder: 6,
+                    },
+                    {
+                        label: "航行天数",
+                        prop: "navigateDay",
+                        width: "80",
+                        overHidden: true,
+                    },
+                    {
                         label: "航线",
                         prop: "airlineCname",
                         width: "80",
@@ -320,6 +328,11 @@ export default {
         }, 100);
     },
     methods: {
+            swap() {
+            let obj = this.deepClone(this.query)
+            this.query.podCname = obj.destinationCname
+            this.query.destinationCname = obj.podCname
+        },
         addButton() {
             this.isShow = false
         },

src/views/iosBasicData/costcenter/soc/detailsPage.vue

@@ -205,7 +205,7 @@
                                 <span v-else>{{ row.exrate }}</span>
                             </template>
                             <template slot="salesPriceForm" slot-scope="{ row }">
-                                <el-input-number v-if="row.$cellEdit" v-model="row.salesPrice"
+                                <el-input-number v-if="row.$cellEdit" v-model="row.salesPrice" 
                                     @change="countChange(row)" :controls="false" placeholder="请输入 销售价" size="small"
                                     style="width: 100%;"></el-input-number>
                                 <span v-else>{{ row.salesPrice }}</span>
@@ -2488,7 +2488,7 @@ export default {
                     return this.$message.error("请添加数据");
                 }
                 for (let row of this.form.costItemList) {
-                    if (!row.boxType || !row.curCode || !(row.salesPrice || row.salesPriceTwo)) {
+                    if (!row.boxType || !row.curCode || (row.salesPrice==null || row.salesPriceTwo==null)) {
                         this.$refs.crud.rowCell(row, row.$index)
                         this.$refs.crud4.rowCell(row, row.$index)
                         return this.$message.error("请完善明细信息");
@@ -3153,7 +3153,7 @@ export default {
                 done();
                 if (valid) {
                     for (let row of this.form.costItemList) {
-                        if (!row.boxType || !row.curCode || !(row.salesPrice || row.salesPriceTwo)) {
+                        if (!row.boxType || !row.curCode || (row.salesPrice==null || row.salesPriceTwo==null)) {
                             this.$refs.crud.rowCell(row, row.$index)
                             this.$refs.crud4.rowCell(row, row.$index)
                             return this.$message.error("请完善明细信息");

src/views/iosBasicData/costcenter/soc/index.vue

@@ -22,6 +22,9 @@
                     </el-button>
                     <el-button type="warning" size="small" @click="outExport">导 出
                     </el-button>
+                    <el-button type="danger" size="small" @click="swap">反 转
+                    </el-button>
+
                 </template>
                 <template slot="menu" slot-scope="{ row, index }">
                     <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
@@ -114,7 +117,7 @@ export default {
                     {
                         label: "起运港",
                         prop: "podCname",
-                        width: "100",
+                        width: "80",
                         overHidden: true,
                         search: true,
                         searchOrder: 1,
@@ -132,7 +135,7 @@ export default {
                     {
                         label: "目的港",
                         prop: "destinationCname",
-                        width: "100",
+                        width: "80",
                         overHidden: true,
                         search: true,
                         searchOrder: 2,
@@ -148,46 +151,88 @@ export default {
                         },
                     },
                     {
+                        label: "承运人",
+                        prop: "shippingCompanyCname",
+                        width: "80",
+                        overHidden: true,
+                        search: true,
+                        searchOrder: 4,
+                        type: 'select',
+                        filterable: true,
+                        remote: true,
+                        dicUrl: "/api/blade-los/bcorps/list?current=1&size=5&corpTypeName=船公司&cnName={{key}}",
+                        props: {
+                            label: 'shortName',
+                            value: 'shortName',
+                            desc: 'code',
+                            res: 'data.records'
+                        },
+                    },
+                    {
                         label: "20利润",
                         prop: "profit20",
-                        width: "100",
+                        width: "70",
                         overHidden: true,
                     },
                     {
                         label: "40利润",
                         prop: "profit40",
-                        width: "100",
+                        width: "70",
                         overHidden: true,
                     },
                     {
                         label: "40HC利润",
                         prop: "profitHc",
-                        width: "100",
+                        width: "80",
                         overHidden: true,
                     },
                     {
                         label: "其他利润",
                         prop: "otherProfit",
+                        width: "70",
+                        overHidden: true,
+                    },
+                    {
+                        label: "运输条款",
+                        prop: "transportationTerms",
+                        width: "80",
+                        overHidden: true,
+                    },
+                    {
+                        label: "中转港",
+                        prop: "transitPortCname",
+                        width: "80",
+                        overHidden: true,
+                    },
+                    {
+                        label: "转船类型",
+                        prop: "changeShipType",
+                        width: "80",
+                        overHidden: true,
+                    },
+
+                    {
+                        label: "有效期起",
+                        prop: "effectiveStartDate",
                         width: "100",
                         overHidden: true,
+                        search: true,
+                        searchOrder: 7,
+                        type: "date",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd 00:00:00",
+                        searchValue: dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00",
                     },
                     {
-                        label: "承运人",
-                        prop: "shippingCompanyCname",
+                        label: "有效期止",
+                        prop: "effectiveEndDate",
                         width: "100",
                         overHidden: true,
                         search: true,
-                        searchOrder: 4,
-                        type: 'select',
-                        filterable: true,
-                        remote: true,
-                        dicUrl: "/api/blade-los/bcorps/list?current=1&size=5&corpTypeName=船公司&cnName={{key}}",
-                        props: {
-                            label: 'shortName',
-                            value: 'shortName',
-                            desc: 'code',
-                            res: 'data.records'
-                        },
+                        searchOrder: 8,
+                        type: "date",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd 23:59:59",
                     },
                     {
                         label: "船名",
@@ -216,41 +261,12 @@ export default {
                         searchOrder: 6,
                     },
                     {
-                        label: "航线天数",
+                        label: "航行天数",
                         prop: "navigateDay",
-                        width: "100",
-                        overHidden: true,
-                    },
-                    {
-                        label: "班次",
-                        prop: "classes",
                         width: "80",
                         overHidden: true,
                     },
                     {
-                        label: "有效期起",
-                        prop: "effectiveStartDate",
-                        width: "120",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 7,
-                        type: "date",
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd 00:00:00",
-                        searchValue: dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00",
-                    },
-                    {
-                        label: "有效期止",
-                        prop: "effectiveEndDate",
-                        width: "120",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 8,
-                        type: "date",
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd 23:59:59",
-                    },
-                    {
                         label: "航线",
                         prop: "airlineCname",
                         width: "80",
@@ -334,6 +350,11 @@ export default {
         }, 100);
     },
     methods: {
+        swap() {
+            let obj = this.deepClone(this.query)
+            this.query.podCname = obj.destinationCname
+            this.query.destinationCname = obj.podCname
+        },
         addButton() {
             this.isShow = false
             this.detailData = {

src/views/iosBasicData/fininvoices/fininvoicesDetails.vue

@@ -1341,7 +1341,7 @@ export default {
         },
         // 获取发票币别数据
         async invCurCodeRateListfun(cnName) {
-            await this.checkRate()
+              await this.checkRate(null,null,null,2)
             this.invCurCodeData = this.getCheckRate()
             // getRateList({ current: 1, size: 20, cnName }).then(res => {
             //     this.invCurCodeData = res.data.data.records

src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -1495,7 +1495,7 @@ export default {
         },
         // 获取发票币别数据
         async invCurCodeRateListfun(cnName) {
-            await this.checkRate()
+             await this.checkRate(null,null,null,2)
             this.invCurCodeData = this.getCheckRate()
             // getRateList({ current: 1, size: 20, cnName }).then(res => {
             //     this.invCurCodeData = res.data.data.records

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -1467,7 +1467,7 @@ export default {
         },
         // 获取发票币别数据
         async invCurCodeRateListfun(cnName) {
-            await this.checkRate()
+              await this.checkRate(null,null,null,2)
             this.invCurCodeData = this.getCheckRate()
         },
         // 目的地

src/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue

@@ -385,7 +385,7 @@ export default {
         },
         // 获取币别数据
         async getRateListfun(cnName) {
-            await this.checkRate()
+                 await this.checkRate(null,null,null,2)
             this.curCodeData = this.getCheckRate()
         },
 

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -1331,7 +1331,7 @@ export default {
         },
         // 获取币别数据
         async getRateListfun(cnName) {
-            await this.checkRate()
+                await this.checkRate(null,null,null,2)
             this.curCodeData = this.getCheckRate()
             // getRateList({ current: 1, size: 10, cnName }).then(res => {
             //     this.curCodeData = res.data.data.records

src/views/iosBasicData/overdueFee/detailsPage.vue

@@ -8,7 +8,7 @@
       </div>
       <div class="add-customer-btn">
         <el-button class="el-button--small-yh" style="margin-left: 6px;" type="primary" size="small" v-if="editButton"
-          :disabled="showLock || !(roleName.indexOf('admin') != -1 || roleName.indexOf('允许修改他人业务') != -1 || saberUserInfo.user_id == form.createUser)"
+          :disabled="!(roleName.indexOf('admin') != -1 || roleName.indexOf('允许修改他人业务') != -1 || saberUserInfo.user_id == form.createUser)"
           @click="inEdit">编 辑
         </el-button>
         <el-button class="el-button--small-yh" v-else style="margin-left: 6px;" type="primary" size="small"
@@ -40,31 +40,11 @@
           <template slot="index" slot-scope="{row,index}">
             <span>{{ index + 1 }}</span>
           </template>
-          <template slot="boxTypeForm" slot-scope="{ row }">
-            <dic-select v-if="row.$cellEdit" v-model="row.boxType" key="id" label="cnName" res="records"
-              url="/blade-los/bcntrtypes/list?status=0&current=1&size=20" :filterable="true" :remote="true"
-              dataName="cnName" @selectChange="rowDicChange('boxType', $event, row)"></dic-select>
-            <span v-else>{{ row.boxType }}</span>
-          </template>
-          <template slot="oceanFreightForm" slot-scope="{ row }">
-            <el-input-number v-if="row.$cellEdit" v-model="row.oceanFreight" :controls="false" placeholder="请输入 海运费"
-              size="small" style="width: 100%;" :precision="2" @change="countChange(row)"></el-input-number>
-            <span v-else>{{ row.oceanFreight }}</span>
-          </template>
-          <template slot="inlandFreightForm" slot-scope="{ row }">
-            <el-input-number v-if="row.$cellEdit" v-model="row.inlandFreight" :controls="false" placeholder="请输入 陆运费"
-              size="small" style="width: 100%;" :precision="2" @change="countChange(row)"></el-input-number>
-            <span v-else>{{ row.inlandFreight }}</span>
-          </template>
-          <template slot="loloForm" slot-scope="{ row }">
-            <el-input-number v-if="row.$cellEdit" v-model="row.lolo" :controls="false" placeholder="请输入 LOLO"
-              size="small" style="width: 100%;" :precision="2" @change="countChange(row)"></el-input-number>
-            <span v-else>{{ row.lolo }}</span>
-          </template>
-          <template slot="otherAmountForm" slot-scope="{ row }">
-            <el-input-number v-if="row.$cellEdit" v-model="row.otherAmount" :controls="false" placeholder="请输入 其他金额"
-              size="small" style="width: 100%;" :precision="2" @change="countChange(row)"></el-input-number>
-            <span v-else>{{ row.otherAmount }}</span>
+          <template slot="menu" slot-scope="{ row, index }">
+            <el-button size="small" :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'" type="text"
+              :disabled="editDisabled" @click="rowCell(row, index)">{{ row.$cellEdit ? '保 存' : '编 辑' }}</el-button>
+            <el-button size="small" icon="el-icon-delete" type="text" :disabled="editDisabled"
+              @click="rowDel(row, index)">删 除</el-button>
           </template>
         </avue-crud>
       </trade-card>
@@ -80,13 +60,15 @@
 import {
   detail,
   submit,
-  itemRevoke,
+  itemRemove,
 } from "@/api/iosBasicData/overdueFee.js";
 import dicSelect from "@/components/dicSelect/main";
 export default {
   name: "detailsPage",
   data() {
     return {
+      editButton: false,
+      editDisabled: false,
       form: {
         status: 0,
         storageFeesItemsList: [],
@@ -132,19 +114,6 @@ export default {
             }],
           },
           {
-            label: "状态",
-            prop: "status",
-            disabled: false,
-            type: 'select',
-            dicData: [{
-              label: '启用',
-              value: 0
-            }, {
-              label: '停用',
-              value: 1
-            }],
-          },
-          {
             label: '备注',
             prop: 'remarks',
             type: 'textarea',
@@ -184,7 +153,7 @@ export default {
       optionBack: {
         // height: 'auto',
         calcHeight: 30,
-        menuWidth: 60,
+        menuWidth: 120,
         searchMenuSpan: 18,
         tip: false,
         border: true,
@@ -195,7 +164,7 @@ export default {
         refreshBtn: false,
         selection: true,
         align: 'center',
-        menu: false,
+        menu: true,
         column: [
           {
             label: "index",
@@ -214,6 +183,13 @@ export default {
             cell: true,
             type: 'number',
             controls: false,
+            rules: [
+              {
+                required: true,
+                message: '请输入起始天数',
+                trigger: 'blur'
+              }
+            ]
           },
           {
             label: '结束天数',
@@ -221,6 +197,13 @@ export default {
             cell: true,
             type: 'number',
             controls: false,
+            rules: [
+              {
+                required: true,
+                message: '请输入结束天数',
+                trigger: 'blur'
+              }
+            ]
           },
           {
             label: '币别',
@@ -245,11 +228,6 @@ export default {
             type: 'number',
             controls: false,
             overHidden: true,
-            rules: [{
-              required: true,
-              message: "请输入20GP",
-              trigger: "blur"
-            }]
           },
           {
             label: '40GP',
@@ -258,11 +236,6 @@ export default {
             type: 'number',
             controls: false,
             overHidden: true,
-            rules: [{
-              required: true,
-              message: "请输入40GP",
-              trigger: "blur"
-            }]
           },
           {
             label: '40HC',
@@ -271,11 +244,6 @@ export default {
             type: 'number',
             controls: false,
             overHidden: true,
-            rules: [{
-              required: true,
-              message: "请输入40HC",
-              trigger: "blur"
-            }]
           },
           {
             label: "制单人",
@@ -330,8 +298,35 @@ export default {
     }
   },
   methods: {
-    dicChange(name, row) {
+    rowCell(row, index) {
+      if (!row.startDay || !row.endDay || !row.curCode) {
+        this.$refs.crud.rowCell(row, index)
+        return this.$message.error("请完善明细信息");
+      }
+      if (row.$cellEdit == true) {
+        this.$set(row, "$cellEdit", false);
+      } else {
+        this.$set(row, "$cellEdit", true);
+      }
+    },
+    rowDel(row, index) {
+      this.$confirm("确定删除数据?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        if (row.id) {
+          itemRemove({ ids: row.id }).then(res => {
+            this.form.storageFeesItemsList.splice(index, 1);
+            this.$message.success("成功删除");
+          })
+        } else {
+          this.form.storageFeesItemsList.splice(index, 1);
+        }
 
+      });
+    },
+    dicChange(name, row) {
       if (name == 'branchName') {
         if (row) {
           this.form.branchId = row.id
@@ -341,18 +336,6 @@ export default {
         }
       }
     },
-    rowDicChange(name, row, el, index) {
-      if (name == 'boxType') {
-        if (row) {
-          el.boxTypeId = row.id
-        } else {
-          el.boxTypeId = null
-          el.boxType = null
-        }
-
-      }
-
-    },
     rowEdit(row) {
       if (row.$cellEdit == true) {
         this.$set(row, "$cellEdit", false);
@@ -360,21 +343,16 @@ export default {
         this.$set(row, "$cellEdit", true);
       }
     },
-    rowItemEdit(row) {
-      if (row.$cellEdit == true) {
-        this.$set(row, "$cellEdit", false);
-      } else {
-        this.$set(row, "$cellEdit", true);
-      }
-    },
     addRow() {
       if (!this.form.id) {
         return this.$message.error("请保存数据");
       }
-
       this.$refs.crud.dicInit();
       this.form.storageFeesItemsList.push({
         pid: this.form.id,
+        price20gp: 0,
+        price40gp: 0,
+        price40hc: 0,
         $cellEdit: true
       })
     },
@@ -396,19 +374,17 @@ export default {
     },
     inEdit() {
       this.editButton = false
-      if (this.form.status == '录入') {
-        this.editDisabled = false
-        this.optionForm.disabled = false
-      }
+      this.editDisabled = false
+      this.optionForm.disabled = false
     },
     submit(type) {
       this.$refs["form"].validate((valid, done) => {
         done();
         if (valid) {
           for (let row of this.form.storageFeesItemsList) {
-            if (!row.boxType || !row.curCode || !row.oceanFreight || !row.inlandFreight || !row.lolo) {
+            if (!row.startDay || !row.endDay || !row.curCode) {
               this.$refs.crud.rowCell(row, row.$index)
-              return this.$message.error("请完善箱明细信息");
+              return this.$message.error("请完善基础明细信息");
             }
           }
           const loading = this.$loading({
@@ -423,7 +399,6 @@ export default {
           }).finally(() => {
             loading.close();
           })
-
         } else {
           return false;
         }

src/views/wel/components/losAssembly/losrealtime.vue

@@ -34,7 +34,7 @@
                   </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num" style="color: #F56C6C;">{{ remind.arrivalReminder }}</span>
+                  <span class="card-content-num" style="color: #F56C6C;"></span>
                   <span class="card-content-text">开船提醒</span>
                 </div>
               </div>
@@ -62,7 +62,7 @@
                   </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num" style="color: #F56C6C;">{{ remind.arrivalReminder }}</span>
+                  <span class="card-content-num" style="color: #F56C6C;"></span>
                   <span class="card-content-text">截港提醒</span>
                 </div>
               </div>
@@ -76,7 +76,7 @@
                   </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num" style="color: #F56C6C;">{{ remind.arrivalReminder }}</span>
+                  <span class="card-content-num" style="color: #F56C6C;"></span>
                   <span class="card-content-text">截单提醒</span>
                 </div>
               </div>
@@ -90,7 +90,7 @@
                   </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num" style="color: #F56C6C;">{{ remind.arrivalReminder }}</span>
+                  <span class="card-content-num" style="color: #F56C6C;"></span>
                   <span class="card-content-text">开船未付</span>
                 </div>
               </div>

vue.config.js

@@ -49,7 +49,7 @@ module.exports = {
     proxy: {
       '/api': {
         //本地服务接口地址
-        // target: 'http://192.168.3.64:1080',
+        // target: 'http://192.168.168.73:1080',
         // target: 'http://192.168.8.104:1080',
         // target: 'http://127.0.0.1:1080',
         // 打包地址