update

package.json

@@ -10,7 +10,7 @@
     },
     "dependencies": {
         "@vue/runtime-dom": "^3.1.4",
-        "ant-design-vue": "^2.1.3",
+        "ant-design-vue": "^2.2.8",
         "axios": "^0.21.1",
         "core-js": "^3.6.5",
         "crypto-js": "^3.1.9-1",

src/layout/components/main.vue

@@ -1,14 +1,8 @@
 <template>
     <div class="exposure">
         <div class="first-menu">
-            <a-menu
-                class="a-menu_container"
-                theme="dark"
-                v-model:selectedKeys="selectedKey"
-                @click="selectMenu"
-                mode="horizontal"
-            >
-                <a-menu-item :key="String(index)" v-for="(item, index) in list">{{ item.title}}</a-menu-item>
+            <a-menu class="a-menu_container" theme="dark" v-model:selectedKeys="selectedKey" @click="selectMenu" mode="horizontal">
+                <a-menu-item :key="String(index)" v-for="(item, index) in list">{{ item.title }}</a-menu-item>
             </a-menu>
             <div class="menu_right">
                 <!-- <slot></slot> -->
@@ -32,7 +26,7 @@ export default defineComponent({
         const selectedKey = inject('index');
         // 切换路由
         function selectMenu(value: any) {
-            if (((selectedKey as unknown) as any).value[0] !== value.key) {
+            if ((selectedKey as unknown as any).value[0] !== value.key) {
                 const index = +value.key;
                 router.push({ name: list.value[index].code });
             }
@@ -58,6 +52,7 @@ export default defineComponent({
     .flex;
     justify-content: space-between;
     .a-menu_container {
+        flex: 1;
         padding-top: 2px;
         .flex();
         height: 32px;

src/layout/components/menu.vue

@@ -30,9 +30,11 @@ function handleMenu(context: SetupContext) {
     const preOpenKeys = ref<string[]>(['1']);
     const menuList = APP.getRef('menus');
     function menuClick(value: any) {
-        const arr = value.keyPath.reverse();
+        const arr = value.keyPath;
         if (arr.length > 1 && arr[1] !== selectedKeys.value[0]) {
-            const first = menuList.value.find((e: OperationTabMenu) => e.code === arr[0]);
+            const first = menuList.value.find((e: OperationTabMenu) => {
+                return e.code === arr[0];
+            });
             if (first) {
                 const seconde = first.children.find((e: OperationTabMenu) => e.code === arr[1]);
                 seconde && context.emit('chooseMenu', seconde);

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

@@ -1,54 +1,35 @@
 <template>
-  <!-- 敞口: 期货头寸-->
-  <div class="exposure-futures  table-height"
-       :loading="loading">
-    <filterCustomTable @search="updateColumn">
-    </filterCustomTable>
-    <a-table :columns="columns"
-             class="topTable"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             :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"
-                 @close="closeDrawer"
-                 @changeTab="changeTab"
-                 :tabList="tabList">
-      <a-table :columns="columnsDetail"
-               class="topTable"
-               :pagination="false"
-               rowKey="key"
-               :data-source="detailTableList"
-               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
-          <!-- 买卖方向 -->
-          <template #buyorsell="{ record }">
-              <span>{{ getBuyOrSellName(record.buyorsell)  }}</span>
-          </template>
-          <!-- 开屏方向 -->
-          <template #channelbuildtype="{ record }">
-              <span>{{ getChannelBuildName(record.channelbuildtype) }}</span>
-          </template>
-
-      </a-table>
-
-
-    </Description>
-  </div>
+    <!-- 敞口: 期货头寸-->
+    <div class="exposure-futures table-height" :loading="loading">
+        <filterCustomTable @search="updateColumn"> </filterCustomTable>
+        <a-table :columns="columns" class="topTable" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :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" @close="closeDrawer" @changeTab="changeTab" :tabList="tabList">
+            <a-table :columns="columnsDetail" class="topTable" :pagination="false" rowKey="key" :data-source="detailTableList" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
+                <!-- 买卖方向 -->
+                <template #buyorsell="{ record }">
+                    <span>{{ getBuyOrSellName(record.buyorsell) }}</span>
+                </template>
+                <!-- 开屏方向 -->
+                <template #channelbuildtype="{ record }">
+                    <span>{{ getChannelBuildName(record.channelbuildtype) }}</span>
+                </template>
+            </a-table>
+        </Description>
+    </div>
 </template>
 
 <script lang="ts">
@@ -63,7 +44,8 @@ import { TabList } from '@/common/components/description/interface';
 import { queryResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import Description from '@/common/components/description/index.vue';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
-import {getBuyOrSellName, getChannelBuildName} from "@/common/constants/enumsName";
+import { getBuyOrSellName, getChannelBuildName } from '@/common/constants/enumsName';
+import { getTableButton } from '@/common/setup/table/button';
 
 export default defineComponent({
     name: EnumRouterName.exposure_futures,
@@ -92,14 +74,16 @@ export default defineComponent({
             detailTableList, // 明细表头数据
             expandedRowKeys,
             selectedRow,
-            Rowclick, // 表格事件
-            tabList,
+            Rowclick,
         } = handleComposeTable_detail<ErmcpHedgePosition>(param);
 
+        // 底部明细标签
+        const tabList = getTableButton(['position_futures_details']);
+
         // 切换明细
         function changeTab(index: number, current: TabList) {
             const { code, lable } = current;
-            if (code === 'exposure_futures_details') {
+            if (code === 'position_futures_details') {
                 // 现货明细
                 // 注册表头
                 registerColumnDetail('table_pcweb_exposure_futuresposition_detail', []);
@@ -116,8 +100,8 @@ export default defineComponent({
         }
         watchEffect(() => {
             if (visible.value) {
-                if (tabList.value.length) {
-                    changeTab(0, tabList.value[0]);
+                if (tabList.length) {
+                    changeTab(0, tabList[0]);
                 }
             }
         });

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

@@ -1,39 +1,21 @@
 <template>
-  <!-- 敞口: 现货头寸-->
-  <div class="exposure-spot table-height"
-       :loading="loading">
-    <filterCustomTable @search="updateColumn">
-    </filterCustomTable>
-    <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             :pagination="false"
-             rowKey="key"
-             :data-source="tableList">
-      <template #decreaseqty="{ record }">
-        <span>{{ record.decreaseqty.toFixed(2) + " " + record.enumdicname }}</span>
-      </template>
-    </a-table>
-    <!-- 明细 -->
-    <Description v-if="visible"
-                 @close="closeDrawer"
-                 @changeTab="changeTab"
-                 :tabList="tabList">
-      <a-table :columns="columnsDetail"
-               class="topTable"
-               :pagination="false"
-               rowKey="key"
-               :data-source="detailTableList"
-               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
-      </a-table>
-      <!-- 类型 -->
-      <template #logtype="{ record }">
-        <span>{{ getLogType(record.logtype) }}</span>
-      </template>
-    </Description>
-  </div>
+    <!-- 敞口: 现货头寸-->
+    <div class="exposure-spot table-height" :loading="loading">
+        <filterCustomTable @search="updateColumn"> </filterCustomTable>
+        <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :pagination="false" rowKey="key" :data-source="tableList">
+            <template #decreaseqty="{ record }">
+                <span>{{ record.decreaseqty.toFixed(2) + ' ' + record.enumdicname }}</span>
+            </template>
+        </a-table>
+        <!-- 明细 -->
+        <Description v-if="visible" @close="closeDrawer" @changeTab="changeTab" :tabList="tabList">
+            <a-table :columns="columnsDetail" class="topTable" :pagination="false" rowKey="key" :data-source="detailTableList" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"> </a-table>
+            <!-- 类型 -->
+            <template #logtype="{ record }">
+                <span>{{ getLogType(record.logtype) }}</span>
+            </template>
+        </Description>
+    </div>
 </template>
 
 <script lang="ts">
@@ -48,6 +30,7 @@ import Description from '@/common/components/description/index.vue';
 import { TabList } from '@/common/components/description/interface';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { getLogType } from '@/common/constants/enumsName';
+import { getTableButton } from '@/common/setup/table/button';
 
 export default defineComponent({
     name: EnumRouterName.exposure_spot,
@@ -77,13 +60,15 @@ export default defineComponent({
             expandedRowKeys,
             selectedRow,
             Rowclick, // 表格事件
-            tabList,
         } = handleComposeTable_detail<Ermcp3AreaSpot>(param);
 
+        // 底部明细标签
+        const tabList = getTableButton(['position_spot_details']);
+
         // 切换明细
         function changeTab(index: number, current: TabList) {
             const { code, lable } = current;
-            if (code === 'exposure_spot_details') {
+            if (code === 'position_spot_details') {
                 // 现货明细
                 // 注册表头
                 registerColumnDetail('table_pcweb_exposure_spotposition_detail', []);
@@ -100,8 +85,8 @@ export default defineComponent({
         }
         watchEffect(() => {
             if (visible.value) {
-                if (tabList.value.length) {
-                    changeTab(0, tabList.value[0]);
+                if (tabList.length) {
+                    changeTab(0, tabList[0]);
                 }
             }
         });

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

@@ -1,168 +1,137 @@
 <template>
-  <!-- 款项登记-->
-  <a-modal class="commonModal paddingDialog funds"
-           :title="selectedRow.contracttype===1? '采购合同-款项登记': '销售合同-款项登记'"
-           v-model:visible="visible"
-           centered
-           @cancel="cancel"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                class="cancelBtn"
-                @click="cancel">取消
-      </a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="submit">款项登记
-      </a-button>
-    </template>
-    <fieldset class="formFieldSet">
-      <legend>合同基本信息</legend>
-      <a-form class="inlineForm">
-        <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.accountname) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="现货品种">
-              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="暂定价货款总额">
-              <span
-                    class="white">{{ selectedRow.pricetype === 3 ? formatValue(selectedRow.loanamount) : 0 }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </fieldset>
+    <!-- 款项登记-->
+    <a-modal class="commonModal paddingDialog funds" :title="selectedRow.contracttype === 1 ? '采购合同-款项登记' : '销售合同-款项登记'" v-model:visible="visible" centered @cancel="cancel" width="890px">
+        <template #footer>
+            <a-button key="submit" class="cancelBtn" @click="cancel">取消 </a-button>
+            <a-button key="submit" type="primary" :loading="loading" @click="submit">款项登记 </a-button>
+        </template>
+        <fieldset class="formFieldSet">
+            <legend>合同基本信息</legend>
+            <a-form class="inlineForm">
+                <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.accountname) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="现货品种">
+                            <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="暂定价货款总额">
+                            <span class="white">{{ selectedRow.pricetype === 3 ? formatValue(selectedRow.loanamount) : 0 }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
+        </fieldset>
 
-    <fieldset class="formFieldSet">
-      <legend>已登记信息</legend>
-      <a-form class="inlineForm">
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="已定价额">
-              <span class="white">{{ selectedRow.pricedamount +  " 元"  }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="调整金额">
-              <span class="white">{{ selectedRow.reckonadjustamount + " 元" }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
+        <fieldset class="formFieldSet">
+            <legend>已登记信息</legend>
+            <a-form class="inlineForm">
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="已定价额">
+                            <span class="white">{{ selectedRow.pricedamount + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="调整金额">
+                            <span class="white">{{ selectedRow.reckonadjustamount + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
 
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="货款总额">
-              <span
-                    class="white">{{ selectedRow.pricedamount + selectedRow.reckonadjustamount + " 元"}}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="保证金">
-              <span class="white">{{ selectedRow.margin + " 元"}}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="货款总额">
+                            <span class="white">{{ selectedRow.pricedamount + selectedRow.reckonadjustamount + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="保证金">
+                            <span class="white">{{ selectedRow.margin + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
 
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="其他费用">
-              <span class="white">{{ selectedRow.reckonotheramount  + " 元"}}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="合计总额">
-              <span class="white">{{ formatValue(selectedRow.totalamount) + " 元"}}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="其他费用">
+                            <span class="white">{{ selectedRow.reckonotheramount + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="合计总额">
+                            <span class="white">{{ formatValue(selectedRow.totalamount) + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
 
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="已支付额">
-              <span class="white">{{ selectedRow.payamount + " 元"}}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="预计款额">
-              <span class="white">{{ selectedRow.prepayamount + " 元"}}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </fieldset>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="已支付额">
+                            <span class="white">{{ selectedRow.payamount + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="预计款额">
+                            <span class="white">{{ selectedRow.prepayamount + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
+        </fieldset>
 
-    <fieldset class="formFieldSet">
-      <legend>本次款项信息</legend>
-      <a-form class="inlineForm"
-              ref="formRef"
-              :model="formState"
-              :rules="rules">
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="应付款额"
-                         name="unpayamount">
-              <span class="white">{{selectedRow.unpayamount}}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="款项类型">
-              <a-radio-group class="commonRadioGroup"
-                             v-model:value="formState.payType">
-                <a-radio :value="1">付款申请</a-radio>
-                <a-radio :value="2">退款通知</a-radio>
-              </a-radio-group>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="登记金额"
-                         name="Amount">
-              <a-input-number class="dialogInput"
-                              style="width: 200px"
-                              :min="0"
-                              suffix="元"
-                              type="number"
-                              placeholder="请输入登记金额"
-                              v-model:value="formState.Amount" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="备注"
-                         name="PricedQty"
-                         class="relative">
-              <a-input class="dialogInput"
-                       style="width: 608px"
-                       placeholder="请输入备注信息"
-                       v-model:value="formState.Remark" />
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </fieldset>
-  </a-modal>
+        <fieldset class="formFieldSet">
+            <legend>本次款项信息</legend>
+            <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="应付款额" name="unpayamount">
+                            <span class="white">{{ selectedRow.unpayamount }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="款项类型">
+                            <a-radio-group class="commonRadioGroup" v-model:value="formState.payType">
+                                <a-radio :value="1">付款申请</a-radio>
+                                <a-radio :value="2">退款通知</a-radio>
+                            </a-radio-group>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="登记金额" name="Amount">
+                            <a-input-number class="dialogInput" style="width: 200px" :min="0" suffix="元" type="number" placeholder="请输入登记金额" v-model:value="formState.Amount" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="24">
+                        <a-form-item label="备注" name="PricedQty" class="relative">
+                            <a-input class="dialogInput" style="width: 608px" placeholder="请输入备注信息" v-model:value="formState.Remark" />
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
+        </fieldset>
+    </a-modal>
 </template>
 
 <script lang="ts">
@@ -199,7 +168,7 @@ export default defineComponent({
                     params.DeductAmount = Number(formState.Amount);
                 }
                 // 发出发票登记
-                fundsReq(props.selectedRow.spotcontractid, params, loading, formState.Remark).then(() => {
+                fundsReq(props.selectedRow.spotcontractid, params, loading, formState.Remark.toString()).then(() => {
                     cancel(true);
                 });
             });

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

@@ -5,15 +5,15 @@ import { reactive, ref, UnwrapRef } from "vue";
  */
 export function handleForm() {
     interface FormState {
-        payType: number 
-        Amount: number | null
-        Remark:String
+        payType: number;
+        Amount: number | null;
+        Remark: String;
     }
     const formRef = ref();
     const formState: UnwrapRef<FormState> = reactive({
         payType: 1,
         Amount: null,
-        Remark:''
+        Remark: ''
     })
     const rules = {
         Amount: [{ required: true, message: '请输入登记价格', trigger: 'blur', type: 'number' }],

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

@@ -1,174 +1,138 @@
 <template>
-  <!-- 款项登记-->
-  <a-modal class="commonModal paddingDialog funds"
-           title="款项登记"
-           v-model:visible="visible"
-           centered
-           @cancel="cancel"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                class="cancelBtn"
-                @click="cancel">取消
-      </a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="submit">款项登记
-      </a-button>
-    </template>
-    <fieldset class="formFieldSet">
-      <legend>合同基本信息</legend>
-      <a-form class="inlineForm">
-        <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.accountname) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="现货品种">
-              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="暂定价货款总额">
-              <span
-                    class="white">{{ selectedRow.pricetype === 3 ? formatValue(selectedRow.loanamount) : 0 }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </fieldset>
+    <!-- 款项登记-->
+    <a-modal class="commonModal paddingDialog funds" title="款项登记" v-model:visible="visible" centered @cancel="cancel" width="890px">
+        <template #footer>
+            <a-button key="submit" class="cancelBtn" @click="cancel">取消 </a-button>
+            <a-button key="submit" type="primary" :loading="loading" @click="submit">款项登记 </a-button>
+        </template>
+        <fieldset class="formFieldSet">
+            <legend>合同基本信息</legend>
+            <a-form class="inlineForm">
+                <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.accountname) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="现货品种">
+                            <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="暂定价货款总额">
+                            <span class="white">{{ selectedRow.pricetype === 3 ? formatValue(selectedRow.loanamount) : 0 }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
+        </fieldset>
 
-    <fieldset class="formFieldSet">
-      <legend>已登记信息</legend>
-      <a-form class="inlineForm">
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="已定价额">
-              <span class="white">{{ selectedRow.pricedamount + " 元"}}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="调整金额">
-              <span class="white">{{ selectedRow.reckonadjustamount + " 元"}}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
+        <fieldset class="formFieldSet">
+            <legend>已登记信息</legend>
+            <a-form class="inlineForm">
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="已定价额">
+                            <span class="white">{{ selectedRow.pricedamount + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="调整金额">
+                            <span class="white">{{ selectedRow.reckonadjustamount + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
 
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="货款总额">
-              <span
-                    class="white">{{ selectedRow.pricedamount + selectedRow.reckonadjustamount }}{{handleCurrencyname(selectedRow.currencyname) + " 元"}}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="保证金">
-              <span
-                    class="white">{{ selectedRow.margin }}{{handleCurrencyname(selectedRow.currencyname) + " 元"}}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="货款总额">
+                            <span class="white">{{ selectedRow.pricedamount + selectedRow.reckonadjustamount }}{{ handleCurrencyname(selectedRow.currencyname) + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="保证金">
+                            <span class="white">{{ selectedRow.margin }}{{ handleCurrencyname(selectedRow.currencyname) + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
 
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="其他费用">
-              <span
-                    class="white">{{ selectedRow.reckonotheramount }}{{handleCurrencyname(selectedRow.currencyname)  + " 元"}}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="合计总额">
-              <span
-                    class="white">{{ formatValue(selectedRow.totalamount) }}{{handleCurrencyname(selectedRow.currencyname)  + " 元"}}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="其他费用">
+                            <span class="white">{{ selectedRow.reckonotheramount }}{{ handleCurrencyname(selectedRow.currencyname) + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="合计总额">
+                            <span class="white">{{ formatValue(selectedRow.totalamount) }}{{ handleCurrencyname(selectedRow.currencyname) + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
 
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="已收付额">
-              <span
-                    class="white">{{ selectedRow.payamount }}{{handleCurrencyname(selectedRow.currencyname)  + " 元"}}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="预收款额">
-              <span
-                    class="white">{{ selectedRow.prepayamount }}{{handleCurrencyname(selectedRow.currencyname)  + " 元"}}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </fieldset>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="已收付额">
+                            <span class="white">{{ selectedRow.payamount }}{{ handleCurrencyname(selectedRow.currencyname) + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="预收款额">
+                            <span class="white">{{ selectedRow.prepayamount }}{{ handleCurrencyname(selectedRow.currencyname) + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
+        </fieldset>
 
-    <fieldset class="formFieldSet">
-      <legend>本次款项信息</legend>
-      <a-form class="inlineForm"
-              ref="formRef"
-              :model="formState"
-              :rules="rules">
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="应收款额"
-                         name="unpayamount">
-              <span class="white">{{selectedRow.unpayamount}}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="款项类型">
-              <a-radio-group class="commonRadioGroup"
-                             v-model:value="formState.payType">
-                <a-radio :value="1">收款通知</a-radio>
-                <a-radio :value="2">退款申请</a-radio>
-              </a-radio-group>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="登记金额"
-                         name="Amount">
-              <a-input-number class="dialogInput"
-                              style="width: 200px"
-                              suffix="元"
-                              :min="0"
-                              type="number"
-                              placeholder="请输入登记金额"
-                              v-model:value="formState.Amount" />
-              {{handleCurrencyname(selectedRow.currencyname)}}
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="备注"
-                         name="PricedQty"
-                         class="relative">
-              <a-input class="dialogInput"
-                       style="width: 608px"
-                       placeholder="请输入备注信息"
-                       v-model:value="formState.Remark" />
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </fieldset>
-  </a-modal>
+        <fieldset class="formFieldSet">
+            <legend>本次款项信息</legend>
+            <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="应收款额" name="unpayamount">
+                            <span class="white">{{ selectedRow.unpayamount }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="款项类型">
+                            <a-radio-group class="commonRadioGroup" v-model:value="formState.payType">
+                                <a-radio :value="1">收款通知</a-radio>
+                                <a-radio :value="2">退款申请</a-radio>
+                            </a-radio-group>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="登记金额" name="Amount">
+                            <a-input-number class="dialogInput" style="width: 200px" suffix="元" :min="0" type="number" placeholder="请输入登记金额" v-model:value="formState.Amount" />
+                            {{ handleCurrencyname(selectedRow.currencyname) }}
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="24">
+                        <a-form-item label="备注" name="PricedQty" class="relative">
+                            <a-input class="dialogInput" style="width: 608px" placeholder="请输入备注信息" v-model:value="formState.Remark" />
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
+        </fieldset>
+    </a-modal>
 </template>
 
 <script lang="ts">
@@ -206,7 +170,7 @@ export default defineComponent({
                     params.DeductAmount = Number(formState.Amount);
                 }
                 // 发出发票登记
-                fundsReq(props.selectedRow.spotcontractid, params, loading, formState.Remark).then(() => {
+                fundsReq(props.selectedRow.spotcontractid, params, loading, formState.Remark.toString()).then(() => {
                     cancel(true);
                 });
             });

src/views/business/sell/components/funds/setup.ts

@@ -5,15 +5,15 @@ import { reactive, ref, UnwrapRef } from "vue";
  */
 export function handleForm() {
     interface FormState {
-        payType: number 
-        Amount: number | null
-        Remark:String
+        payType: number;
+        Amount: number | null;
+        Remark: String;
     }
     const formRef = ref();
     const formState: UnwrapRef<FormState> = reactive({
         payType: 1,
         Amount: null,
-        Remark:''
+        Remark: ''
     })
     const rules = {
         Amount: [{ required: true, message: '请输入登记价格', trigger: 'blur', type: 'number' }],