commit 套保计划 除表单外接口

public/proto/mtp.proto

@@ -883,22 +883,30 @@ message ErmcpContractOperateApplyInfo {
 }
 // 套保计划请求 0 29 164
 message ErmcpHedgePlanReq {
-	optional MessageHead Header = 1; // MessageHead
-	optional uint64 HedgePlanID = 2; // uint64 套保计划ID(601+Unix秒时间戳(10位)+xxxxxx)
-		optional string HedgePlanNo = 3; // string 套保计划名称
-		optional int32 ContractType = 4; // int32 计划类型-1:采购-1:销售
-		optional uint64 AreaUserID = 5; // uint64 机构ID
-		optional uint64 DeliveryGoodsID = 6; // uint64 现货品种ID
-		optional int32 ProductType = 7; // int32 产品类型-1:标准仓单2:等标3:非标
-		optional string SpotGoodsDesc = 8; // string 商品型号
-		optional double PlanQty = 9; // double 计划数量
-		optional double ConvertFactor = 10; // double 标仓系数
-		optional string PlanTime = 11; // string 计划时间
-		optional string TradeDate = 12; // string 交易日(yyyyMMdd)
-		optional int32 ApplySrc = 13; // int32 申请来源 - 1:管理端 2:终端
-		optional uint64 ApplyId = 14; // uint64 申请人
-		optional string Remark = 15; // string 计划备注
-	optional int32 OperateType = 16; // uint32 操作类型-1:保存草稿2:提交申请3:删除4审核通过5审核拒绝
+ optional MessageHead Header = 1; // MessageHead
+ optional uint64 HedgePlanID = 2; // uint64 套保计划ID(601+Unix秒时间戳(10位)+xxxxxx)
+ optional string HedgePlanNo = 3; // string 套保计划名称
+ optional int32 ContractType = 4; // int32 计划类型-1:采购-1:销售
+ optional uint64 AreaUserID = 5; // uint64 机构ID
+ optional uint64 DeliveryGoodsID = 6; // uint64 现货品种ID
+ optional int32 ProductType = 7; // int32 产品类型-1:标准仓单2:等标3:非标
+ optional string SpotGoodsDesc = 8; // string 商品型号
+ optional double PlanQty = 9; // double 计划数量
+ optional double ConvertFactor = 10; // double 标仓系数
+ optional string PlanTime = 11; // string 计划时间
+ optional string TradeDate = 12; // string 交易日(yyyyMMdd)
+ optional int32 ApplySrc = 13; // int32 申请来源 - 1:管理端 2:终端
+ optional uint64 ApplyId = 14; // uint64 申请人
+ optional string Remark = 15; // string 计划备注
+ optional int32 OperateType = 16; // int32 操作类型-1:保存草稿2:提交申请3:删除4审核通过5审核拒绝
+ optional uint64 WRStandardID = 17; // uint64 现货品类ID
+ optional uint64 AccountID = 18; // uint64 期货账户ID（默认为0，也可不传）
+ optional uint64 Tradeuserid = 19; // uint64 交易用户ID
+ optional uint64 Currencyid = 20; // uint64 结算币种ID
+ optional uint64 Biztype = 21; // uint64 业务类型 - 1:套保 2:套利 默认为 1
+ optional uint64 auditid = 22; // uint64 审核人
+ optional uint32 auditsrc = 23; // uint32 审核来源 - 1:管理端 2:终端
+ optional string auditremark = 24; // string 审核备注
 }
 // 套保计划响应 0 29 165
 message ErmcpHedgePlanRsp {

src/services/go/ermcp/plan/index.ts

@@ -12,7 +12,7 @@ import { Ermcp3HedgePlan } from '@/services/go/ermcp/plan/interface';
 export function QueryHedgePlan(hedgeplanstatus: string): Promise<Ermcp3HedgePlan[]> {
     const param = {
         userid: getUserId(),
-        hedgeplanstatus
+        hedgeplanstatus: hedgeplanstatus,
     }
     return commonSearch_go('/Ermcp3/QueryHedgePlan', param).catch((err) => {
         throw new Error(`查询套保计划: ${err.message}`);

src/services/proto/hedgeplan/index.ts

@@ -5,20 +5,22 @@ import {Callback} from "@/utils/websocket";
 import {ErmcpHedgePlanReq, HedgePlanOperateReq} from "@/services/proto/hedgeplan/interface";
 import {getSelectedAccountId, getUserId} from "@/services/bus/account";
 import {v4 as uuidv4} from "uuid";
+import moment from "moment";
 
 /**
  * 套保计划操作请求
  * @param param.hedgePlanID Long 套保计划id
- * @param param.OperateType Int 操作类型-1:保存草稿2:提交申请3:审核通过4:审核拒绝5:撤回
+ * @param param.OperateType Int 操作类型-1:保存草稿2:提交申请3:删除4审核通过5审核拒绝
  */
 export const hedgePlanReq = (param: ErmcpHedgePlanReq): Promise<any> => {
     param.ApplySrc = 2; // 申请来源 - 1:管理端 2:终端
+    param.TradeDate = moment().format("YYMMDD");
 
     return new Promise((resolve, reject) => {
         const params = {
             protobufName: 'ErmcpHedgePlanReq',
             funCodeName: 'ErmcpHedgePlanReq',
-            reqParams:  param,
+            reqParams: param,
             msgHeadParams: {
                 AccountID: getSelectedAccountId(),
                 MarketID: 18,
@@ -28,7 +30,7 @@ export const hedgePlanReq = (param: ErmcpHedgePlanReq): Promise<any> => {
         const package50 = buildProtoReq50(params);
         APP.sendTradingServer(package50, undefined, {
             onSuccess: (res) => {
-                const { isSuccess, result } = parseProtoRsp50(res, 'ErmcpHedgePlanRsp');
+                const {isSuccess, result} = parseProtoRsp50(res, 'ErmcpHedgePlanRsp');
                 if (isSuccess) {
                     resolve(result);
                 } else {
@@ -41,19 +43,18 @@ export const hedgePlanReq = (param: ErmcpHedgePlanReq): Promise<any> => {
 }
 
 /**
- * 老的计划操作接口 我只负责删除 操作类型-1:保存草稿2:提交申请3:删除4审核通过5审核拒绝
+ * 老的计划操作接口 我只负责撤销 传5则进行撤销 !!!!! 注意
  * @param param
  */
 export const oldHedgePlanReq = (param: HedgePlanOperateReq): Promise<any> => {
     param.OperateSrc = 2; // 操作来源-1:管理端2:终端
     param.ClientTicket = uuidv4(); // 流水号
     param.UserID = getUserId()
-
     return new Promise((resolve, reject) => {
         const params = {
             protobufName: 'HedgePlanOperateReq',
             funCodeName: 'HedgePlanOperateReq',
-            reqParams:  param,
+            reqParams: param,
             msgHeadParams: {
                 AccountID: getSelectedAccountId(),
                 MarketID: 18,
@@ -63,7 +64,7 @@ export const oldHedgePlanReq = (param: HedgePlanOperateReq): Promise<any> => {
         const package50 = buildProtoReq50(params);
         APP.sendTradingServer(package50, undefined, {
             onSuccess: (res) => {
-                const { isSuccess, result } = parseProtoRsp50(res, 'HedgePlanOperateRsp');
+                const {isSuccess, result} = parseProtoRsp50(res, 'HedgePlanOperateRsp');
                 if (isSuccess) {
                     resolve(result);
                 } else {

src/services/proto/hedgeplan/interface.ts

@@ -21,4 +21,40 @@ export interface ErmcpHedgePlanReq {
 export interface  ErmcpHedgePlanRsp {
     RetCode: number // int32 返回码
     RetDesc: string // string 描述信息
+}
+
+
+// 套保计划操作请求 0 18 2
+export interface HedgePlanOperateReq {
+    HedgePlanID: number; // uint64 套保计划ID(601+Unix秒时间戳(10位)+xxxxxx)
+    OperateType: number; // uint32 操作类型-1:保存草稿2:提交申请3:审核通过4:审核拒绝5:撤回
+    OperateSrc?: number; // uint32 操作来源-1:管理端2:终端
+    UserID?: number; // uint64 操作用户ID
+    Remark?: string; // string 备注
+    ClientTicket?: string; // string 客户端流水号
+    Info?: HedgePlanInfo; // HedgePlanInfo 套保计划信息
+}
+
+// 套保计划操作响应 0 18 3
+export interface  HedgePlanOperateRsp {
+    RetCode: number; // int32 返回码
+    RetDesc: string; // string 描述信息
+    HedgePlanID: number; // uint64 套保计划ID(601+Unix秒时间戳(10位)+xxxxxx)
+    OperateType: number; // uint32 操作类型-1:保存草稿2:提交申请3:审核通过4:审核拒绝5:撤回
+    OperateSrc: number; // uint32 操作来源-1:管理端2:终端
+    ClientTicket: string; // string 客户端流水号
+}
+
+// 套保计划信息 0 18 1
+export interface  HedgePlanInfo {
+    HedgePlanNo: string; // string 套保计划编号
+    ContractType: number; // int32 计划类型-1:采购-1:销售
+    AreaUserID: number; // uint32 机构ID
+    DeliveryGoodsID: number; // uint32 现货品种ID
+    WrStandardID: number; // uint32 现货商品ID
+    ProductType: number; // uint32 产品类型-1:标准仓单2:等标3:非标
+    SpotGoodsDesc: string; // string 商品型号
+    PlanQty: number; // double 计划数量
+    ConvertFactor: number; // double 标仓系数
+    PlanTime: string; // string 计划时间
 }

src/views/business/plan/components/audit/index.vue

@@ -12,123 +12,163 @@
       <a-button key="submit"
                 type="primary"
                 :loading="loading"
-                @click="submit">确认停用</a-button>
+                @click="pass">审核通过</a-button>
+        <a-button key="submit"
+                  type="primary"
+                  :loading="loading"
+                  @click="refuse">审核拒绝</a-button>
     </template>
-    <a-form class="inlineForm"
-            :form="form"
-            @submit="handleSearch">
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="客户类型">
-            <span class="white">企业</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="企业名称">
-            <span class="white">深圳市前海矿业有限公司</span>
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="企业简称">
-            <span class="white">前海矿业</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="证件类型">
-            <span class="white">营业执照</span>
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="法定代表人">
-            <span class="white">李顺利</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="证件号码">
-            <span class="white">4328648236492432</span>
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="纳税人识别号">
-            <span class="white">57465736DR46456</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="营业执照">
-            <a class="blue">查看附件</a>
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="联系人">
-            <span class="white">王平</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="联系人手机号">
-            <span class="white">13745653421</span>
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="联系电话">
-            <span class="white">0755-34342544</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="状态">
-            <span class="green">正常</span>
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="24">
-          <a-form-item label="通讯地址">
-            <span class="white">广东省深圳市南山区前海街道路平路1324号</span>
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="24">
-          <a-form-item label="备注">
-            <span class="white">无</span>
-          </a-form-item>
-        </a-col>
-      </a-row>
-    </a-form>
+      <fieldset class="formFieldSet">
+          <legend>基本信息</legend>
+          <a-form class="inlineForm"
+                  :form="form"
+                  @submit="handleSearch">
+              <a-row :gutter="24">
+                  <a-col :span="12">
+                      <a-form-item label="计划类型">
+                          <span class="white">{{ getPlanContractType(selectedRow.contracttype) }}</span>
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="12">
+                      <a-form-item label="计划名称">
+                          <span class="white">{{ formatValue(selectedRow.hedgeplanno) }}</span>
+                      </a-form-item>
+                  </a-col>
+              </a-row>
+              <a-row :gutter="24">
+                  <a-col :span="12">
+                      <a-form-item label="现货品种">
+                          <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="12">
+                      <a-form-item label="标仓系数">
+                          <span class="white">{{ formatValue(selectedRow.convertfactor) }}</span>
+                      </a-form-item>
+                  </a-col>
+              </a-row>
+              <a-row :gutter="24">
+                  <a-col :span="12">
+                      <a-form-item label="计划量">
+                          <span class="white">{{ formatValue(selectedRow.planqty) }}</span>
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="12">
+                      <a-form-item label="备注">
+                          <span class="white">{{ formatValue(selectedRow.remark) }}</span>
+                      </a-form-item>
+                  </a-col>
+              </a-row>
+          </a-form>
+      </fieldset>
+      <fieldset class="formFieldSet">
+          <legend>其它信息</legend>
+          <a-row :gutter="24">
+              <a-col :span="12">
+                  <a-form-item label="交易用户">
+                      <span class="white">{{ formatValue(selectedRow.tradeusername) }}</span>
+                  </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                  <a-form-item label="结算币种">
+                      <span class="white">{{ formatValue(selectedRow.currencyname) }}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+          <a-row :gutter="24">
+              <a-col :span="12">
+                  <a-form-item label="备注">
+                      <span class="white">{{ formatValue(selectedRow.remark) }}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+      </fieldset>
   </a-modal>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
+import {defineComponent, PropType, ref} from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
+import {Modal} from "ant-design-vue";
+import {ErmcpHedgePlanReq} from "@/services/proto/hedgeplan/interface";
+import Long from "long";
+import {changeStatus} from "@/views/business/plan/components/setup";
+import {Ermcp3HedgePlan} from "@/services/go/ermcp/plan/interface";
+import {getPlanContractType} from "@/views/business/plan/setup";
+import {formatValue} from "@/common/methods";
 
 export default defineComponent({
     name: 'plan_audit_audit',
     components: {},
-    setup() {
+    props: {
+        selectedRow: {
+            type: Object as PropType<Ermcp3HedgePlan>,
+            default: {},
+        },
+    },
+    setup(props, context) {
         const { visible, cancel } = closeModal('plan_audit_audit');
         const loading = ref<boolean>(false);
-        function submit() {
-            loading.value = true;
-            setTimeout(() => {
-                loading.value = false;
-                cancel();
-            }, 2000);
+        // 审核通过
+        function pass() {
+            Modal.confirm({
+                title: '是否确认审核通过',
+                okText: '审核通过',
+                cancelText: '取消',
+                onOk() {
+                    const params: ErmcpHedgePlanReq = {
+                        HedgePlanID: Long.fromString(props.selectedRow.hedgeplanid),
+                        OperateType: 4,
+                        Remark: '通过'
+                    }
+                    changeStatus(params, 4, loading)
+                        .then(res => {
+                            cancel()
+                            context.emit('refresh')
+                        })
+                        .catch(err => {
+
+                        })
+                },
+                onCancel() {
+                    console.log('Cancel');
+                },
+            });
+        }
+        // 审核拒绝
+        function refuse(){
+            Modal.confirm({
+                title: '是否确认审核拒绝',
+                okText: '审核拒绝',
+                cancelText: '取消',
+                onOk() {
+                    const params: ErmcpHedgePlanReq = {
+                        HedgePlanID: Long.fromString(props.selectedRow.hedgeplanid),
+                        OperateType: 5,
+                    }
+                    changeStatus(params, 5, loading)
+                        .then(res => {
+                            cancel()
+                            context.emit('refresh')
+                        })
+                        .catch(err => {
+
+                        })
+                },
+                onCancel() {
+                    console.log('Cancel');
+                },
+            });
         }
         return {
             visible,
             cancel,
-            submit,
+            refuse,
             loading,
+            pass,
+            getPlanContractType,
+            formatValue,
+
         };
     },
 });

src/views/business/plan/components/cancel/index.vue

@@ -93,7 +93,9 @@ import {Ermcp3HedgePlan} from "@/services/go/ermcp/plan/interface";
 import {formatValue} from "@/common/methods";
 import {getPlanContractType} from "@/views/business/plan/setup";
 import {Modal} from "ant-design-vue";
-import {PlanStatus} from "@/views/business/plan/components/setup";
+import {cancelPlan} from "@/views/business/plan/components/setup";
+import {HedgePlanOperateReq} from "@/services/proto/hedgeplan/interface";
+import * as Long from "long";
 
 export default defineComponent({
     name: 'plan_audit_cancel',
@@ -106,8 +108,8 @@ export default defineComponent({
     },
     setup(props, context) {
         const {visible, cancel} = closeModal('plan_audit_cancel');
-        const {loading, changeStatus} = PlanStatus()
         const maskClosableFlag = ref<boolean>(false);
+        const loading = ref<boolean>(false);
 
         function submit() {
             Modal.confirm({
@@ -115,14 +117,17 @@ export default defineComponent({
                 okText: '确认撤销',
                 cancelText: '取消',
                 onOk() {
-                    // 撤销合同
-                    changeStatus(props.selectedRow.hedgeplanid, 5)
+                    const params: HedgePlanOperateReq = {
+                        HedgePlanID: Long.fromString(props.selectedRow.hedgeplanid),
+                        OperateType: 5,
+                    }
+                    cancelPlan(params,  loading)
                         .then(res => {
-                            context.emit('refresh')
                             cancel()
+                            context.emit('refresh')
                         })
-                        .catch(err => {
-
+                        .catch(err =>{
+                            
                         })
                 },
                 onCancel() {
@@ -135,7 +140,6 @@ export default defineComponent({
             visible,
             cancel,
             submit,
-            loading,
             maskClosableFlag,
             formatValue,
             getPlanContractType,

src/views/business/plan/components/delete/index.vue

@@ -82,10 +82,13 @@
 <script lang="ts">
 import {defineComponent, PropType, ref} from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
-import {PlanStatus} from "@/views/business/plan/components/setup";
 import {Ermcp3HedgePlan} from "@/services/go/ermcp/plan/interface";
 import {formatValue} from "@/common/methods";
 import {getPlanContractType} from "@/views/business/plan/setup";
+import {Modal} from "ant-design-vue";
+import {changeStatus} from "@/views/business/plan/components/setup";
+import {ErmcpHedgePlanReq, HedgePlanOperateReq} from "@/services/proto/hedgeplan/interface";
+import * as Long from "long";
 
 export default defineComponent({
     name: 'plan_uncommitted_delete',
@@ -98,15 +101,35 @@ export default defineComponent({
     },
     setup(props, context) {
         const { visible, cancel } = closeModal('plan_uncommitted_delete');
-        const {loading, changeStatus} = PlanStatus()
+        const loading = ref<boolean>(false);
         function submit() {
+            Modal.confirm({
+                title: '是否确认删除',
+                okText: '确认删除',
+                cancelText: '取消',
+                onOk() {
+                    const params: ErmcpHedgePlanReq = {
+                        HedgePlanID: Long.fromString(props.selectedRow.hedgeplanid),
+                        OperateType: 3,
+                    }
+                    changeStatus(params, 3, loading)
+                        .then(res => {
+                            cancel()
+                            context.emit('refresh')
+                        })
+                        .catch(err => {
 
+                        })
+                },
+                onCancel() {
+                    console.log('Cancel');
+                },
+            });
         }
         return {
             visible,
             cancel,
             submit,
-            loading,
             formatValue,
             getPlanContractType,
         };

src/views/business/plan/components/detail/index.vue

@@ -89,7 +89,6 @@ import {getStatusName} from '@/views/information/custom/setup';
 import {Ermcp3HedgePlan} from '@/services/go/ermcp/plan/interface';
 import {formatValue} from '@/common/methods';
 import {getPlanContractType} from '@/views/business/plan/setup';
-import {PlanStatus} from "@/views/business/plan/components/setup";
 import {Modal} from "ant-design-vue";
 
 export default defineComponent({
@@ -103,7 +102,6 @@ export default defineComponent({
     },
     setup(props, context) {
         const {visible, cancel} = closeModal('detail');
-        const {loading, changeStatus} = PlanStatus()
 
         function submit() {
             context.emit('refresh')
@@ -114,7 +112,6 @@ export default defineComponent({
             visible,
             cancel,
             submit,
-            loading,
             formatValue,
             getPlanContractType,
         };

src/views/business/plan/components/setup.ts

@@ -1,42 +1,31 @@
-import {ref} from "vue";
-import {hedgePlanReq} from "@/services/proto/hedgeplan";
-import {ErmcpHedgePlanReq} from "@/services/proto/hedgeplan/interface";
+import {Ref, ref} from "vue";
+import {hedgePlanReq, oldHedgePlanReq} from "@/services/proto/hedgeplan";
+import {ErmcpHedgePlanReq, HedgePlanOperateReq} from "@/services/proto/hedgeplan/interface";
 import {message} from "ant-design-vue";
-import {getRequestResultInfo} from "@/common/methods/request";
-import {hedgePlanSign} from "@/views/business/plan/setup";
+import {commonResultInfo, getRequestResultInfo} from "@/common/methods/request";
+import {deletePlanSign, hedgePlanSign} from "@/views/business/plan/setup";
 import Long from "long";
 
+
 /**
- * 套保计划状态管理
- * @constructor
+ * 操作类型-1:保存草稿2:提交申请3:删除4审核通过5审核拒绝
+ * @param id HedgePlanID
+ * @param type
  */
-export function PlanStatus() {
-    const loading = ref<boolean>(false);
-
-    /**
-     * 1:保存草稿2:提交申请3:审核通过4:审核拒绝5:撤回
-     * @param id HedgePlanID
-     * @param type
-     */
-    function changeStatus(id: String, type: number): Promise<string> {
-        loading.value = true
-        const params: ErmcpHedgePlanReq = {
-            HedgePlanID: Long.fromString(id),
-            OperateType: type
-        }
-        const sign = getRequestResultInfo(hedgePlanSign, type)  // 接口请求后的返回提示 这里统一进行管理
-        debugger
-        return hedgePlanReq(params)
-            .then(res => {
-                message.success(sign[0])
-                return Promise.resolve(res)
-            })
-            .catch(err => {
-                message.error(sign[1] + err)
-                return Promise.reject(sign[1] + err)
-            })
-    }
+export function changeStatus(req: ErmcpHedgePlanReq, type: number, loading: Ref<boolean>): Promise<string> {
+    const sign = getRequestResultInfo(hedgePlanSign, type)  // 接口请求后的返回提示 这里统一进行管理
+    const result = hedgePlanReq(req)
+    return commonResultInfo(result, sign, loading)
+}
 
-    return {loading, changeStatus}
+/**
+ * 撤销套保计划
+ * @param req 撤销套保计划请求
+ * @param loading
+ */
+export function cancelPlan(req: HedgePlanOperateReq, loading: Ref<boolean>): Promise<string> {
+    const sign = getRequestResultInfo(deletePlanSign, 5)  // 接口请求后的返回提示 这里统一进行管理
+    const result = oldHedgePlanReq(req)
+    return commonResultInfo(result, sign, loading)
 }
 

src/views/business/plan/list/audit/index.vue

@@ -75,7 +75,7 @@ export default defineComponent({
         // 表格操作按钮列表
         const {commonBtn, forDataBtn} = getBtnList('plan_audit', true);
         // 表格列表数据
-        const {loading, tableList, queryTable} = queryTableList('1');
+        const {loading, tableList, queryTable} = queryTableList('1,4');
 
         // 查询
         function search(value: any) {

src/views/business/plan/list/uncommitted/index.vue

@@ -78,7 +78,7 @@ export default defineComponent({
         // 表格操作按钮列表
         const {commonBtn, forDataBtn} = getBtnList('plan_uncommitted', true);
         // 表格列表数据
-        const {loading, tableList, queryTable} = queryTableList('0');
+        const {loading, tableList, queryTable} = queryTableList('0,6');
 
         // 查询
         function search(value: any) {

src/views/business/plan/setup.ts

@@ -52,11 +52,16 @@ export function getPlanStatusName(hedgeplanstatus: number): string{
 /************** 接口相关提示 **************** /
  *
  */
-// 操作类型-1:保存草稿2:提交申请3:审核通过4:审核拒绝5:撤回
+// 操作类型-1:保存草稿2:提交申请3:删除4审核通过5审核拒绝
 export const hedgePlanSign = new Map<number, ResultInfo>([
     [1, ['保存草稿成功', '保存草稿失败:']],
     [2, ['提交申请成功', '提交申请失败:']],
-    [3, ['审核通过', '审核失败:']],
-    [4, ['审核拒绝成功', '审核拒绝失败:']],
-    [5, ['撤回成功', '撤回失败:']],
+    [3, ['删除成功', '删除失败:']],
+    [4, ['审核通过', '审核失败:']],
+    [5, ['审核拒绝成功', '审核拒绝失败:']],
+
+])
+
+export const deletePlanSign = new Map<number, ResultInfo>([
+    [5, ['撤销成功', '撤销失败:']],
 ])