Merge remote-tracking branch 'origin/master'

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

@@ -8,21 +8,24 @@
     <template #footer>
       <a-button key="submit"
                 class="cancelBtn"
-                @click="cancel">保存草稿
+                @click="submit(1)">保存草稿
       </a-button>
       <a-button key="submit"
                 type="primary"
                 :loading="loading"
-                @click="submit">提交审核</a-button>
+                @click="submit(2)">提交审核</a-button>
     </template>
     <a-form class="inlineForm"
-            ref="formRef">
+            ref="formRef"
+            :model="formState"
+            :rules="rules">
       <a-row :gutter="24">
         <a-col :span="12">
           <a-form-item label="计划类型"
-                       name="">
+                       name="ContractType">
             <a-select class="inlineFormSelect"
                       style="width: 200px"
+                      v-model:value="formState.ContractType"
                       placeholder="请选择计划类型">
               <a-select-option v-for="item in planTye"
                                :value="item.enumitemname"
@@ -34,17 +37,20 @@
         </a-col>
         <a-col :span="12">
           <a-form-item label="计划名称"
-                       name="">
+                       name="HedgePlanNo">
             <a-input class="dialogInput"
+                     v-model:value="formState.HedgePlanNo"
                      style="width: 200px"
                      placeholder="请输入计划名称" />
           </a-form-item>
         </a-col>
         <a-col :span="12">
           <a-form-item label="现货品种"
-                       name="">
+                       name="DeliveryGoodsID">
             <a-select class="inlineFormSelect"
                       style="width: 200px"
+                      v-model:value="formState.DeliveryGoodsID"
+                      @change="chooseMG"
                       placeholder="请选择现货品种">
               <a-select-option v-for="item in DGList"
                                :value="item.data.deliverygoodsid"
@@ -55,25 +61,76 @@
           </a-form-item>
         </a-col>
         <a-col :span="12">
+          <a-form-item label="品类"
+                       name="WRStandardID">
+            <a-select class="inlineFormSelect"
+                      style="width: 200px"
+                      v-model:value="formState.WRStandardID"
+                      placeholder="请选择品类">
+              <a-select-option v-for="item in gmlist"
+                               :value="item.wrstandardid"
+                               :key="item.wrstandardid">
+                {{item.wrstandardname}}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
           <a-form-item label="标仓系数"
                        name="">
-            <span class="white">1</span>
+            <a-input class="ConvertFactor"
+                     v-model:value="formState.ConvertFactor"
+                     readonly
+                     style="width: 200px"
+                     placeholder="请输入标仓系数" />
           </a-form-item>
         </a-col>
-        <a-col :span="24">
+        <a-col :span="12">
           <a-form-item label="计划量"
                        class="relative"
-                       name="">
+                       name="PlanQty">
             <a-input class="dialogInput"
                      style="width: 200px"
+                     v-model:value="formState.PlanQty"
                      placeholder="请输入计划量" />
           </a-form-item>
         </a-col>
+        <a-col :span="12">
+          <a-form-item label="交易用户"
+                       name="Tradeuserid">
+            <a-select class="inlineFormSelect"
+                      style="width: 200px"
+                      v-model:value="formState.Tradeuserid"
+                      placeholder="请选择交易用户">
+              <a-select-option v-for="item in traderList"
+                               :value="item.roleid"
+                               :key="item.roleid">
+                {{item.rolename}}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="结算币种"
+                       name="Currencyid">
+            <a-select class="inlineFormSelect"
+                      style="width: 200px"
+                      v-model:value="formState.Currencyid"
+                      placeholder="请选择结算币种">
+              <a-select-option v-for="item in priceTyep"
+                               :key="item.enumdicid"
+                               :value="item.enumdicid">
+                {{item.enumdicname}}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
         <a-col :span="24">
           <a-form-item label="备注"
                        class="relative"
-                       name="">
+                       name="Remark">
             <a-input class="dialogInput"
+                     v-model:value="formState.Remark"
                      style="width: 636px"
                      placeholder="请输入备注" />
           </a-form-item>
@@ -84,29 +141,52 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
+import { defineComponent, ref, toRaw } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { initData } from '@/common/methods/index';
-import { getSpotContractTypeEnumList } from '@/common/constants/enumsList';
+import { getPayCurrencyTypeEnumList, getSpotContractTypeEnumList } from '@/common/constants/enumsList';
 import { AllEnums } from '@/services/go/commonService/interface';
 import { getAllEnum } from '@/services/bus/allEnum';
-import { getMiddleGoodsD } from '../setup';
+import { getMiddleGoodsD, handleForm, handleTrader } from '../setup';
+import { ValidateErrorEntity } from 'ant-design-vue/lib/form/interface';
+import { FormState } from '@/views/information/spot-contract/components/interface';
+import { context } from 'ant-design-vue/lib/vc-image/src/PreviewGroup';
 
 export default defineComponent({
     name: 'add-custom',
     components: {},
-    setup() {
+    setup(props, context) {
         const { visible, cancel } = closeModal('plan_btn_add');
         const planTye = ref<AllEnums[]>(getSpotContractTypeEnumList());
         // const arr = getAllEnum().filter((e) => e.enumdicname === '销售');
         // console.log('arr', arr);
-        const { DGList, getDG } = getMiddleGoodsD();
+        // 品种、品类
+        const { DGList, getDG, gmlist, chooseMG } = getMiddleGoodsD();
+        // 交易用户
+        const { traderList, getRoleList } = handleTrader();
+        // 币种
+        const priceTyep = getPayCurrencyTypeEnumList();
+        // 表单
+        const { formRef, formState, rules } = handleForm();
         const loading = ref<boolean>(false);
-        function submit() {
-            cancel();
+        function submit(OperateType: 1 | 2) {
+            formRef.value
+                .validate()
+                .then(() => {
+                    const param = toRaw(formState);
+                    // addAction(param).then(() => {
+                    //     cancel();
+                    //     context.emit('refresh', true);
+                    // });
+                    console.log('param', param);
+                })
+                .catch((error: ValidateErrorEntity<FormState>) => {
+                    console.log('error', error);
+                });
         }
         initData(() => {
             getDG();
+            getRoleList();
         });
         return {
             visible,
@@ -115,6 +195,13 @@ export default defineComponent({
             loading,
             planTye,
             DGList,
+            gmlist,
+            chooseMG,
+            traderList,
+            priceTyep,
+            formRef,
+            formState,
+            rules,
         };
     },
 });

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

@@ -0,0 +1,25 @@
+export interface FormState {
+    // HedgePlanID: number // uint64 套保计划ID(601+Unix秒时间戳(10位)+xxxxxx)
+    HedgePlanNo: string // string 套保计划名称
+    ContractType: number | undefined// int32 计划类型-1:采购-1:销售
+    // AreaUserID?: number// uint64 机构ID
+    DeliveryGoodsID: number | undefined// uint64 现货品种ID
+    // ProductType?: number // int32 产品类型-1:标准仓单2:等标3:非标
+    // SpotGoodsDesc?: string // string 商品型号
+    PlanQty: string, // double 计划数量
+    ConvertFactor: number // double 标仓系数
+    // PlanTime?: string // string 计划时间
+    // TradeDate?: string // string 交易日(yyyyMMdd)
+    // ApplySrc?: number // int32 申请来源 - 1:管理端 2:终端
+    // ApplyId?: number // uint64 申请人
+    Remark: string // string 计划备注
+    OperateType: number // int32 操作类型-1:保存草稿2:提交申请
+    WRStandardID: number | undefined; // uint64 现货品类ID
+    // AccountID: number; // uint64 期货账户ID（默认为0，也可不传）
+    Tradeuserid: number | undefined; // uint64 交易用户ID
+    Currencyid: number | undefined; // uint64 结算币种ID
+    // Biztype: number; // uint64 业务类型 - 1:套保 2:套利 默认为 1
+    // auditid: number; // uint64 审核人
+    // auditsrc: number; // uint32 审核来源 - 1:管理端 2:终端
+    // auditremark: string; // string 审核备注
+}

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

@@ -1,11 +1,16 @@
 import { commonResultInfo, getRequestResultInfo } from "@/common/methods/request";
+import { validateCommon } from "@/common/setup/validate";
+import { QueryAccMgrLoginUser } from "@/services/go/ermcp/account";
+import { ErmcpLoginUserEx } from "@/services/go/ermcp/account/interface";
 import { QueryDeliveryGoodsDetail } from '@/services/go/ermcp/goodsInfo';
-import { ErmcpDeliveryGoodsDetailEx } from "@/services/go/ermcp/goodsInfo/interface";
+import { Ermcp3Wrstandard, ErmcpDeliveryGoodsDetailEx } from "@/services/go/ermcp/goodsInfo/interface";
 import { hedgePlanReq, oldHedgePlanReq } from "@/services/proto/hedgeplan";
 import { ErmcpHedgePlanReq, HedgePlanOperateReq } from "@/services/proto/hedgeplan/interface";
 import { deletePlanSign, hedgePlanSign } from "@/views/business/plan/setup";
 import { message } from "ant-design-vue";
-import { ref, Ref } from "vue";
+import { RuleObject } from "ant-design-vue/lib/form/interface";
+import { reactive, ref, Ref, UnwrapRef } from "vue";
+import { FormState } from "./interface";
 
 
 /**
@@ -36,7 +41,36 @@ export function cancelPlan(req: HedgePlanOperateReq, loading: Ref<boolean>): Pro
  * 表单
  */
 export function handleForm() {
+    const formRef = ref();
+    const formState: UnwrapRef<FormState> = reactive({
+        HedgePlanNo: '',// string 套保计划名称
+        ContractType: undefined,// int32 计划类型-1:采购-1:销售
+        DeliveryGoodsID: undefined,// uint64 现货品种ID
+        PlanQty: '', // double 计划数量
+        ConvertFactor: 1, // double 标仓系数
+        Remark: '', // string 计划备注
+        OperateType: 2, // int32 操作类型-1:保存草稿2:提交申请
+        WRStandardID: undefined, // uint64 现货品类ID
+        Tradeuserid: undefined, // uint64 交易用户ID
+        Currencyid: undefined, // uint64 结算币种ID
+    })
 
+    const v_ContractType = async (rule: RuleObject, value: number) => {
+        return validateCommon(value, '请选择计划类型');
+    };
+    const v_DeliveryGoodsID = async (rule: RuleObject, value: number) => {
+        return validateCommon(value, '请选择现货品种');
+    };
+    const v_Currencyid = async (rule: RuleObject, value: number) => {
+        return validateCommon(value, '请选择结算币种');
+    };
+    const rules = {
+        PlanQty: [{ required: true, message: '请输入计划数量', trigger: 'blur' }],
+        ContractType: [{ required: true, validator: v_ContractType, trigger: 'change' }],
+        DeliveryGoodsID: [{ required: true, validator: v_DeliveryGoodsID, trigger: 'change' }],
+        Currencyid: [{ required: true, validator: v_Currencyid, trigger: 'change' }],
+    }
+    return { formRef, formState, rules }
 }
 
 /**
@@ -45,6 +79,8 @@ export function handleForm() {
 export function getMiddleGoodsD() {
     // 现货品种列表
     const DGList = ref<ErmcpDeliveryGoodsDetailEx[]>([])
+    // 品类
+    const gmlist = ref<Ermcp3Wrstandard[]>([])
     // 获取品种数据
     function getDG() {
         QueryDeliveryGoodsDetail().then(res => {
@@ -53,7 +89,33 @@ export function getMiddleGoodsD() {
     }
     // 选中品种数据
     function chooseMG(id: number) {
+        const temp = DGList.value.find(e => e.data.deliverygoodsid === id)
+        gmlist.value = temp ? temp.gmlist : []
+    }
+    return { DGList, getDG, gmlist, chooseMG }
+}
 
+/**
+ * 交易用户
+ * @returns 
+ */
+export function handleTrader() {
+    // 交易用户
+    const traderList = ref<ErmcpLoginUserEx[]>([])
+    function getRoleList() {
+        QueryAccMgrLoginUser(2).then(res => {
+            const set = new Set<number>([])
+            traderList.value.length = 0;
+            res.forEach(e => {
+                const { roleid, rolename, accountstatus } = e;
+                if (accountstatus === 4) {  // 账户的状态 - 4 正常
+                    if (!set.has(roleid)) { // 去重
+                        set.add(roleid)
+                        traderList.value.push(e)
+                    }
+                }
+            })
+        }).catch(err => message.error(err))
     }
-    return { DGList, getDG }
+    return { traderList, getRoleList }
 }

src/views/information/account_info/compoments/check/index.vue

@@ -177,7 +177,7 @@ export default defineComponent({
         function refuseSubmit() {
             Modal.confirm({
                 title: '是否确认审核拒绝',
-                okText: '确认拒绝',
+                okText: '审核拒绝',
                 cancelText: '取消',
                 onOk() {
                     console.log('OK');

src/views/information/custom/compoments/check/index.vue

@@ -177,7 +177,7 @@ export default defineComponent({
         function refuseSubmit() {
             Modal.confirm({
                 title: '是否确认审核拒绝',
-                okText: '确认拒绝',
+                okText: '审核拒绝',
                 cancelText: '取消',
                 onOk() {
                     console.log('OK');

src/views/information/spot-contract/components/cancel/index.vue

@@ -205,7 +205,7 @@ export default defineComponent({
                 cancelText: '取消',
                 onOk() {
                     const params: SpotContractOperateReq = {
-                        SpotContractID: Long.fromString(props.selectedRow.spotcontractid),
+                        SpotContractID: props.selectedRow.spotcontractid,
                         OperateType: 5,
                         Remark: '',
                     };

src/views/information/spot-contract/components/check/index.vue

@@ -254,36 +254,36 @@ export default defineComponent({
         // 表单
         const { rules, formState, formRef } = handleForm();
         function submit() {
-            Modal.confirm({
-                title: '是否确认审核通过',
-                okText: '确认审核通过',
-                cancelText: '取消',
-                onOk() {
-                    formRef.value.validate().then(() => {
+            formRef.value.validate().then(() => {
+                Modal.confirm({
+                    title: '是否确认审核通过',
+                    okText: '审核通过',
+                    cancelText: '取消',
+                    onOk() {
                         const param = toRaw(formState);
 
                         const reqs: GldErmcpSpotContractOperateReq = {
                             SpotContractID: props.selectedRow.spotcontractid,
                             OperateType: 4,
                             Remark: param.Remark,
-                            Info: {BizType: props.selectedRow.biztype, CurrencyID: props.selectedRow.currencyid, ...param},
+                            Info: { BizType: props.selectedRow.biztype, CurrencyID: props.selectedRow.currencyid, ...param },
                         };
                         // 审核通过
                         orderContractControl(reqs, loading).then(() => {
                             cancel();
                             context.emit('refresh');
                         });
-                    });
-                },
-                onCancel() {
-                    console.log('Cancel');
-                },
+                    },
+                    onCancel() {
+                        console.log('Cancel');
+                    },
+                });
             });
         }
         function refuse() {
             Modal.confirm({
                 title: '是否确认审核拒绝',
-                okText: '确认审核拒绝',
+                okText: '审核拒绝',
                 cancelText: '取消',
                 onOk() {
                     const param = toRaw(formState);

src/views/manage/business-review/components/settlementAudit/index.vue

@@ -134,7 +134,7 @@ export default defineComponent({
         function pass() {
             Modal.confirm({
                 title: '是否确认审核通过',
-                okText: '确认审核通过',
+                okText: '审核通过',
                 cancelText: '取消',
                 onOk() {
                     const param: ContractOperateApplyReq = {
@@ -157,7 +157,7 @@ export default defineComponent({
         function refuse() {
             Modal.confirm({
                 title: '是否确认审核拒绝',
-                okText: '确认审核拒绝',
+                okText: '审核拒绝',
                 cancelText: '取消',
                 onOk() {
                     const param: ContractOperateApplyReq = {

src/views/manage/business-review/components/somepriceAudit/index.vue

@@ -1,121 +1,121 @@
 <template>
-    <!-- 点价审核-->
-    <a-modal  class="add-custom custom-detail"
-             title="点价审核"
-             v-model:visible="visible"
-             centered
-             :maskClosable="maskClosableFlag"
-             @cancel="cancel"
-             width="890px">
-        <template #footer>
-            <a-button key="submit"
-                      type="primary"
-                      :loading="loading"
-                      @click="cancel">关闭
-            </a-button>
-            <a-button key="submit"
-                      type="primary"
-                      :loading="loading"
-                      @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">
-            <fieldset class="formFieldSet">
-                <legend>合同基本信息</legend>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="合同编号">
-                            <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="点价类型">
-                            <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</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.sellusername) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="现货品种">
-                            <span class="white">{{ formatValue(selectedRow.buyusername) }}</span>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-            </fieldset>
-            <fieldset class="formFieldSet">
-                <legend>待审核登记信息</legend>
-                <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.wrstandardname) }}</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.sellusername) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="点价数量">
-                            <span class="white">{{ formatValue(selectedRow.pricedQty) }}</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.pricedPrice) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="登记时间">
-                            <span class="white">{{ formatValue(selectedRow.applytime) }}</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.auditname) }}</span>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-            </fieldset>
-        </a-form>
-    </a-modal>
+  <!-- 点价审核-->
+  <a-modal class="add-custom custom-detail"
+           title="点价审核"
+           v-model:visible="visible"
+           centered
+           :maskClosable="maskClosableFlag"
+           @cancel="cancel"
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="cancel">关闭
+      </a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @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">
+      <fieldset class="formFieldSet">
+        <legend>合同基本信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="合同编号">
+              <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="点价类型">
+              <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</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.sellusername) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="现货品种">
+              <span class="white">{{ formatValue(selectedRow.buyusername) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </fieldset>
+      <fieldset class="formFieldSet">
+        <legend>待审核登记信息</legend>
+        <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.wrstandardname) }}</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.sellusername) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="点价数量">
+              <span class="white">{{ formatValue(selectedRow.pricedQty) }}</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.pricedPrice) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="登记时间">
+              <span class="white">{{ formatValue(selectedRow.applytime) }}</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.auditname) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </fieldset>
+    </a-form>
+  </a-modal>
 </template>
 
 <script lang="ts">
-import {defineComponent, PropType, ref, toRaw} from 'vue';
-import {closeModal} from '@/common/setup/modal/index';
-import {QueryCustomInfoType} from '@/services/go/ermcp/customInfo/interface';
-import {getStatusName} from '@/views/information/custom/setup';
-import {formatValue, formatTime} from '@/common/methods';
-import {getPriceTypeName} from "@/views/business/purchase/setup";
-import {Modal} from "ant-design-vue";
-import {somePriceControl} from "@/views/manage/business-review/components/setup";
-import {ContractOperateApplyReq} from "@/services/proto/contract/interface";
-import * as Long from "long";
-import {QryBusinessDjRsp} from "@/services/go/ermcp/business-review/interface";
+import { defineComponent, PropType, ref, toRaw } from 'vue';
+import { closeModal } from '@/common/setup/modal/index';
+import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
+import { getStatusName } from '@/views/information/custom/setup';
+import { formatValue, formatTime } from '@/common/methods';
+import { getPriceTypeName } from '@/views/business/purchase/setup';
+import { Modal } from 'ant-design-vue';
+import { somePriceControl } from '@/views/manage/business-review/components/setup';
+import { ContractOperateApplyReq } from '@/services/proto/contract/interface';
+import * as Long from 'long';
+import { QryBusinessDjRsp } from '@/services/go/ermcp/business-review/interface';
 
 export default defineComponent({
     name: 'business_review_someprice_audit',
@@ -127,28 +127,26 @@ export default defineComponent({
         },
     },
     setup(props, context) {
-        const {visible, cancel} = closeModal('business_review_someprice_audit');
+        const { visible, cancel } = closeModal('business_review_someprice_audit');
         const loading = ref<boolean>(false);
         const maskClosableFlag = ref<boolean>(false);
         // 审核通过
         function pass() {
             Modal.confirm({
                 title: '是否确认审核通过',
-                okText: '确认审核通过',
+                okText: '审核通过',
                 cancelText: '取消',
                 onOk() {
                     const param: ContractOperateApplyReq = {
                         OperateApplyID: Long.fromString(props.selectedRow.operateapplyid),
                         OperateType: 2,
-                    }
+                    };
                     somePriceControl(param, loading)
-                        .then(res => {
+                        .then((res) => {
                             context.emit('refresh');
-                            cancel()
-                        })
-                        .catch(err => {
-
+                            cancel();
                         })
+                        .catch((err) => {});
                 },
                 onCancel() {
                     console.log('Cancel');
@@ -156,24 +154,22 @@ export default defineComponent({
             });
         }
         // 审核拒绝
-        function refuse(){
+        function refuse() {
             Modal.confirm({
                 title: '是否确认审核拒绝',
-                okText: '确认审核拒绝',
+                okText: '审核拒绝',
                 cancelText: '取消',
                 onOk() {
                     const param: ContractOperateApplyReq = {
                         OperateApplyID: Long.fromString(props.selectedRow.operateapplyid),
                         OperateType: 3,
-                    }
+                    };
                     somePriceControl(param, loading)
-                        .then(res => {
+                        .then((res) => {
                             context.emit('refresh');
-                            cancel()
-                        })
-                        .catch(err => {
-
+                            cancel();
                         })
+                        .catch((err) => {});
                 },
                 onCancel() {
                     console.log('Cancel');

src/views/manage/finance-review/components/fundsAudit/index.vue

@@ -8,21 +8,21 @@
            @cancel="cancel"
            width="890px">
     <template #footer>
-        <a-button key="submit"
-                  type="primary"
-                  :loading="loading"
-                  @click="cancel">关闭
-        </a-button>
-        <a-button key="submit"
-                  type="primary"
-                  :loading="loading"
-                  @click="pass">审核通过
-        </a-button>
-        <a-button key="submit"
-                  type="primary"
-                  :loading="loading"
-                  @click="refuse">审核拒绝
-        </a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="cancel">关闭
+      </a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="pass">审核通过
+      </a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="refuse">审核拒绝
+      </a-button>
     </template>
 
   </a-modal>
@@ -35,11 +35,11 @@ import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import { mergeObj } from '@/utils/objHandle';
 import { getStatusName } from '@/views/information/custom/setup';
 import { formatValue, formatTime } from '@/common/methods';
-import {QryBussinessKxRsp} from "@/services/go/ermcp/finance-review/interface";
-import {Modal} from "ant-design-vue";
-import {ContractOperateApplyReq} from "@/services/proto/contract/interface";
-import Long from "long";
-import {financeControl} from "@/views/manage/finance-review/components/setup";
+import { QryBussinessKxRsp } from '@/services/go/ermcp/finance-review/interface';
+import { Modal } from 'ant-design-vue';
+import { ContractOperateApplyReq } from '@/services/proto/contract/interface';
+import Long from 'long';
+import { financeControl } from '@/views/manage/finance-review/components/setup';
 
 export default defineComponent({
     name: 'finance_review_funds_audit',
@@ -65,21 +65,19 @@ export default defineComponent({
         function pass() {
             Modal.confirm({
                 title: '是否确认审核通过',
-                okText: '确认审核通过',
+                okText: '审核通过',
                 cancelText: '取消',
                 onOk() {
                     const param: ContractOperateApplyReq = {
                         OperateApplyID: Long.fromString(props.selectedRow.operateapplyid),
                         OperateType: 2,
-                    }
+                    };
                     financeControl(param, loading)
-                        .then(res => {
+                        .then((res) => {
                             context.emit('refresh');
-                            cancel()
-                        })
-                        .catch(err => {
-
+                            cancel();
                         })
+                        .catch((err) => {});
                 },
                 onCancel() {
                     console.log('Cancel');
@@ -87,24 +85,22 @@ export default defineComponent({
             });
         }
         // 审核拒绝
-        function refuse(){
+        function refuse() {
             Modal.confirm({
                 title: '是否确认审核拒绝',
-                okText: '确认审核拒绝',
+                okText: '审核拒绝',
                 cancelText: '取消',
                 onOk() {
                     const param: ContractOperateApplyReq = {
                         OperateApplyID: Long.fromString(props.selectedRow.operateapplyid),
                         OperateType: 3,
-                    }
+                    };
                     financeControl(param, loading)
-                        .then(res => {
+                        .then((res) => {
                             context.emit('refresh');
-                            cancel()
-                        })
-                        .catch(err => {
-
+                            cancel();
                         })
+                        .catch((err) => {});
                 },
                 onCancel() {
                     console.log('Cancel');

src/views/manage/finance-review/components/invoiceAudit/index.vue

@@ -130,7 +130,7 @@ export default defineComponent({
         function pass() {
             Modal.confirm({
                 title: '是否确认审核通过',
-                okText: '确认审核通过',
+                okText: '审核通过',
                 cancelText: '取消',
                 onOk() {
                     const param: ContractOperateApplyReq = {
@@ -153,7 +153,7 @@ export default defineComponent({
         function refuse() {
             Modal.confirm({
                 title: '是否确认审核拒绝',
-                okText: '确认审核拒绝',
+                okText: '审核拒绝',
                 cancelText: '取消',
                 onOk() {
                     const param: ContractOperateApplyReq = {

src/views/manage/inventory-review/components/checkinAudit/index.vue

@@ -192,7 +192,7 @@ export default defineComponent({
         function pass() {
             Modal.confirm({
                 title: '是否确认审核通过',
-                okText: '确认审核通过',
+                okText: '审核通过',
                 cancelText: '取消',
                 onOk() {
                     const param: AreaInOutApplyAuditPassReq = {
@@ -216,7 +216,7 @@ export default defineComponent({
         function refuse() {
             Modal.confirm({
                 title: '是否确认审核拒绝',
-                okText: '确认审核拒绝',
+                okText: '审核拒绝',
                 cancelText: '取消',
                 onOk() {
                     const param: AuditERMCPAreaInOutStockApplyReq = {

src/views/manage/inventory-review/components/checkoutAudit/index.vue

@@ -186,7 +186,7 @@ export default defineComponent({
         function pass() {
             Modal.confirm({
                 title: '是否确认审核通过',
-                okText: '确认审核通过',
+                okText: '审核通过',
                 cancelText: '取消',
                 onOk() {
                     const param: AreaInOutApplyAuditPassReq = {
@@ -210,7 +210,7 @@ export default defineComponent({
         function refuse() {
             Modal.confirm({
                 title: '是否确认审核拒绝',
-                okText: '确认审核拒绝',
+                okText: '审核拒绝',
                 cancelText: '取消',
                 onOk() {
                     const param: AuditERMCPAreaInOutStockApplyReq = {