Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/common/constants/enumsName.ts

@@ -746,7 +746,6 @@ export function getPaymentTypeName(type: number) {
  */
 export function getLogType(logtype: number) {
     let result = "--"
-    debugger
     switch (logtype) {
         case 1:
             result = '套保计划'

src/services/bus/user.ts

@@ -40,6 +40,14 @@ export function getAreaUserId(): number {
 }
 
 /**
+ * 获取所属机构名称
+ */
+export function getAreaUserName(): number {
+    return APP.get('userAccount').memberusername
+}
+
+
+/**
  * 获取角色类型, 多个已逗号隔开
  * 1:交易所 2:运营机构 3:营销中心 4:仓库机构 5:三方服务机构 6:自营会员 7:经纪会员 8:做市会员 9:产业会员 10:金融机构 11:商城店铺 12:子机构 13:报价商 14:积分服务商 15:供货商 16:圈内会员 17:物流机构 18:报价配置机构 19:场外期权做市商 20:组织机构 21:顶级机构 22:业务员 23:跟单员 24:交易员
  */

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

@@ -1,6 +1,6 @@
 /** ================================= 账户管理 ================================**/
 import { getUserId } from "@/services/bus/account";
-import { getAreaUserId } from "@/services/bus/user";
+import {getAreaUserId, getUserAccountType} from "@/services/bus/user";
 import { commonSearch_go } from "@/services/go";
 import {
     ErmcpBizGroupEx,
@@ -40,7 +40,8 @@ export function QueryAccMgrTaaccount(): Promise<ErmcpTaAccountEx[]> {
  */
 export function QueryAccMgrLoginUser(querytype: number): Promise<ErmcpLoginUserEx[]> {
     const userid = getAreaUserId();
-    return commonSearch_go('/Ermcp/QueryAccMgrLoginUser', { userid, querytype }).catch((err) => {
+    const usertype = getUserAccountType()
+    return commonSearch_go('/Ermcp/QueryAccMgrLoginUser', { userid, usertype, querytype }).catch((err) => {
         throw new Error(`查询账户管理登录账号: ${err}`);
     });
 }

src/services/go/ermcp/business-review/index.ts

@@ -1,6 +1,6 @@
 /** ================================= 业务审核 ================================**/
 import { getUserId } from '@/services/bus/account';
-import { getAreaUserId } from '@/services/bus/user';
+import {getAreaUserId, getUserAccountType} from '@/services/bus/user';
 import { commonSearch_go } from "@/services/go";
 import {
     ErmcpTradeConfigTMP,
@@ -18,6 +18,7 @@ import {
 export function QueryBusinessJs(req: QueryBusinessJsReq): Promise<QryBussinessJsRsp[]> {
     const param = {
         UserId: getUserId(),
+        usertype: getUserAccountType()
     }
     Object.assign(param, req)
     return commonSearch_go('/Ermcp/QueryBusinessJs', param).catch((err) => {
@@ -33,6 +34,7 @@ export function QueryBusinessJs(req: QueryBusinessJsReq): Promise<QryBussinessJs
 export function QueryBusinessDj(req: QueryBusinessDjReq): Promise<QryBusinessDjRsp[]> {
     const param = {
         UserId: getUserId(),
+        usertype: getUserAccountType()
     }
     Object.assign(param, req)
     return commonSearch_go('/Ermcp/QueryBusinessDj', param).catch((err) => {

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

@@ -11,7 +11,8 @@ import { Ermcp3AreaSpot, Ermcp3AreaSpotDetail, Ermcp3AreaSpotDetailReq, Ermcp3Ex
  */
 export function QueryActualExposure(): Promise<ErmcpRealExposureModel[]> {
     const userid = getUserId(); // 所属机构id
-    return commonSearch_go('/Ermcp/QueryRealtimeExposure', { userid }).catch((err) => {
+    const usertype = getUserAccountType()
+    return commonSearch_go('/Ermcp/QueryRealtimeExposure', { userid, usertype}).catch((err) => {
         throw new Error(`查询敞口 -> 实时敞口: ${err}`);
     });
 }
@@ -36,7 +37,8 @@ export function QueryActualExposureDetail(req: Ermcp3ExposureReq): Promise<Ermcp
  */
 export function QueryAutualExposurePosition(req: ErmcpExposurePostionReq): Promise<ErmcpExposurePostion[]> {
     const userid = getUserId(); // 所属机构id
-    return commonSearch_go('/Ermcp/QueryRealtimeExposurePosition', { userid, ...req }).catch((err) => {
+    const usertype = getUserAccountType()
+    return commonSearch_go('/Ermcp/QueryRealtimeExposurePosition', { userid, usertype, ...req }).catch((err) => {
         throw new Error(`查询敞口 ->实时敞口 -> 期货明细: ${err}`);
     });
 }
@@ -72,7 +74,8 @@ export function QuerySpotPositionDetail(req: Ermcp3AreaSpotDetailReq): Promise<E
  */
 export function QueryExposureHedgePosition(): Promise<ErmcpHedgePosition[]> {
     const userid = getUserId(); // 所属机构id
-    return commonSearch_go('/Ermcp/QueryExposureHedgePosition', { userid }).catch((err) => {
+    const usertype = getUserAccountType()
+    return commonSearch_go('/Ermcp/QueryExposureHedgePosition', { userid, usertype }).catch((err) => {
         throw new Error(`查询敞口 -> 期货头寸: ${err}`);
     });
 }
@@ -84,7 +87,8 @@ export function QueryExposureHedgePosition(): Promise<ErmcpHedgePosition[]> {
  */
 export function QueryExposureHedgePositionDetail(req: ErmcpHedgePositionDetailReq): Promise<ErmcpHedgePositionDetail[]> {
     const userid = getUserId(); // 所属机构id
-    return commonSearch_go('/Ermcp/QueryExposureHedgePositionDetail', { userid, ...req }).catch((err) => {
+    const usertype = getUserAccountType()
+    return commonSearch_go('/Ermcp/QueryExposureHedgePositionDetail', { userid, usertype, ...req }).catch((err) => {
         throw new Error(`查询敞口->期货头寸->期货明细: ${err}`);
     });
 }

src/services/go/ermcp/exposure/interface.ts

@@ -54,7 +54,7 @@ export interface ErmcpRealExposureModel {
  */
 export interface Ermcp3ExposureReq {
     middlegoodsid: number  //    套保商品
-    usertype?: number //          用户类型 2-机构 7-企业成员
+    usertype?: number //         用户类型 2-机构 7-企业成员
 }
 
 /**
@@ -83,7 +83,7 @@ export interface Ermcp3ExposureDetail {
  * 实时敞口期货明细请求
  */
 export interface ErmcpExposurePostionReq {
-    middlegoodsid: number //套保商品ID
+    middleGoodsId: number //套保商品ID
 }
 
 /**

src/services/go/ermcp/finance-review/index.ts

@@ -7,6 +7,7 @@ import {
     QueryBusinessFpReq,
     QueryBusinessKxReq
 } from "@/services/go/ermcp/finance-review/interface";
+import {getUserAccountType} from "@/services/bus/user";
 
 /**
  * 查询财务管理(款项)(对应菜单:财务管理/款项) /Ermcp/QueryBusinessKx
@@ -16,6 +17,7 @@ import {
 export function QueryBusinessKx(req: QueryBusinessKxReq): Promise<QryBussinessKxRsp[]> {
     const param = {
         UserId: getUserId(),
+        usertype: getUserAccountType()
     }
     Object.assign(param, req)
     return commonSearch_go('/Ermcp/QueryBusinessKx', param).catch((err) => {
@@ -31,6 +33,7 @@ export function QueryBusinessKx(req: QueryBusinessKxReq): Promise<QryBussinessKx
 export function QueryBusinessFp(req: QueryBusinessFpReq): Promise<QryBussinessFpRsp[]> {
     const param = {
         UserId: getUserId(),
+        usertype: getUserAccountType()
     }
     Object.assign(param, req)
     return commonSearch_go('/Ermcp/QueryBusinessFp', param).catch((err) => {

src/services/go/useInfo/index.ts

@@ -2,6 +2,7 @@ import APP from '@/services';
 import { getLongTypeLoginID } from '@/services/bus/login';
 import { commonSearch_go } from '../index';
 import * as type from './interface';
+import {Ermcp3RootUserAccount} from "./interface";
 
 /**
  * 获取登录ID
@@ -61,3 +62,13 @@ export function QueryUserInfo(userID: number, isDecrypt?: boolean): Promise<type
     const param = isDecrypt ? { isDecrypt, userID } : { userID }
     return commonSearch_go('/User/QueryUserInfo', param)
 }
+
+/**
+ * 查询顶级用户信息
+ * /Ermcp3/QueryRootUserAccount
+ */
+export function QueryRootUserAccount(userid: number): Promise<Ermcp3RootUserAccount> {
+    return commonSearch_go('/Ermcp3/QueryRootUserAccount', { userid } ).catch((err) => {
+        throw new Error(`查询顶级用户信息: ${err}`);
+    });
+}

src/services/go/useInfo/interface.ts

@@ -277,3 +277,44 @@ export interface LoginQueryRsp {
     userInfo: Userinfo,
     username: string,
 }
+
+export interface Ermcp3RootUserAccount{
+    accountname	:string;//账户名称(机构名称)
+    accountstatus	:number;//账户状态 - 1:待激活 2:待审核 3:待复审 4:正常 5:审核拒绝 6:停用(注销) 7:注销(删除)
+    applysrc	:number;//申请来源 - 1:管理端 2:终端
+    auditremark	:string;//审核备注
+    auditsrc	:number;//审核来源 - 1:管理端 2:终端
+    audittime	:string;//审核时间
+    audituserid	:number;//审核人
+    broker	:number;//所属经纪人ID
+    canceltime	:string;//销户时间
+    canceluserid	:number;//销户人
+    canrecommend	:number;//是否可推荐 - number;
+//:不可 1;可
+    createtime	:string;//创建时间
+    creatorid	:number;//创建人
+    hasauth	:number;//是否已实名认证 - number;
+//:未认证 1:已认证 2:已提交(待审核) 3:已拒绝
+    isanonymous	:number;//是否匿名下单 - number;
+//:否 1:是
+    maxinvestornum	:number;//最大用户数(经纪会员下投资者个数)
+    memberuserid	:number;//所属会员ID
+    modifierid	:number;//修改人
+    modifyremark	:string;//变更备注
+    modifystatus	:number;//变更状态 1 未变更 2 变更中 3 变更待审核 4 变更待复核(投资者)
+    modifytime	:string;//修改时间
+    parenttopuser	:string;//上级顶级机构 [number;
+//92=number;
+//,1时，默认为1， number;
+//92=2时若自已为顶级，则填入自己，自己不为顶级，填入ParentUserID的ParentTopUser]
+    parentuserid	:number;//所属机构ID
+    reckonaccountid	:number;//默认结算资金账号ID(机构分润使用) 作废
+    refercount	:number;//推荐总人数
+    refereeuserid	:number;//推荐人ID
+    refernum	:string;//推荐码
+    rootuserid	:number;//根用户ID
+    subaccountlevel	:number;//子账户层数
+    subarealevelpath	:string;//子机构层级路径(逗号分隔,首尾加逗号)
+    userid	:number;//用户ID
+    usertype	:number;//账户类型 - 1:交易所 2:机构 3:会员子机构 4:经纪人 5:投资者 6:客户 7:企业成员(云平台)
+}

src/views/business/exposure/list/realTime/index.vue

@@ -36,6 +36,10 @@
                rowKey="key"
                :data-source="detailTableList"
                :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
+          <!-- 类型 -->
+          <template #logtype="{ record }">
+              <span>{{ getLogType(record.logtype) }}</span>
+          </template>
       </a-table>
     </Description>
   </div>
@@ -55,6 +59,7 @@ import { queryResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { formatValue } from '@/common/methods';
 import { formatNumber } from '@/common/methods/format';
+import {getBizTypeName, getContractTypeName, getLogType} from "@/common/constants/enumsName";
 
 export default defineComponent({
     name: EnumRouterName.exposure_realtime,
@@ -96,21 +101,22 @@ export default defineComponent({
                 // 注册表头
                 registerColumnDetail('table_pcweb_exposure_detail', []);
                 fn = QueryActualExposureDetail;
+
+                queryResultLoadingAndInfo(fn, loading, { middlegoodsid: selectedRow.value?.MiddleGoodsID }).then((res) => {
+                    detailTableList.value = res;
+                });
             } else if (code === 'exposure_realtime_futures_details') {
                 // 期货明细
                 // 注册表头
                 registerColumnDetail('table_pcweb_exposure_futures_detail', []);
                 fn = QueryAutualExposurePosition;
+                queryResultLoadingAndInfo(fn, loading, { middleGoodsId: selectedRow.value?.MiddleGoodsID }).then((res) => {
+                    detailTableList.value = res;
+                });
             } else {
                 console.error(`${lable}没有配置对应的code: ${code},`);
                 return;
             }
-            const middlegoodsid = selectedRow.value?.MiddleGoodsID;
-            if (middlegoodsid) {
-                queryResultLoadingAndInfo(fn, loading, { middlegoodsid }).then((res) => {
-                    detailTableList.value = res;
-                });
-            }
         }
         watchEffect(() => {
             if (visible.value) {
@@ -120,7 +126,8 @@ export default defineComponent({
             }
         });
 
-        return { loading, tableList, visible, closeDrawer, columns, updateColumn, columnsDetail, detailTableList, expandedRowKeys, selectedRow, Rowclick, tabList, changeTab, formatNumber };
+        return { loading, tableList, visible, closeDrawer, columns, updateColumn, columnsDetail, detailTableList, expandedRowKeys, selectedRow, Rowclick, tabList, changeTab, formatNumber, getBizTypeName
+            ,getLogType  };
     },
 });
 </script>

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

@@ -73,7 +73,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="已点均价">
-              <span class="white">{{ formatValue(selectedRow.pricedavg) }}</span>
+              <span class="white">{{ formatValue(selectedRow.pricedavg.toFixed(2)) }}</span>
             </a-form-item>
           </a-col>
         </a-row>

src/views/business/purchase/components/invoice/index.vue

@@ -110,7 +110,7 @@
                               suffix="元"
                               placeholder="请输入收票金额" />
               <div class="tip">
-                <div>应收票额：{{ selectedRow.invoiceamount }} {{ selectedRow.currencyname }}</div>
+                <div>应收票额：{{ selectedRow.daikaiamount + " 元" }} </div>
                 <div><a class="blue fr">全部登记</a></div>
               </div>
             </a-form-item>

src/views/business/purchase/components/someprice/index.vue

@@ -79,7 +79,7 @@
           <a-col :span="12">
             <a-form-item label="已点均价">
               <span
-                    class="white">{{ formatValue(selectedRow.pricedavg)  + selectedRow.currencyname }}</span>
+                    class="white">{{ formatValue(selectedRow.pricedavg.toFixed(2))  + " 元" }}</span>
             </a-form-item>
           </a-col>
         </a-row>

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

@@ -72,7 +72,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="已点均价">
-              <span class="white">{{ formatValue(selectedRow.pricedavg) }}</span>
+              <span class="white">{{ formatValue(selectedRow.pricedavg.toFixed(2)) }}</span>
             </a-form-item>
           </a-col>
         </a-row>

src/views/business/sell/components/invoice/index.vue

@@ -113,7 +113,7 @@
                               :min="0"
                               placeholder="请输入收票金额" />
               <div class="tip">
-                <div>应开票额：{{ selectedRow.invoiceamount }}
+                <div>应开票额：{{ selectedRow.daikaiamount + " 元" }}
                   {{ handleCurrencyname(selectedRow.currencyname) }}</div>
                 <div><a class="blue fr">全部登记</a></div>
               </div>

src/views/business/sell/components/someprice/index.vue

@@ -80,7 +80,7 @@
           <a-col :span="12">
             <a-form-item label="已点均价">
               <span
-                    class="white">{{ formatValue(selectedRow.pricedavg)  + selectedRow.currencyname }}</span>
+                    class="white">{{ formatValue(selectedRow.pricedavg.toFixed(2))  + " 元" }}</span>
             </a-form-item>
           </a-col>
         </a-row>

src/views/information/account_info/compoments/detail-business/index.vue

@@ -12,6 +12,9 @@
                 type="primary"
                 @click="cancel">关闭</a-button>
     </template>
+      <template #buyorsell="{ record }">
+          <span>{{ getBuyOrSellName(record.buyorsell) }}</span>
+      </template>
     <Detail :selectedData="selectedRow" />
   </a-modal>
 </template>
@@ -21,6 +24,7 @@ import { defineComponent, PropType } from 'vue';
 import { ErmcpLoginUser } from '@/services/go/ermcp/account/interface';
 import Detail from '../detail-commom-business/index.vue';
 import { _closeModal } from '@/common/setup/modal/modal';
+import {getBuyOrSellName} from "@/common/constants/enumsName";
 
 export default defineComponent({
     name: 'business-detail',
@@ -40,6 +44,7 @@ export default defineComponent({
             visible,
             cancel,
             maskClosableFlag: false,
+            getBuyOrSellName
         };
     },
 });

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

@@ -88,14 +88,14 @@
             </a-col>
             <a-col :span="12">
               <a-form-item label="销售方">
-                <span class="white">{{getUserName()}}</span>
+                <span class="white">{{getAreaUserName()}}</span>
               </a-form-item>
             </a-col>
           </template>
           <template v-else>
             <a-col :span="12">
               <a-form-item label="采购方">
-                <span class="white">{{getUserName()}}</span>
+                <span class="white">{{getAreaUserName()}}</span>
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -426,7 +426,7 @@
 <script lang="ts">
 import { defineComponent, PropType, ref } from 'vue';
 import { addContractReq } from './setup';
-import { getUserName, getUsrId } from '@/services/bus/user';
+import {getAreaUserName, getUserName, getUsrId} from '@/services/bus/user';
 import { getGoodsList } from '@/services/bus/goods';
 import { Goods } from '@/services/go/ermcp/goodsInfo/interface';
 import { FormState } from '../interface';
@@ -553,7 +553,7 @@ export default defineComponent({
             payCurrencyUnit,
             parCurrencyChange,
             numberUnit,
-            getUserName,
+            getAreaUserName,
             deliveryDate,
             priceDate,
             disabledDate,

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

@@ -1,7 +1,7 @@
 <template>
-  <!-- 款项审核-->
+  <!-- 入库审核-->
   <a-modal class="add-custom custom-detail"
-           title="款项审核"
+           title="入库审核"
            v-model:visible="visible"
            centered
            :maskClosable="false"
@@ -64,7 +64,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="合同签署量">
-              <span class="white">{{ formatValue(selectedRow.contractqty) }}</span>
+              <span class="white">{{ formatValue(selectedRow.contractqty) + " " +  selectedRow.enumdicname }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -78,8 +78,8 @@
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="商品">
-              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
+            <a-form-item label="品类">
+              <span class="white">{{ formatValue(selectedRow.wrstandardname) }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -91,7 +91,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="入库仓库">
-              <span class="white">{{ formatValue(selectedRow.warehousename) }}</span>
+              <span class="white">{{ formatValue(selectedRow.warehousecode) }}</span>
             </a-form-item>
           </a-col>
         </a-row>

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

@@ -1,7 +1,7 @@
 <template>
-  <!-- 撤销款项登记-->
+  <!-- 撤销入库登记-->
   <a-modal class="add-custom custom-detail"
-           title="撤销款项登记"
+           title="撤销入库登记"
            v-model:visible="visible"
            centered
            :maskClosable="false"
@@ -58,7 +58,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="合同签署量">
-              <span class="white">{{ formatValue(selectedRow.contractqty) }}</span>
+              <span class="white">{{ formatValue(selectedRow.contractqty) + " " +  selectedRow.enumdicname }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -72,8 +72,8 @@
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="商品">
-              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
+            <a-form-item label="品类">
+              <span class="white">{{ formatValue(selectedRow.wrstandardname) }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -85,7 +85,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="入库仓库">
-              <span class="white">{{ formatValue(selectedRow.warehousename) }}</span>
+              <span class="white">{{ formatValue(selectedRow.warehousecode) }}</span>
             </a-form-item>
           </a-col>
         </a-row>

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

@@ -1,7 +1,7 @@
 <template>
-  <!-- 款项详情-->
+  <!-- 入库详情-->
   <a-modal class="add-custom custom-detail"
-           title="款项详情"
+           title="入库详情"
            v-model:visible="visible"
            centered
            :maskClosable="false"
@@ -54,7 +54,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="合同签署量">
-              <span class="white">{{ formatValue(selectedRow.contractqty) }}</span>
+              <span class="white">{{ formatValue(selectedRow.contractqty) + " " +  selectedRow.enumdicname}}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -68,8 +68,8 @@
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="商品">
-              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
+            <a-form-item label="品类">
+              <span class="white">{{ formatValue(selectedRow.wrstandardname) }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -81,7 +81,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="入库仓库">
-              <span class="white">{{ formatValue(selectedRow.warehousename) }}</span>
+              <span class="white">{{ formatValue(selectedRow.warehousecode) }}</span>
             </a-form-item>
           </a-col>
         </a-row>

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

@@ -1,7 +1,7 @@
 <template>
-  <!-- 发票审核-->
+  <!-- 出库审核-->
   <a-modal class="add-custom custom-detail"
-           title="发票审核"
+           title="出库审核"
            v-model:visible="visible"
            centered
            :maskClosable="false"
@@ -63,7 +63,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="合同签署量">
-              <span class="white">{{ formatValue(selectedRow.contractqty) }}</span>
+              <span class="white">{{ formatValue(selectedRow.contractqty)  + " " +  selectedRow.enumdicname}}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -77,7 +77,7 @@
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="商品">
+            <a-form-item label="品类">
               <span class="white">{{ formatValue(selectedRow.wrstandardname) }}</span>
             </a-form-item>
           </a-col>
@@ -90,7 +90,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="出库仓库">
-              <span class="white">{{ formatValue(selectedRow.warehousename) }}</span>
+              <span class="white">{{ formatValue(selectedRow.warehousecode) }}</span>
             </a-form-item>
           </a-col>
         </a-row>

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

@@ -1,7 +1,7 @@
 <template>
-  <!-- 撤销发票登记-->
+  <!-- 撤销出库登记-->
   <a-modal class="add-custom custom-detail"
-           title="撤销发票登记"
+           title="撤销出库登记"
            v-model:visible="visible"
            centered
            :maskClosable="false"
@@ -60,7 +60,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="合同签署量">
-              <span class="white">{{ formatValue(selectedRow.contractqty) }}</span>
+              <span class="white">{{ formatValue(selectedRow.contractqty) + " " +  selectedRow.enumdicname }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -74,8 +74,8 @@
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="商品">
-              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
+            <a-form-item label="品类">
+              <span class="white">{{ formatValue(selectedRow.wrstandardname) }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -87,7 +87,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="出库仓库">
-              <span class="white">{{ formatValue(selectedRow.warehousename) }}</span>
+              <span class="white">{{ formatValue(selectedRow.warehousecode) }}</span>
             </a-form-item>
           </a-col>
         </a-row>

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

@@ -50,7 +50,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="合同签署量">
-              <span class="white">{{ formatValue(selectedRow.contractqty) }}</span>
+              <span class="white">{{ formatValue(selectedRow.contractqty) + " " +  selectedRow.enumdicname }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -64,8 +64,8 @@
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="商品">
-              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
+            <a-form-item label="品类">
+              <span class="white">{{ formatValue(selectedRow.wrstandardname) }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -77,7 +77,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="出库仓库">
-              <span class="white">{{ formatValue(selectedRow.warehousename) }}</span>
+              <span class="white">{{ formatValue(selectedRow.warehousecode) }}</span>
             </a-form-item>
           </a-col>
         </a-row>

src/views/report/exposure-report/list/exposure_report/index.vue

@@ -24,9 +24,16 @@
                :data-source="detailTableList"
                :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
         <!-- 合同类型 -->
-        <template #contracttype="{ record }">
-          <a>{{ getContractTypeName(record.contracttype) }}</a>
+        <template #contracttype="{ text }">
+          <a>{{ getContractTypeName(text) }}</a>
         </template>
+          <template #biztype="{ text }">
+              <a>{{ getBizTypeName(text) }}</a>
+          </template>
+          <template #buyorsell="{ text }">
+              <a>{{ getBuyOrSellName(text) }}</a>
+          </template>
+
       </a-table>
 
     </Description>
@@ -45,7 +52,7 @@ import Description from '@/common/components/description/index.vue';
 import { watchEffect } from 'vue';
 import { queryResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { TabList } from '@/common/components/description/interface';
-import { getContractTypeName } from '@/common/constants/enumsName';
+import {getBizTypeName, getBuyOrSellName, getContractTypeName} from '@/common/constants/enumsName';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 
 export default defineComponent({
@@ -161,6 +168,8 @@ export default defineComponent({
             tabList,
             changeTab,
             getContractTypeName,
+            getBizTypeName,
+            getBuyOrSellName,
         };
     },
 });

src/views/report/future_report/list/future_report/index.vue

@@ -29,7 +29,12 @@
                rowKey="key"
                :data-source="detailTableList"
                :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
+          <!-- 持仓方向 -->
+          <template #buyorsell="{ record }">
+              <a>{{ record.buyorsell === 1 ? "卖出" : "买入" }}</a>
+          </template>
       </a-table>
+
     </Description>
   </div>
 </template>

src/views/search/inventory/list/inventory_applyrecord/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- 库存查询: 当前库存-->
+  <!-- 库存查询: 申请记录-->
   <div class="inventory_current"
        :loading="loading">
     <Filter @search="updateColumn">
@@ -29,8 +29,8 @@
           <a>{{ getPriceTypeName(text) }}</a>
         </template>
 
-        <template #contracctstatus="{ text }">
-          <a>{{ getContractStatusName(text) }}</a>
+        <template #applystatus="{ text }">
+          <a>{{ getApplyStatusName(text) }}</a>
         </template>
 
         <template #contracttype="{ text }">
@@ -50,7 +50,13 @@ import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList,
 import Filter from '../../components/filterTable/index.vue';
 import Add from '../../components/add/index.vue';
 
-import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/common/constants/enumsName';
+import {
+    getApplyStatusName,
+    getBizTypeName,
+    getContractStatusName,
+    getContractTypeName,
+    getPriceTypeName
+} from '@/common/constants/enumsName';
 import { Ermcp3AreaStockApply, queryTableList } from './setup';
 
 export default defineComponent({
@@ -94,6 +100,7 @@ export default defineComponent({
             getPriceTypeName,
             getContractStatusName,
             getContractTypeName,
+            getApplyStatusName,
         };
     },
 });

src/views/search/inventory/list/inventory_current/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- 库存查询: 申请记录-->
+  <!-- 库存查询: 当前库存-->
   <div class="inventory_current"
        :loading="loading">
     <Filter @search="updateColumn">