修改现货合同

src/common/setup/user/index.ts

@@ -22,9 +22,10 @@ export function handlerManagerList(loading: Ref<boolean>, type: 1 | 2 | 3, isFil
      * @param code 
      * @returns 
      */
-    function findManagerName(code: string) {
+    function findManagerName(code: string, arr?: ErmcpLoginUserEx[]) {
         let result = code
-        tableList.value.forEach(el => {
+        const temp = arr ? arr : tableList.value
+        temp.forEach(el => {
             el.userlist.forEach(e => {
                 const { accountname, logincode } = e
                 if (logincode === code) {

src/views/information/account_info/compoments/add-futures-son/index.vue

@@ -1,117 +0,0 @@
-<template>
-  <a-modal class="commonModal add-futures-son"
-           title="新增期货子账户"
-           v-model:visible="visible"
-           @cancel="cancel"
-           centered
-           :maskClosable="false"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="submit">完成</a-button>
-    </template>
-    <a-form class="inlineForm"
-            ref="formRef"
-            :model="formState"
-            :rules="rules">
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="所属期货账户"
-                       name="userinfotype">
-            <span class="white">王小小/824327648</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="账户名称"
-                       name="">
-            <a-input class="dialogInput"
-                     style="width: 200px"
-                     placeholder="请输入账户名称" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="期货保证金"
-                       name="">
-            <a-input class="dialogInput"
-                     style="width: 200px"
-                     placeholder="请输入期货保证金" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="期货手续费"
-                       name="">
-            <a-select class="inlineFormSelect"
-                      style="width: 200px"
-                      placeholder="请选择期货手续费">
-              <a-select-option value="权限一">权限一</a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-      </a-row>
-    </a-form>
-  </a-modal>
-</template>
-
-<script lang="ts">
-import { closeModal } from '@/common/setup/modal/index';
-import { initData } from '@/common/methods/index';
-import { defineComponent, ref, reactive, toRaw, UnwrapRef } from 'vue';
-import { AllEnums } from '@/services/go/commonService/interface';
-import { RuleObject, ValidateErrorEntity } from 'ant-design-vue/es/form/interface';
-
-export default defineComponent({
-    name: 'add-custom',
-    components: {},
-    setup() {
-        // 控制关闭弹窗
-        const { visible, cancel } = closeModal('account_info_business_btn_add');
-        // 证件类型
-        // const cardTypeList = ref<AllEnums[]>(getCardType());
-        // // 表单
-        // const formRef = ref();
-        // const formState: UnwrapRef<FormState> = reactive(initFormState());
-        // const rules = {
-        //     userinfotype: [{ required: true, message: '请选择客户类型', trigger: 'change' }],
-        //     customername: [{ required: true, message: '请输入企业名称', trigger: 'blur' }],
-        //     nickname: [{ required: true, message: '请输入企业简称', trigger: 'blur' }],
-        //     cardtype: [{ required: true, message: '请选择证件类型', trigger: 'change' }],
-        // };
-        // // 下单方法
-        // const { loading, applyAction } = handleApply();
-        // function isPersonal(): boolean {
-        //     return formState.userinfotype === '1';
-        // }
-        // function submit() {
-        //     formRef.value
-        //         .validate()
-        //         .then(() => {
-        //             const param = toRaw(formState);
-        //             applyAction(param);
-        //             console.log('values', formState);
-        //         })
-        //         .catch((error: ValidateErrorEntity<FormState>) => {
-        //             console.log('error', error);
-        //         });
-        // }
-        return {
-            // formState,
-            // rules,
-            // formRef,
-            // cardTypeList,
-            // isPersonal,
-            visible,
-            cancel,
-            // submit,
-            // loading,
-        };
-    },
-});
-</script>
-
-<style lang="less">
-.add-futures-son {
-}
-</style
->;

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

@@ -16,161 +16,7 @@
                 :loading="loading"
                 @click="submit">确认撤销</a-button>
     </template>
-    <a-form class="inlineForm">
-      <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">{{ getContractTypeName(selectedRow.contracttype) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="业务类型">
-              <span class="white">{{ getBizTypeName(selectedRow.biztype) }}</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>
-        <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.contracctstatus) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="状态">
-              <span class="yellow">{{ formatValue(getContractStatusName(selectedRow.contracctstatus)) }}</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.brandname) }}</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.spotgoodsdesc) }}</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">{{ getPriceTypeName(formatValue(selectedRow.pricetype)) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="数量">
-              <span class="white">{{ formatValue(selectedRow.qty) }}</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.goodscode) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="升贴水">
-              <span class="white">{{ formatValue(selectedRow.pricemove) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="点价期">
-              <span class="white">{{ formatValue(formatTime(selectedRow.startdate, "d") + '--' + formatTime(selectedRow.enddate, "d")) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="交收期">
-              <span class="white">{{ formatValue(formatTime(selectedRow.deliverystartdate, "d") + '--' + formatTime(selectedRow.deliveryenddate, "d"))}}</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.contractmargin) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="业务员">
-              <span class="white">{{ formatValue(selectedRow.saleuserlogincode) }}</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.meruserlogincode) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="期货账户">
-              <span class="white">{{ formatValue(selectedRow.accountid) }}</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-form>
+    <InfoDetail :selectedRow="selectedRow" />
   </a-modal>
 </template>
 
@@ -178,16 +24,14 @@
 import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
-import { formatTime, formatValue } from '@/common/methods';
-import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
-import { message, Modal } from 'ant-design-vue';
+import { Modal } from 'ant-design-vue';
 import { orderContractOperateControl } from '@/views/information/spot-contract/components/setup';
 import { SpotContractOperateReq } from '@/services/proto/spotcontract/interface';
-import Long from 'long';
+import InfoDetail from '../infoDetail/index.vue';
 
 export default defineComponent({
     name: 'spot-contract-detail',
-    components: {},
+    components: { InfoDetail },
     props: {
         selectedRow: {
             type: Object as PropType<Ermcp3ContractRsp>,
@@ -229,12 +73,6 @@ export default defineComponent({
             submit,
             loading,
             maskClosableFlag,
-            formatValue,
-            getPriceTypeName,
-            getContractStatusName,
-            formatTime,
-            getContractTypeName,
-            getBizTypeName,
         };
     },
 });

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

@@ -16,161 +16,7 @@
                 :loading="loading"
                 @click="submit">确认删除</a-button>
     </template>
-    <a-form class="inlineForm">
-      <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">{{ getContractTypeName(selectedRow.contracttype) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="业务类型">
-              <span class="white">{{ getBizTypeName(selectedRow.biztype) }}</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>
-        <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.contracctstatus) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="状态">
-              <span class="yellow">{{ formatValue(getContractStatusName(selectedRow.contracctstatus)) }}</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.brandname) }}</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.spotgoodsdesc) }}</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">{{ getPriceTypeName(formatValue(selectedRow.pricetype)) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="数量">
-              <span class="white">{{ formatValue(selectedRow.qty) }}</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.goodscode) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="升贴水">
-              <span class="white">{{ formatValue(selectedRow.pricemove) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="点价期">
-              <span class="white">{{ formatValue(formatTime(selectedRow.startdate, "d") + '--' + formatTime(selectedRow.enddate, "d")) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="交收期">
-              <span class="white">{{ formatValue(formatTime(selectedRow.deliverystartdate, "d") + '--' + formatTime(selectedRow.deliveryenddate, "d"))}}</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.contractmargin) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="业务员">
-              <span class="white">{{ formatValue(selectedRow.saleuserlogincode) }}</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.meruserlogincode) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="期货账户">
-              <span class="white">{{ formatValue(selectedRow.accountid) }}</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-form>
+    <InfoDetail :selectedRow="selectedRow" />
   </a-modal>
 </template>
 
@@ -178,16 +24,16 @@
 import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
-import { formatTime, formatValue } from '@/common/methods';
-import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
-import { message, Modal } from 'ant-design-vue';
+import { Modal } from 'ant-design-vue';
 import { orderContractControl } from '@/views/information/spot-contract/components/setup';
 import { GldErmcpSpotContractOperateReq } from '@/services/proto/spotcontract/interface';
-import Long from 'long';
+import InfoDetail from '../infoDetail/index.vue';
 
 export default defineComponent({
     name: 'delete-spot-contract',
-    components: {},
+    components: {
+        InfoDetail,
+    },
     props: {
         selectedRow: {
             type: Object as PropType<Ermcp3ContractRsp>,
@@ -198,6 +44,7 @@ export default defineComponent({
         const { visible, cancel } = closeModal('spot_contract_btn_delete');
         const loading = ref<boolean>(false);
         const maskClosableFlag = ref<boolean>(false);
+        // 获取 业务账户
         function submit() {
             Modal.confirm({
                 title: '是否确认删除',
@@ -229,12 +76,6 @@ export default defineComponent({
             submit,
             loading,
             maskClosableFlag,
-            formatValue,
-            getPriceTypeName,
-            getContractStatusName,
-            formatTime,
-            getContractTypeName,
-            getBizTypeName,
         };
     },
 });

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

@@ -29,162 +29,8 @@
       <a-tab-pane key="7"
                   tab="变更记录"></a-tab-pane>
     </a-tabs>
-    <a-form class="inlineForm"
-            v-if="activeKey == 1">
-      <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">{{ getContractTypeName(selectedRow.contracttype) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="业务类型">
-              <span class="white">{{ getBizTypeName(selectedRow.biztype) }}</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>
-        <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.contracctstatus) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="状态">
-              <span class="yellow">{{ formatValue(getContractStatusName(selectedRow.contracctstatus)) }}</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.brandname) }}</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.spotgoodsdesc) }}</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">{{ getPriceTypeName(formatValue(selectedRow.pricetype)) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="数量">
-              <span class="white">{{ formatValue(selectedRow.qty) }}</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.goodscode) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="升贴水">
-              <span class="white">{{ formatValue(selectedRow.pricemove) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="点价期">
-              <span class="white">{{ formatValue(formatTime(selectedRow.startdate, "d") + '--' + formatTime(selectedRow.enddate, "d")) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="交收期">
-              <span class="white">{{ formatValue(formatTime(selectedRow.deliverystartdate, "d") + '--' + formatTime(selectedRow.deliveryenddate, "d"))}}</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.contractmargin) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="业务员">
-              <span class="white">{{ formatValue(findManagerName(selectedRow.saleuserlogincode)) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="跟单员">
-              <span class="white">{{ formatValue(findManagerName(selectedRow.meruserlogincode)) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="期货账户">
-              <span class="white">{{ formatValue(selectedRow.accountid) }}</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-form>
+    <InfoDetail :selectedRow="selectedRow"
+                v-if="activeKey == 1" />
     <div class="tableDatas"
          v-if="activeKey == 2">
       <a-table class="dialogTable"
@@ -201,37 +47,36 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, reactive, ref } from 'vue';
+import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
-import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
-import {Ermcp3ContractRsp, QueryChangeLogReq} from '@/services/go/ermcp/spot-contract/interface';
-import { getStatusName } from '@/common/constants/enumsName';
-import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
-import { formatValue, formatTime } from '@/common/methods/format';
-import { v4 as uuidv4 } from 'uuid';
-import {requestResultLoadingAndInfo} from "@/common/methods/request/resultInfo";
-import {QueryAddUserInfoApply} from "@/services/go/ermcp/customInfo";
-import {QueryBusinessFp, QueryBusinessKx} from "@/services/go/ermcp/finance-review";
-import {QueryBusinessFpReq, QueryBusinessKxReq} from "@/services/go/ermcp/finance-review/interface";
-import {QueryBusinessDj, QueryBusinessJs} from "@/services/go/ermcp/business-review";
-import {QueryBusinessDjReq, QueryBusinessJsReq} from "@/services/go/ermcp/business-review/interface";
-import {QueryAreaStockApply} from "@/services/go/ermcp/inventory-review";
-import {QueryAreaStockApplyReq} from "@/services/go/ermcp/inventory-review/interface";
-import {QueryChangeLog} from "@/services/go/ermcp/spot-contract";
-import * as Long from "long";
-import {handlerManagerList} from "@/common/setup/user";
+import { Ermcp3ContractRsp, QueryChangeLogReq } from '@/services/go/ermcp/spot-contract/interface';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { QueryBusinessFp, QueryBusinessKx } from '@/services/go/ermcp/finance-review';
+import { QueryBusinessFpReq, QueryBusinessKxReq } from '@/services/go/ermcp/finance-review/interface';
+import { QueryBusinessDj, QueryBusinessJs } from '@/services/go/ermcp/business-review';
+import { QueryBusinessDjReq, QueryBusinessJsReq } from '@/services/go/ermcp/business-review/interface';
+import { QueryAreaStockApply } from '@/services/go/ermcp/inventory-review';
+import { QueryAreaStockApplyReq } from '@/services/go/ermcp/inventory-review/interface';
+import { QueryChangeLog } from '@/services/go/ermcp/spot-contract';
+import { handlerManagerList } from '@/common/setup/user';
+import { ErmcpLoginUserEx } from '@/services/go/ermcp/account/interface';
+import InfoDetail from '../infoDetail/index.vue';
 
 export default defineComponent({
     name: 'spot-contract-detail',
-    components: {},
+    components: { InfoDetail },
     props: {
         selectedRow: {
             type: Object as PropType<Ermcp3ContractRsp>,
             default: {},
         },
+        businessManager: {
+            type: Array as PropType<ErmcpLoginUserEx[]>,
+            default: [],
+        },
     },
-    setup: function (props, context) {
-        const {visible, cancel} = closeModal('detail');
+    setup: function(props, context) {
+        const { visible, cancel } = closeModal('detail');
         const loading = ref<boolean>(false);
         const maskClosableFlag = ref<boolean>(false);
         // 获取 业务账户
@@ -241,66 +86,65 @@ export default defineComponent({
             cancel();
 
             let kxParam: QueryBusinessKxReq = {
-                relatedid: props.selectedRow.spotcontractid
-            }
+                relatedid: props.selectedRow.spotcontractid,
+            };
             requestResultLoadingAndInfo(QueryBusinessKx, kxParam, loading, ['款项记录请求成功', '款项记录请求失败:']).then((res) => {
-                console.log("款项记录请求成功:  \n")
-                console.log(res)
+                console.log('款项记录请求成功:  \n');
+                console.log(res);
                 cancel();
                 context.emit('refresh');
             });
 
             let jsParam: QueryBusinessJsReq = {
-                relatedid: props.selectedRow.spotcontractid
-            }
+                relatedid: props.selectedRow.spotcontractid,
+            };
             requestResultLoadingAndInfo(QueryBusinessJs, jsParam, loading, ['交收记录请求成功', '交收记录请求失败:']).then((res) => {
-                console.log("交收记录请求成功:  \n")
-                console.log(res)
+                console.log('交收记录请求成功:  \n');
+                console.log(res);
                 cancel();
                 context.emit('refresh');
             });
 
             let fpParam: QueryBusinessFpReq = {
-                relatedid: props.selectedRow.spotcontractid
-            }
+                relatedid: props.selectedRow.spotcontractid,
+            };
             requestResultLoadingAndInfo(QueryBusinessFp, fpParam, loading, ['发票记录请求成功', '发票记录请求失败:']).then((res) => {
-                console.log("发票记录请求成功:  \n")
-                console.log(res)
+                console.log('发票记录请求成功:  \n');
+                console.log(res);
                 cancel();
                 context.emit('refresh');
             });
 
             let djParam: QueryBusinessDjReq = {
-                relatedid: props.selectedRow.spotcontractid
-            }
+                relatedid: props.selectedRow.spotcontractid,
+            };
             requestResultLoadingAndInfo(QueryBusinessDj, djParam, loading, ['点价记录请求成功', '点价记录请求失败:']).then((res) => {
-                console.log("点价记录请求成功:  \n")
-                console.log(res)
+                console.log('点价记录请求成功:  \n');
+                console.log(res);
                 cancel();
                 context.emit('refresh');
             });
 
             let StockParam: QueryAreaStockApplyReq = {
                 spotcontractid: props.selectedRow.spotcontractid,
-                inouttype: '1,3'
-            }
+                inouttype: '1,3',
+            };
             requestResultLoadingAndInfo(QueryAreaStockApply, StockParam, loading, ['入库记录请求成功', '入库记录请求失败:']).then((res) => {
-                console.log("入库记录请求成功:  \n")
-                console.log(res)
+                console.log('入库记录请求成功:  \n');
+                console.log(res);
                 cancel();
                 context.emit('refresh');
             });
 
             let changParam: QueryChangeLogReq = {
-                RelatedId: props.selectedRow.spotcontractid
-            }
+                RelatedId: props.selectedRow.spotcontractid,
+            };
             requestResultLoadingAndInfo(QueryChangeLog, changParam, loading, ['变更记录请求成功', '变更记录请求失败:']).then((res) => {
-                console.log("变更记录请求成功:  /n")
-                console.log(res)
+                console.log('变更记录请求成功:  /n');
+                console.log(res);
                 cancel();
                 context.emit('refresh');
             });
-
         }
 
         const columns = [
@@ -363,7 +207,7 @@ export default defineComponent({
                 dataIndex: 'status',
                 key: 'status',
                 align: 'center',
-                slots: {customRender: 'status'},
+                slots: { customRender: 'status' },
             },
         ];
 
@@ -400,17 +244,10 @@ export default defineComponent({
             cancel,
             submit,
             loading,
-            formatValue,
-            getContractStatusName,
-            getPriceTypeName,
-            formatTime,
             maskClosableFlag,
-            getContractTypeName,
-            getBizTypeName,
             activeKey: ref('1'),
             columns,
             data,
-            findManagerName,
         };
     },
 });

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

@@ -16,177 +16,22 @@
                 :loading="loading"
                 @click="submit">确认完结</a-button>
     </template>
-    <a-form class="inlineForm">
-      <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">{{ getContractTypeName(selectedRow.contracttype) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="业务类型">
-              <span class="white">{{ getBizTypeName(selectedRow.biztype) }}</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>
-        <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.contracctstatus) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="状态">
-              <span class="yellow">{{ formatValue(getContractStatusName(selectedRow.contracctstatus)) }}</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.brandname) }}</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.spotgoodsdesc) }}</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">{{ getPriceTypeName(formatValue(selectedRow.pricetype)) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="数量">
-              <span class="white">{{ formatValue(selectedRow.qty) }}</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.goodscode) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="升贴水">
-              <span class="white">{{ formatValue(selectedRow.pricemove) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="点价期">
-              <span class="white">{{ formatValue(formatTime(selectedRow.startdate, "d") + '--' + formatTime(selectedRow.enddate, "d")) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="交收期">
-              <span class="white">{{ formatValue(formatTime(selectedRow.deliverystartdate, "d") + '--' + formatTime(selectedRow.deliveryenddate, "d"))}}</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.contractmargin) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="业务员">
-              <span class="white">{{ formatValue(selectedRow.saleuserlogincode) }}</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.meruserlogincode) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="期货账户">
-              <span class="white">{{ formatValue(selectedRow.accountid) }}</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-form>
+    <InfoDetail :selectedRow="selectedRow" />
   </a-modal>
 </template>
 
 <script lang="ts">
 import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
-import { formatTime, formatValue } from '@/common/methods';
-import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
 import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
 import { orderContractOperateControl } from '@/views/information/spot-contract/components/setup';
 import { Modal } from 'ant-design-vue';
 import { SpotContractOperateReq } from '@/services/proto/spotcontract/interface';
+import InfoDetail from '../infoDetail/index.vue';
 
 export default defineComponent({
     name: 'spot-contract-finish',
-    components: {},
+    components: { InfoDetail },
     props: {
         selectedRow: {
             type: Object as PropType<Ermcp3ContractRsp>,
@@ -229,12 +74,6 @@ export default defineComponent({
             submit,
             loading,
             maskClosableFlag,
-            formatValue,
-            getPriceTypeName,
-            getContractStatusName,
-            formatTime,
-            getContractTypeName,
-            getBizTypeName,
         };
     },
 });

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

@@ -0,0 +1,202 @@
+<template>
+  <a-form :loading="loading"
+          class="inlineForm">
+    <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">{{ getContractTypeName(selectedRow.contracttype) }}</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="业务类型">
+            <span class="white">{{ getBizTypeName(selectedRow.biztype) }}</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>
+      <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.contracctstatus) }}</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="状态">
+            <span class="yellow">{{ formatValue(getContractStatusName(selectedRow.contracctstatus)) }}</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.brandname) }}</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.spotgoodsdesc) }}</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">{{ getPriceTypeName(formatValue(selectedRow.pricetype)) }}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="数量">
+            <span class="white">{{ formatValue(selectedRow.qty) }}</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.goodscode) }}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="升贴水">
+            <span class="white">{{ formatValue(selectedRow.pricemove) }}</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="点价期">
+            <span class="white">{{ formatValue(formatTime(selectedRow.startdate, "d") + '--' + formatTime(selectedRow.enddate, "d")) }}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="交收期">
+            <span class="white">{{ formatValue(formatTime(selectedRow.deliverystartdate, "d") + '--' + formatTime(selectedRow.deliveryenddate, "d"))}}</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.contractmargin) }}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="业务员">
+            <span class="white">{{ formatValue(findManagerName(selectedRow.saleuserlogincode, businessManager) ) }}</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="跟单员">
+            <span class="white">{{ formatValue(findManagerName(selectedRow.meruserlogincode, businessManager) ) }}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="期货账户">
+            <span class="white">{{ formatValue(selectedRow.accountid) }}</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-form>
+</template>
+
+<script lang="ts">
+import { defineComponent, PropType, ref } from 'vue';
+import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
+import { formatTime, formatValue } from '@/common/methods';
+import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
+import { handlerManagerList } from '@/common/setup/user';
+
+export default defineComponent({
+    name: 'spot-contract-info-detail',
+    components: {},
+    props: {
+        selectedRow: {
+            type: Object as PropType<Ermcp3ContractRsp>,
+            default: {},
+        },
+    },
+    setup(props, context) {
+        const loading = ref<boolean>(false);
+        // 获取 业务账户
+        const { findManagerName } = handlerManagerList(loading, 1);
+        return {
+            loading,
+            formatValue,
+            getPriceTypeName,
+            getContractStatusName,
+            formatTime,
+            getContractTypeName,
+            getBizTypeName,
+            findManagerName,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+.custom-detail {
+    .upload {
+        .look {
+            margin-left: 0;
+        }
+    }
+}
+</style>;

src/views/information/spot-contract/list/checkpending/index.vue

@@ -49,25 +49,27 @@
                         formatTime(record.deliveryenddate, "d")) }}</a>
         </template>
         <!-- 业务员 -->
-          <template #saleuserlogincode="{ record }">
-              <a>{{ findManagerName(record.saleuserlogincode) }}</a>
-          </template>
+        <template #saleuserlogincode="{ record }">
+          <a>{{ findManagerName(record.saleuserlogincode) }}</a>
+        </template>
 
         <!-- 跟单员 -->
-          <template #meruserlogincode="{ record }">
-              <a>{{ findManagerName(record.meruserlogincode) }}</a>
-          </template>
+        <template #meruserlogincode="{ record }">
+          <a>{{ findManagerName(record.meruserlogincode) }}</a>
+        </template>
 
       </a-table>
     </contextMenu>
     <!-- 现货合同: 详情 -->
     <SpotContractDeatil :selectedRow="selectedRow"
+                        :businessManager="businessManager"
                         @refresh="queryTable" />
     <!-- 现货合同: 审核 -->
     <Check :selectedRow="selectedRow"
            @refresh="queryTable" />
     <!-- 现货合同: 撤销 -->
     <Cancel :selectedRow="selectedRow"
+            :businessManager="businessManager"
             @refresh="queryTable" />
   </div>
 </template>
@@ -102,7 +104,7 @@ export default defineComponent({
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList(2);
         // 获取 业务账户
-        const { queryTable: queryBusinessManager, findManagerName } = handlerManagerList(loading, 1);
+        const { tableList: businessManager, queryTable: queryBusinessManager, findManagerName } = handlerManagerList(loading, 1);
         // 查询
         function search(value: any) {
             filteredInfo.value = value;
@@ -149,6 +151,7 @@ export default defineComponent({
             formatTime,
             formatValue,
             findManagerName,
+            businessManager,
         };
     },
 });

src/views/information/spot-contract/list/finished/index.vue

@@ -48,29 +48,28 @@
                         formatTime(record.deliveryenddate, "d")) }}</a>
         </template>
 
-          <!-- 业务员 -->
-          <template #saleuserlogincode="{ record }">
-              <a>{{ findManagerName(record.saleuserlogincode) }}</a>
-          </template>
+        <!-- 业务员 -->
+        <template #saleuserlogincode="{ record }">
+          <a>{{ findManagerName(record.saleuserlogincode) }}</a>
+        </template>
 
-          <!-- 跟单员 -->
-          <template #meruserlogincode="{ record }">
-              <a>{{ findManagerName(record.meruserlogincode) }}</a>
-          </template>
+        <!-- 跟单员 -->
+        <template #meruserlogincode="{ record }">
+          <a>{{ findManagerName(record.meruserlogincode) }}</a>
+        </template>
 
       </a-table>
     </contextMenu>
-    <!-- 新增现货合同 -->
-    <AddSpotContract @refresh="queryTable" />
     <!-- 现货合同: 详情 -->
     <SpotContractDeatil :selectedRow="selectedRow"
+                        :businessManager="businessManager"
                         @refresh="queryTable" />
   </div>
 </template>
 
 <script lang="ts">
 import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
-import { AddSpotContract, SpotContractDeatil, filterCustomTable } from '../../components';
+import { SpotContractDeatil, filterCustomTable } from '../../components';
 
 import { queryTableList, Ermcp3ContractRsp } from '../index';
 import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
@@ -83,7 +82,6 @@ export default defineComponent({
     components: {
         filterCustomTable,
         contextMenu,
-        AddSpotContract,
         SpotContractDeatil,
         BtnList,
     },
@@ -98,7 +96,7 @@ export default defineComponent({
         const { loading, tableList, queryTable } = queryTableList(4);
 
         // 获取 业务账户
-        const { queryTable: queryBusinessManager, findManagerName } = handlerManagerList(loading, 1);
+        const { tableList: businessManager, queryTable: queryBusinessManager, findManagerName } = handlerManagerList(loading, 1);
         // 查询
         function search(value: any) {
             filteredInfo.value = value;
@@ -144,6 +142,7 @@ export default defineComponent({
             formatTime,
             formatValue,
             findManagerName,
+            businessManager,
         };
     },
 });

src/views/information/spot-contract/list/performance/index.vue

@@ -48,22 +48,24 @@
           <a>{{ formatValue(formatTime(record.deliverystartdate, "d") + '--' +
                         formatTime(record.deliveryenddate, "d")) }}</a>
         </template>
-          <!-- 业务员 -->
-          <template #saleuserlogincode="{ record }">
-              <a>{{ findManagerName(record.saleuserlogincode) }}</a>
-          </template>
+        <!-- 业务员 -->
+        <template #saleuserlogincode="{ record }">
+          <a>{{ findManagerName(record.saleuserlogincode) }}</a>
+        </template>
 
-          <!-- 跟单员 -->
-          <template #meruserlogincode="{ record }">
-              <a>{{ findManagerName(record.meruserlogincode) }}</a>
-          </template>
+        <!-- 跟单员 -->
+        <template #meruserlogincode="{ record }">
+          <a>{{ findManagerName(record.meruserlogincode) }}</a>
+        </template>
       </a-table>
     </contextMenu>
     <!-- 现货合同: 详情 -->
     <SpotContractDeatil :selectedRow="selectedRow"
+                        :businessManager="businessManager"
                         @refresh="queryTable" />
     <!-- 现货合同: 正常完结 -->
     <Finish :selectedRow="selectedRow"
+            :businessManager="businessManager"
             @refresh="queryTable" />
   </div>
 </template>
@@ -98,7 +100,7 @@ export default defineComponent({
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList(3);
         // 获取 业务账户
-        const { queryTable: queryBusinessManager, findManagerName } = handlerManagerList(loading, 1);
+        const { tableList: businessManager, queryTable: queryBusinessManager, findManagerName } = handlerManagerList(loading, 1);
         // 查询
         function search(value: any) {
             filteredInfo.value = value;
@@ -145,6 +147,7 @@ export default defineComponent({
             formatTime,
             formatValue,
             findManagerName,
+            businessManager,
         };
     },
 });

src/views/information/spot-contract/list/unsubmitted/index.vue

@@ -48,27 +48,29 @@
           <a>{{ formatValue(formatTime(record.deliverystartdate, "d") + '--' +
                         formatTime(record.deliveryenddate, "d")) }}</a>
         </template>
-          <!-- 业务员 -->
-          <template #saleuserlogincode="{ record }">
-              <a>{{ findManagerName(record.saleuserlogincode) }}</a>
-          </template>
+        <!-- 业务员 -->
+        <template #saleuserlogincode="{ record }">
+          <a>{{ findManagerName(record.saleuserlogincode) }}</a>
+        </template>
 
-          <!-- 跟单员 -->
-          <template #meruserlogincode="{ record }">
-              <a>{{ findManagerName(record.meruserlogincode) }}</a>
-          </template>
+        <!-- 跟单员 -->
+        <template #meruserlogincode="{ record }">
+          <a>{{ findManagerName(record.meruserlogincode) }}</a>
+        </template>
       </a-table>
     </contextMenu>
     <!-- 新增现货合同 -->
     <AddSpotContract @refresh="queryTable" />
     <!-- 现货合同: 详情 -->
     <SpotContractDeatil :selectedRow="selectedRow"
+                        :businessManager="businessManager"
                         @refresh="queryTable" />
     <!-- 现货合同: 修改 -->
     <ModifySpotContract :selectedRow="selectedRow"
                         @refresh="queryTable" />
     <!-- 现货合同: 删除 -->
     <DeleteSpotContract :selectedRow="selectedRow"
+                        :businessManager="businessManager"
                         @refresh="queryTable" />
   </div>
 </template>
@@ -104,7 +106,7 @@ export default defineComponent({
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList(1);
         // 获取 业务账户
-        const { queryTable: queryBusinessManager, findManagerName } = handlerManagerList(loading, 1);
+        const { tableList: businessManager, queryTable: queryBusinessManager, findManagerName } = handlerManagerList(loading, 1);
         // 查询
         function search(value: any) {
             filteredInfo.value = value;
@@ -151,6 +153,7 @@ export default defineComponent({
             formatTime,
             formatValue,
             findManagerName,
+            businessManager,
         };
     },
 });