海运进出口 恢复保存 费用代码 新增撤销锁单功能

src/api/iosBasicData/bills.js

@@ -332,6 +332,14 @@ export const revokeReturningSecurityMoney = (data) => {
     data: data
   })
 }
+// 撤销锁单
+export const revokeLockOrder = (data) => {
+  return request({
+    url: '/api/blade-los/bills/revokeLockOrder',
+    method: 'post',
+    data: data
+  })
+}
 // 批量模板导入
 export const templateImportBatch = (data) => {
   return request({

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

@@ -56,7 +56,7 @@
                         <span>应收费用</span>
                     </div>
                     <el-button v-if="isFeeEditD" type="danger" plain size="small"
-                        :disabled="!selectionDList.length || showLock"
+                        :disabled="!selectionDList.length || disabled"
                         @click="batchDelete('D')">一键删除
                     </el-button>
                     <!-- <el-button v-if="isFeeEditD" type="success" plain size="small"
@@ -71,29 +71,29 @@
                     <el-button v-if="isFeeEditD" type="success" plain size="small"
                         :disabled="!this.assemblyForm.id || disabled || pleasereviewType"
                         @click="templateClick('D')">应收模板</el-button>
-                    <el-button v-if="isFeeEditD" type="info" plain size="small" :disabled="showLock"
+                    <el-button v-if="isFeeEditD" type="info" plain size="small" :disabled="disabled"
                         @click="feecenterSubmitListfun">一键保存</el-button>
-                    <el-button v-if="isFeeEditD" type="info" plain size="small" :disabled="showLock"
+                    <el-button v-if="isFeeEditD" type="info" plain size="small" :disabled="disabled"
                         @click="feecenterEditfun('D')">一键编辑
                     </el-button>
                     <el-button v-if="isFeeEditC" type="primary" plain size="small"
                         :disabled="disabled || pleasereviewType" @click="copyfun('D')">生成应付</el-button>
                     <el-button v-if="isFeeEditD" type="primary" plain size="small"
                         :disabled="disabled || pleasereviewType" @click="allClick('发票申请', 'D')">发票申请</el-button>
-                    <el-button type="primary" plain size="small" :disabled="showLock || selectionDList.length == 0"
+                    <el-button type="primary" plain size="small" :disabled="disabled || selectionDList.length == 0"
                         @click="allClick('D费用申请')">请核费用</el-button>
                     <el-button type="danger" plain size="small" :disabled="disabled || selectionDList.length == 0"
                         @click="allClick('D撤销请核')">撤销请核</el-button>
-                    <el-button type="primary" plain size="small" :disabled="selectionDList.length != 1||showLock"
+                    <el-button type="primary" plain size="small" :disabled="selectionDList.length != 1||disabled"
                         @click="allClick('D申请修改')">申请修改</el-button>
-                    <el-button type="success" plain size="small" :disabled="selectionDList.length != 1||showLock"
+                    <el-button type="success" plain size="small" :disabled="selectionDList.length != 1||disabled"
                         @click="allClick('D申请删除')">申请删除</el-button>
-                    <el-button type="danger" plain size="small" :disabled="selectionDList.length != 1||showLock"
+                    <el-button type="danger" plain size="small" :disabled="selectionDList.length != 1||disabled"
                         @click="allClick('D取消申请')">取消申请</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
                     <el-button v-if="isFeeEditD" type="primary" size="small" icon="el-icon-plus" circle
-                        :disabled="showLock" @click="addDfun"></el-button>
+                        :disabled="disabled" @click="addDfun"></el-button>
                 </template>
                 <template slot="index" slot-scope="scope">
                     <span>{{ scope.index + 1 }}</span>
@@ -208,7 +208,7 @@
                         <span>应付费用</span>
                     </div>
                     <el-button v-if="isFeeEditC" type="danger" plain size="small"
-                        :disabled="!selectionCList.length || showLock"
+                        :disabled="!selectionCList.length || disabled"
                         @click="batchDelete('C')">一键删除
                     </el-button>
                     <!-- <el-button v-if="isFeeEditC" type="primary" plain size="small"
@@ -224,10 +224,10 @@
                         :disabled="!this.assemblyForm.id || disabled || pleasereviewType"
                         @click="templateClick('C')">应付模板
                     </el-button>
-                    <el-button v-if="isFeeEditC" type="info" plain size="small" :disabled="showLock"
+                    <el-button v-if="isFeeEditC" type="info" plain size="small" :disabled="disabled"
                         @click="feecenterSubmitListfun">一键保存
                     </el-button>
-                    <el-button v-if="isFeeEditC" type="info" plain size="small" :disabled="showLock"
+                    <el-button v-if="isFeeEditC" type="info" plain size="small" :disabled="disabled"
                         @click="feecenterEditfun('C')">一键编辑
                     </el-button>
                     <el-button v-if="isFeeEditC" type="primary" plain size="small"
@@ -235,22 +235,22 @@
                     </el-button>
                     <el-button type="info" plain size="small" :disabled="disabled"
                         @click="allClick('付费申请', 'C')">付费申请</el-button>
-                    <el-button type="primary" plain size="small" :disabled="showLock || selectionCList.length == 0"
+                    <el-button type="primary" plain size="small" :disabled="disabled || selectionCList.length == 0"
                         @click="allClick('C费用申请')">请核费用</el-button>
                     <el-button type="danger" plain size="small" :disabled="disabled || selectionCList.length == 0"
                         @click="allClick('C撤销请核')">撤销请核</el-button>
                     <!-- <el-button type="success" plain size="small" :disabled="disabled"
                         @click="allClick('提取成本')">提取成本</el-button> -->
-                    <el-button type="primary" plain size="small" :disabled="selectionCList.length != 1||showLock"
+                    <el-button type="primary" plain size="small" :disabled="selectionCList.length != 1||disabled"
                         @click="allClick('C申请修改')">申请修改</el-button>
-                    <el-button type="success" plain size="small" :disabled="selectionCList.length != 1||showLock"
+                    <el-button type="success" plain size="small" :disabled="selectionCList.length != 1||disabled"
                         @click="allClick('C申请删除')">申请删除</el-button>
-                    <el-button type="danger" plain size="small" :disabled="selectionCList.length != 1||showLock"
+                    <el-button type="danger" plain size="small" :disabled="selectionCList.length != 1||disabled"
                         @click="allClick('C取消申请')">取消申请</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
                     <el-button v-if="isFeeEditC" type="primary" size="small" icon="el-icon-plus" circle
-                        :disabled="showLock" @click="addCfun">
+                        :disabled="disabled" @click="addCfun">
                     </el-button>
                 </template>
                 <template slot="index" slot-scope="scope">

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

@@ -91,8 +91,11 @@
                     (form.status == 4 && form.billType != 'MH')
                 " @click.stop="DocumentApproval">单据请核
                 </el-button>
-                <el-button size="small" type="primary" style="margin-right: 8px" :disabled="showLock"
-                    :loading="saveLoading" @click="editCustomer">保 存
+                <el-button size="small" type="danger" :disabled="showLock"
+                    v-if="form.status == 3 && form.billType != 'MH'" @click.stop="revokeLockOrder">撤销锁单
+                </el-button>
+                <el-button size="small" type="primary" style="margin-right: 8px"
+                    :disabled="detailData.seeDisabled || showLock" :loading="saveLoading" @click="editCustomer">保 存
                 </el-button>
                 <el-dropdown style="line-height: 0" v-if="form.billType != 'MH'">
                     <el-button type="warning" :loading="saveLoading" :disabled="!form.id" size="small">
@@ -526,7 +529,8 @@ import {
     revokeChangeOrders,
     returningSecurityMoney,
     revokeReturningSecurityMoney,
-    synchronizeData
+    synchronizeData,
+    revokeLockOrder
 } from "@/api/iosBasicData/bills";
 import { dateFormat } from "@/util/date";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
@@ -900,7 +904,7 @@ export default {
         "form.billType": {
             // 执行方法
             handler(oldValue, newValue) {
-                if (oldValue == "MH"||oldValue == "MM") {
+                if (oldValue == "MH" || oldValue == "MM") {
                     this.basicData.column.forEach(item => {
                         if (item.prop == "bookingNo") {
                             item.display = false;
@@ -2405,6 +2409,27 @@ export default {
                 });
             });
         },
+        //撤销锁单
+        revokeLockOrder() {
+            this.$confirm("是否撤销锁单?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                this.pageLoading = true;
+                revokeLockOrder({
+                    id: this.form.id
+                }).then(res => {
+                    this.pageLoading = false;
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!"
+                    });
+                    // 详情
+                    this.billsDetailfun(this.form.id);
+                });
+            });
+        },
         // 编辑按钮
         editHandle() {
             this.detailData.seeDisabled = false;

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

@@ -56,7 +56,7 @@
                         <span>应收费用</span>
                     </div>
                     <el-button v-if="isFeeEditD" type="danger" plain size="small"
-                        :disabled="!selectionDList.length || showLock"
+                        :disabled="!selectionDList.length || disabled"
                         @click="batchDelete('D')">一键删除
                     </el-button>
                     <!-- <el-button v-if="isFeeEditD" type="success" plain size="small"
@@ -71,29 +71,29 @@
                     <el-button v-if="isFeeEditD" type="success" plain size="small"
                         :disabled="!this.assemblyForm.id || disabled || pleasereviewType"
                         @click="templateClick('D')">应收模板</el-button>
-                    <el-button v-if="isFeeEditD" type="info" plain size="small" :disabled="showLock"
+                    <el-button v-if="isFeeEditD" type="info" plain size="small" :disabled="disabled"
                         @click="feecenterSubmitListfun">一键保存</el-button>
-                    <el-button v-if="isFeeEditD" type="info" plain size="small" :disabled="showLock"
+                    <el-button v-if="isFeeEditD" type="info" plain size="small" :disabled="disabled"
                         @click="feecenterEditfun('D')">一键编辑
                     </el-button>
                     <el-button v-if="isFeeEditC" type="primary" plain size="small"
                         :disabled="disabled || pleasereviewType" @click="copyfun('D')">生成应付</el-button>
                     <el-button v-if="isFeeEditD" type="primary" plain size="small"
                         :disabled="disabled || pleasereviewType" @click="allClick('发票申请', 'D')">发票申请</el-button>
-                    <el-button type="primary" plain size="small" :disabled="showLock || selectionDList.length == 0"
+                    <el-button type="primary" plain size="small" :disabled="disabled || selectionDList.length == 0"
                         @click="allClick('D费用申请')">请核费用</el-button>
                     <el-button type="danger" plain size="small" :disabled="disabled || selectionDList.length == 0"
                         @click="allClick('D撤销请核')">撤销请核</el-button>
-                    <el-button type="primary" plain size="small" :disabled="selectionDList.length != 1||showLock"
+                    <el-button type="primary" plain size="small" :disabled="selectionDList.length != 1||disabled"
                         @click="allClick('D申请修改')">申请修改</el-button>
-                    <el-button type="success" plain size="small" :disabled="selectionDList.length != 1||showLock"
+                    <el-button type="success" plain size="small" :disabled="selectionDList.length != 1||disabled"
                         @click="allClick('D申请删除')">申请删除</el-button>
-                    <el-button type="danger" plain size="small" :disabled="selectionDList.length != 1||showLock"
+                    <el-button type="danger" plain size="small" :disabled="selectionDList.length != 1||disabled"
                         @click="allClick('D取消申请')">取消申请</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
                     <el-button v-if="isFeeEditD" type="primary" size="small" icon="el-icon-plus" circle
-                        :disabled="showLock" @click="addDfun"></el-button>
+                        :disabled="disabled" @click="addDfun"></el-button>
                 </template>
                 <template slot="index" slot-scope="scope">
                     <span>{{ scope.index + 1 }}</span>
@@ -210,7 +210,7 @@
                         <span>应付费用</span>
                     </div>
                     <el-button v-if="isFeeEditC" type="danger" plain size="small"
-                        :disabled="!selectionCList.length || showLock"
+                        :disabled="!selectionCList.length || disabled"
                         @click="batchDelete('C')">一键删除
                     </el-button>
                     <!-- <el-button v-if="isFeeEditC" type="primary" plain size="small"
@@ -226,10 +226,10 @@
                         :disabled="!this.assemblyForm.id || disabled || pleasereviewType"
                         @click="templateClick('C')">应付模板
                     </el-button>
-                    <el-button v-if="isFeeEditC" type="info" plain size="small" :disabled="showLock"
+                    <el-button v-if="isFeeEditC" type="info" plain size="small" :disabled="disabled"
                         @click="feecenterSubmitListfun">一键保存
                     </el-button>
-                    <el-button v-if="isFeeEditC" type="info" plain size="small" :disabled="showLock"
+                    <el-button v-if="isFeeEditC" type="info" plain size="small" :disabled="disabled"
                         @click="feecenterEditfun('C')">一键编辑
                     </el-button>
                     <el-button v-if="isFeeEditC" type="primary" plain size="small"
@@ -237,22 +237,22 @@
                     </el-button>
                     <el-button type="info" plain size="small" :disabled="disabled"
                         @click="allClick('付费申请', 'C')">付费申请</el-button>
-                    <el-button type="primary" plain size="small" :disabled="showLock || selectionCList.length == 0"
+                    <el-button type="primary" plain size="small" :disabled="disabled || selectionCList.length == 0"
                         @click="allClick('C费用申请')">请核费用</el-button>
                     <el-button type="danger" plain size="small" :disabled="disabled || selectionCList.length == 0"
                         @click="allClick('C撤销请核')">撤销请核</el-button>
                     <!-- <el-button type="success" plain size="small" :disabled="disabled"
                         @click="allClick('提取成本')">提取成本</el-button> -->
-                    <el-button type="primary" plain size="small" :disabled="selectionCList.length != 1||showLock"
+                    <el-button type="primary" plain size="small" :disabled="selectionCList.length != 1||disabled"
                         @click="allClick('C申请修改')">申请修改</el-button>
-                    <el-button type="success" plain size="small" :disabled="selectionCList.length != 1||showLock"
+                    <el-button type="success" plain size="small" :disabled="selectionCList.length != 1||disabled"
                         @click="allClick('C申请删除')">申请删除</el-button>
-                    <el-button type="danger" plain size="small" :disabled="selectionCList.length != 1||showLock"
+                    <el-button type="danger" plain size="small" :disabled="selectionCList.length != 1||disabled"
                         @click="allClick('C取消申请')">取消申请</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
                     <el-button v-if="isFeeEditC" type="primary" size="small" icon="el-icon-plus" circle
-                        :disabled="showLock" @click="addCfun">
+                        :disabled="disabled" @click="addCfun">
                     </el-button>
                 </template>
                 <template slot="index" slot-scope="scope">

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

@@ -83,8 +83,11 @@
                     v-if="(form.status == 0 || form.status == 4) && form.billType != 'MH'"
                     @click.stop="DocumentApproval">单据请核
                 </el-button>
-                <el-button size="small" type="primary" style="margin-right: 8px" :disabled="showLock"
-                    :loading="saveLoading" @click="editCustomer">保 存
+                <el-button size="small" type="danger" :disabled="showLock"
+                    v-if="form.status == 3 && form.billType != 'MH'" @click.stop="revokeLockOrder">撤销锁单
+                </el-button>
+                <el-button size="small" type="primary" style="margin-right: 8px"
+                    :disabled="detailData.seeDisabled || showLock" :loading="saveLoading" @click="editCustomer">保 存
                 </el-button>
                 <el-dropdown style="line-height: 0" v-if="form.billType != 'MH'">
                     <el-button type="warning" :loading="saveLoading" :disabled="!form.id" size="small">
@@ -405,7 +408,8 @@ import {
     logisticsRevokeSubmission,
     transferOrder,
     revokeTransferOrder,
-    synchronizeData
+    synchronizeData,
+    revokeLockOrder
 } from '@/api/iosBasicData/bills'
 import { dateFormat } from "@/util/date";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
@@ -2086,6 +2090,27 @@ export default {
                 })
             })
         },
+        //撤销锁单
+        revokeLockOrder() {
+            this.$confirm("是否撤销锁单?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                this.pageLoading = true;
+                revokeLockOrder({
+                    id: this.form.id
+                }).then(res => {
+                    this.pageLoading = false;
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!"
+                    });
+                    // 详情
+                    this.billsDetailfun(this.form.id);
+                });
+            });
+        },
         // 编辑按钮
         editHandle() {
             this.detailData.seeDisabled = false