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

src/services/proto/contract/index.ts

@@ -12,10 +12,9 @@ import {getUserId} from "@/services/bus/account";
 export const operationContractReq = (param: ErmcpContractOperateApplyReq): Promise<any> => {
     const obj = {
         OperateSrc: 2,
-        OperatorID: Number(getLongTypeLoginID()),
         ClientTicket: getUUID(),
         OperateApplyID: getTimeValue(),
-        UserID: Number(getUserId())
+        UserID: getLongTypeLoginID()?.toNumber()
     }
     Object.assign(param, obj)
     return protoMiddleware<ErmcpContractOperateApplyReq>(param, 'ErmcpContractOperateApplyReq', 'ErmcpContractOperateApplyRsp', 2)

src/services/proto/contract/interface.ts

@@ -33,7 +33,6 @@ export interface ContractOperateApplyReq {
     OperateType: number; // uint32 操作类型-1:登记2:确认3：拒绝4：撤销
     Remark?: string; // string 备注
     Info?: ContractOperateApplyInfo; // ContractOperateApplyInfo 合同操作信息
-
     OperateSrc?: number
     OperatorID?: number
     ClientTicket?: string

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

@@ -11,6 +11,18 @@
              :pagination="false"
              rowKey="key"
              :data-source="tableList">
+        <template #totalydqty="{ record }">
+            <span>{{ record.totalydqty + " 手"  }}</span>
+        </template>
+        <template #increaseqty="{ record }">
+            <span>{{ record.increaseqty + " 手"  }}</span>
+        </template>
+        <template #decreaseqty="{ record }">
+            <span>{{ record.decreaseqty + " 手"  }}</span>
+        </template>
+        <template #totalcurqty="{ record }">
+            <span>{{ record.totalcurqty + " 手"  }}</span>
+        </template>
     </a-table>
     <!-- 明细 -->
     <Description v-if="visible"

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

@@ -163,7 +163,7 @@ export default defineComponent({
                     InvoiceAmount: formState.InvoiceAmount!,
                 };
                 // 发出发票登记
-                invoiceReq(props.selectedRow.spotcontractid, params, loading)
+                invoiceReq(props.selectedRow.spotcontractid, params, loading, getFirstImg())
                     .then(() => {
                         cancel(true);
                     })

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

@@ -19,6 +19,12 @@ import { objectToUint8Array } from "@/utils/objHandle";
 import { purchaseStateSign } from "@/views/business/purchase/setup";
 import Long from "long";
 import { Ref } from "vue";
+import {getUserId} from "@/services/bus/account";
+import {getLongTypeLoginID} from "@/services/bus/login";
+import * as long from "long";
+import {LongType} from "@/services/socket/login/interface";
+import {getTimeValue} from "@/utils/time";
+import {v4 as uuidv4} from "uuid";
 
 /**
  * 这里负责 点价登记, 交收登记, 款项登记, 发票登记, 入库登记
@@ -56,9 +62,9 @@ export function fundsReq(spotcontractid: string, req: FundsReq, loading: Ref<boo
 /**
  * 发票登记
  */
-export function invoiceReq(spotcontractid: string, req: InvoiceReq, loading: Ref<boolean>): Promise<string> {
+export function invoiceReq(spotcontractid: string, req: InvoiceReq, loading: Ref<boolean>, attachUrl?: String): Promise<string> {
     return operationContractRsp(4,
-        operationContractReqBuilder(req, spotcontractid, 4),
+        operationContractReqBuilder(req, spotcontractid, 4, "" ,attachUrl),
         loading)
 }
 
@@ -69,7 +75,7 @@ export function invoiceReq(spotcontractid: string, req: InvoiceReq, loading: Ref
  * @param id 操作的合同id
  * @param type 操作类型
  */
-export function operationContractReqBuilder(req: Object, id: string, type: number, Remark?: String): ErmcpContractOperateApplyReq {
+export function operationContractReqBuilder(req: Object, id: string, type: number, Remark?: String, attachUrl?: String): ErmcpContractOperateApplyReq {
     return {
         OperateType: 1, // uint32 操作类型-1:登记2:确认3：拒绝4：撤销
         Remark: '',
@@ -77,6 +83,7 @@ export function operationContractReqBuilder(req: Object, id: string, type: numbe
             OperateApplyType: type, // uint32 操作申请类型-1:点价2:结算3:款项4:发票
             RelatedID: Long.fromString(id), // uint64 现货合同ID(602+Unix秒时间戳(10位)+xxxxxx)
             DetailJson: objectToUint8Array(req), // bytes 明细JSON {}
+            AttachUrl: attachUrl === undefined ? "" : objectToUint8Array(attachUrl as string) // bytes 附件
         },
     } as ErmcpContractOperateApplyReq
 }