修改OW撤销导入 修改客户订舱 托书的删除限制规则

src/api/boxManagement/buyContainer/index.js

@@ -310,10 +310,10 @@ export function revokeMergeGenerateCost(data) {
   })
 }
 //撤销费用
-export function revokePickUpCost(data) {
+export function revokePickUpCost(params) {
   return request({
-    url: '/api /blade-los/tradingBox/revokePickUpCost',
-    method: 'post',
-    data: data
+    url: '/api/blade-los/tradingBox/revokePickUpCost',
+    method: 'get',
+    params: params
   })
 }

src/views/iosBasicData/businessCenter/customerBooking/index.vue

@@ -31,7 +31,7 @@
                 <template slot="menu" slot-scope="{ row, index }">
                     <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
                     <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
-                        :disabled="!(row.issueStatus == 0 || row.issueStatus == 6)">删
+                        :disabled="!(row.issueStatus == 0 || row.issueStatus == 6||row.billStatus==1)">删
                         除</el-button>
                 </template>
                 <template slot="whetherModify" slot-scope="{ row }">
@@ -96,21 +96,7 @@ export default {
                 align: 'center',
                 searchIndex: 3,
                 column: [
-                    {
-                        label: '系统号',
-                        prop: "billNo",
-                        width: "120",
-                        search: true,
-                        overHidden: true,
-                    },
-                    {
-                        label: 'B/L NO',
-                        prop: "hblno",
-                        width: "100",
-                        search: true,
-                        overHidden: true,
-                    },
-                    {
+                     {
                         label: '所属公司',
                         prop: "branchName",
                         width: "100",
@@ -137,7 +123,21 @@ export default {
                             value: "id",
                         },
                         hide: true,
-                        showColumn: false,
+                        //showColumn: false,
+                        overHidden: true,
+                    },
+                    {
+                        label: '系统号',
+                        prop: "billNo",
+                        width: "120",
+                        search: true,
+                        overHidden: true,
+                    },
+                    {
+                        label: 'B/L NO',
+                        prop: "hblno",
+                        width: "100",
+                        search: true,
                         overHidden: true,
                     },
                     {
@@ -157,6 +157,15 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: 'ETD',
+                        prop: "etd",
+                        width: "100",
+                        overHidden: true,
+                        type: "date",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd 00:00:00",
+                    },
+                    {
                         label: "起运港",
                         prop: "polEnName",
                         width: "80",
@@ -240,15 +249,6 @@ export default {
                         },
                     },
                     {
-                        label: 'ETD',
-                        prop: "etd",
-                        width: "100",
-                        overHidden: true,
-                        type: "date",
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd 00:00:00",
-                    },
-                    {
                         label: '订舱日期',
                         prop: "bookingDate",
                         width: "100",

src/views/iosBasicData/businessCenter/customerLetter/index.vue

@@ -29,7 +29,7 @@
                 <template slot="menu" slot-scope="{ row, index }">
                     <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
                     <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
-                        :disabled="row.status != 0||row.issueStatus!=0">删 除</el-button>
+                        :disabled="!(row.issueStatus == 0 || row.issueStatus == 6||row.billStatus==1)">删 除</el-button>
                 </template>
                 <!-- <template slot="status" slot-scope="{ row }">
                     <span v-if="row.issueStatus == 0"
@@ -91,20 +91,6 @@ export default {
                 searchIndex: 3,
                 column: [
                     {
-                        label: '系统号',
-                        prop: "billNo",
-                        width: "120",
-                        search: true,
-                        overHidden: true,
-                    },
-                    {
-                        label: 'B/L NO',
-                        prop: "hblno",
-                        width: "100",
-                        search: true,
-                        overHidden: true,
-                    },
-                    {
                         label: '所属公司',
                         prop: "branchName",
                         width: "100",
@@ -131,7 +117,21 @@ export default {
                             value: "id",
                         },
                         hide: true,
-                        showColumn: false,
+                        // showColumn: false,
+                        overHidden: true,
+                    },
+                    {
+                        label: '系统号',
+                        prop: "billNo",
+                        width: "120",
+                        search: true,
+                        overHidden: true,
+                    },
+                    {
+                        label: 'B/L NO',
+                        prop: "hblno",
+                        width: "100",
+                        search: true,
                         overHidden: true,
                     },
                     {
@@ -151,6 +151,15 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: 'ETD',
+                        prop: "etd",
+                        width: "100",
+                        overHidden: true,
+                        type: "date",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd 00:00:00",
+                    },
+                    {
                         label: "起运港",
                         prop: "polEnName",
                         width: "80",
@@ -297,15 +306,6 @@ export default {
                         },
                     },
                     {
-                        label: 'ETD',
-                        prop: "etd",
-                        width: "100",
-                        overHidden: true,
-                        type: "date",
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd 00:00:00",
-                    },
-                    {
                         label: '订舱日期',
                         prop: "bookingDate",
                         width: "100",

src/views/ow/owPut/detailsPage.vue

@@ -3762,8 +3762,8 @@ export default {
       if (name == '撤销导入') {
         let ids = []
         for (let item of this.selecPickList) {
-          if (item.whetherGenerateCost == 0) {
-            return this.$message.error("请选择要撤销的明细");
+          if (item.whetherGenerateCost == 1) {
+            return this.$message.error("已生成费用明细");
           }
           ids.push(item.id)
         }

src/views/ow/owTask/detailsPage.vue

@@ -640,11 +640,11 @@
     </el-dialog>
     <el-dialog append-to-body title="导入OW合约" :visible.sync="owhyDialog" width="60%" v-dialog-drag>
       <span>
-        <avue-crud v-if="owhyDialog" :option="owOption" :data="owList" id="out-table" ref="owCrud" :search.sync="query" :page.sync="page"
-          @search-change="owSearchChange" @search-reset="owSearchReset" :header-cell-class-name="headerClassName"
-          @current-change="currentChange" @size-change="sizeChange" :row-style="{ height: '20px', padding: '0px' }"
-          :cell-style="{ height: '20px', padding: '0px' }" @on-load="getOwList"
-          @current-row-change="handleCurrentRowChange">
+        <avue-crud v-if="owhyDialog" :option="owOption" :data="owList" id="out-table" ref="owCrud" :search.sync="query"
+          :page.sync="page" @search-change="owSearchChange" @search-reset="owSearchReset"
+          :header-cell-class-name="headerClassName" @current-change="currentChange" @size-change="sizeChange"
+          :row-style="{ height: '20px', padding: '0px' }" :cell-style="{ height: '20px', padding: '0px' }"
+          @on-load="getOwList" @current-row-change="handleCurrentRowChange">
         </avue-crud>
       </span>
       <span slot="footer" class="dialog-footer">
@@ -4037,8 +4037,8 @@ export default {
       if (name == '撤销导入') {
         let ids = []
         for (let item of this.selecPickList) {
-          if (item.whetherGenerateCost == 0) {
-            return this.$message.error("请选择要撤销的明细");
+          if (item.whetherGenerateCost == 1) {
+            return this.$message.error("已生成费用明细");
           }
           ids.push(item.id)
         }