#2932

src/assets/styles/mixin.less

@@ -274,7 +274,7 @@
                     background    : @m-black34;
                     padding-top   : 0;
                     padding-bottom: 0;
-                    color         : @m-grey17;
+                    color         : @m-grey2;
                     font-size     : 14px;
                     border-right  : 1px solid @m-black9;
                     border-bottom : 1px solid @m-black9;

src/common/setup/order/orderData.ts

@@ -23,6 +23,8 @@ export function handleOrderData() {
             if (list.length) {
                 componentId.value = list[0].code
             }
+        } else {
+            isBottom.value = false
         }
     });
 

src/common/setup/table/tableQuote.ts

@@ -303,7 +303,6 @@ export function quoteAmplituOfVibration(record: QueryQuoteDayRsp, decimalplace =
 }
 
 // 处理 空值  或者 0的时候，显示 --  的情况，
-export function handleNoneValue(value: number | string) {
-    return value ? value : '--'
-}
-
+export function handleNoneValue(value: number | string, suffix = '') {
+    return value ? value.toString() + suffix : '--'
+}

src/layout/components/menu.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-menu theme="dark" mode="inline" class="left-menu" v-model:selectedKeys="selectedKeys" v-model:openKeys="openKeys" @click="menuClick">
+  <a-menu theme="dark" mode="inline" class="left-menu" v-model:selectedKeys="selectedKeys" :openKeys="openKeys" @click="menuClick" @openChange="menuChange">
     <a-sub-menu v-for="item in filterMenu()" :key="item.code">
       <template #title>
         <span>
@@ -29,6 +29,7 @@ function handleMenu(context: SetupContext) {
   const openKeys = ref<string[]>(['1']);
   const preOpenKeys = ref<string[]>(['1']);
   const menuList = APP.getRef('menus');
+
   function menuClick(value: any) {
     const arr = value.keyPath;
     if (arr.length > 1 && arr[1] !== selectedKeys.value[0]) {
@@ -41,6 +42,23 @@ function handleMenu(context: SetupContext) {
       }
     }
   }
+
+  function menuChange(keys: string[]) {
+    const latestOpenKey = keys.find(key => openKeys.value.indexOf(key) === -1);
+    const rootSubmenuKeys = menuList.value.reduce((res: string[], item: OperationTabMenu) => {
+      if (item.path) {
+        res.push(item.code)
+      }
+      return res;
+    }, []);
+
+    if (rootSubmenuKeys.indexOf(latestOpenKey!) === -1) {
+      openKeys.value = keys;
+    } else {
+      openKeys.value = latestOpenKey ? [latestOpenKey] : [];
+    }
+  }
+
   // 一级菜单图标
   function fontIcon(code: string): string {
     switch (code) {
@@ -64,7 +82,8 @@ function handleMenu(context: SetupContext) {
         return '#icon-jinrongfenxi'
     }
   }
-  return { selectedKeys, menuList, openKeys, preOpenKeys, menuClick, fontIcon };
+
+  return { selectedKeys, menuList, openKeys, preOpenKeys, menuClick, menuChange, fontIcon };
 }
 
 export default defineComponent({
@@ -76,7 +95,8 @@ export default defineComponent({
   },
   setup(props, context) {
     const isBottom = getHasBottom();
-    const { selectedKeys, openKeys, menuList, menuClick, preOpenKeys, fontIcon } = handleMenu(context);
+    const { selectedKeys, openKeys, menuList, menuClick, menuChange, preOpenKeys, fontIcon } = handleMenu(context);
+
     watchEffect(() => {
       if (props.collapsed) {
         preOpenKeys.value = openKeys.value;
@@ -85,8 +105,10 @@ export default defineComponent({
         openKeys.value = preOpenKeys.value;
       }
     });
+
     const filterMenu = () => menuList.value.filter((e: OperationTabMenu) => e.path);
     const route = useRoute();
+
     initData(() => {
       // 处理路由跳转到菜单栏里第一个对应的页面
       const list = filterMenu();
@@ -120,7 +142,16 @@ export default defineComponent({
         context.emit('chooseMenu', temp);
       }
     });
-    return { selectedKeys, openKeys, filterMenu, menuClick, fontIcon, isBottom };
+
+    return {
+      selectedKeys,
+      openKeys,
+      filterMenu,
+      menuClick,
+      menuChange,
+      fontIcon,
+      isBottom
+    };
   },
 });
 </script>

src/services/go/ermcp/spot-contract/interface.ts

@@ -49,6 +49,7 @@ export interface Ermcp3ContractRsp {
     margin: number;//当前保证金
     meruserid: number;//跟单员id
     meruserlogincode: string;//跟单员登录代码
+    pointdesc: string; // 点价备注
     price: number;//价格\暂定价 [1:一口价、3:暂定价]
     pricemove: number;//升贴水 [2:点价 3:暂定价]
     pricetype: number;//定价类型 - 1:一口价 2:点价 3:暂定价

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

@@ -5,7 +5,7 @@
       <a-button key="submit" class="cancelBtn" @click="cancel">取消 </a-button>
       <a-button key="submit" type="primary" :loading="loading" @click="submit">确认撤销 </a-button>
     </template>
-    <a-form class="inlineForm" @submit="handleSearch">
+    <a-form class="inlineForm">
       <fieldset class="formFieldSet">
         <legend>基本信息</legend>
         <a-row :gutter="24">
@@ -29,11 +29,6 @@
               <span class="white">{{ formatValue(selectedRow.planqty) }}</span>
             </a-form-item>
           </a-col>
-          <a-col :span="12">
-            <a-form-item label="备注">
-              <span class="white">{{ formatValue(selectedRow.remark) }}</span>
-            </a-form-item>
-          </a-col>
         </a-row>
       </fieldset>
       <fieldset class="formFieldSet">

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

@@ -2,10 +2,9 @@
   <!-- 购销计划详情-->
   <a-modal class="commonModal custom-detail" title="购销计划详情" v-model:visible="visible" centered @cancel="cancel" width="890px">
     <template #footer>
-      <a-button key="submit" type="primary" :loading="loading" @click="submit">关闭
-      </a-button>
+      <a-button key="submit" type="primary" @click="cancel">关闭</a-button>
     </template>
-    <a-form class="inlineForm" @submit="handleSearch">
+    <a-form class="inlineForm">
       <fieldset class="formFieldSet">
         <legend>购销计划</legend>
         <a-row :gutter="24">
@@ -102,14 +101,9 @@ export default defineComponent({
   setup(props, context) {
     const { visible, cancel } = _closeModal(context);
 
-    function submit() {
-      cancel();
-    }
-
     return {
       visible,
       cancel,
-      submit,
       formatValue,
       getPlanContractType,
       getPayCurrencyTypeEnumList,

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

@@ -1,137 +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.nickname) }}</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">{{ handleNoneValue(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">{{ handleNoneValue(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="1" 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">
@@ -144,48 +144,55 @@ import { handleForm } from './setup';
 import { _closeModal } from '@/common/setup/modal/modal';
 
 export default defineComponent({
-    name: 'purchase_pending_funds',
-    components: {},
-    emits: ['cancel', 'update'],
-    props: {
-        selectedRow: {
-            type: Object as PropType<Ermcp3SellBuyContract>,
-            default: {},
-        },
+  name: 'purchase_pending_funds',
+  components: {},
+  emits: ['cancel', 'update'],
+  props: {
+    selectedRow: {
+      type: Object as PropType<Ermcp3SellBuyContract>,
+      default: {},
     },
-    setup(props, context) {
-        const { visible, cancel } = _closeModal(context);
-        const loading = ref<boolean>(false);
-        const { rules, formState, formRef } = handleForm();
-        function submit() {
-            const wrapEl = unref(formRef);
-            wrapEl.validate().then(() => {
-                loading.value = true;
-                const params: any = {};
-                if (formState.payType === 1) {
-                    params.PayAmount = Number(formState.Amount);
-                } else {
-                    params.DeductAmount = Number(formState.Amount);
-                }
-                // 发出发票登记
-                fundsReq(props.selectedRow.spotcontractid, params, loading, formState.Remark.toString()).then(() => {
-                    cancel(true);
-                });
-            });
+  },
+  setup(props, context) {
+    const { visible, cancel } = _closeModal(context);
+    const loading = ref<boolean>(false);
+    const { rules, formState, formRef } = handleForm();
+
+    // 处理 空值  或者 0的时候，显示 --  的情况，
+    function handleNoneValue(value: number | string, suffix = '') {
+      return value < 0 ? '--' : value.toString() + suffix
+    }
+
+    function submit() {
+      const wrapEl = unref(formRef);
+      wrapEl.validate().then(() => {
+        loading.value = true;
+        const params: any = {};
+        if (formState.payType === 1) {
+          params.PayAmount = Number(formState.Amount);
+        } else {
+          params.DeductAmount = Number(formState.Amount);
         }
+        // 发出发票登记
+        fundsReq(props.selectedRow.spotcontractid, params, loading, formState.Remark.toString()).then(() => {
+          cancel(true);
+        });
+      });
+    }
 
-        return {
-            visible,
-            cancel,
-            submit,
-            loading,
-            formRef,
-            formState,
-            formatValue,
-            rules,
-            getPriceTypeName,
-        };
-    },
+    return {
+      visible,
+      cancel,
+      submit,
+      loading,
+      formRef,
+      formState,
+      formatValue,
+      rules,
+      getPriceTypeName,
+      handleNoneValue,
+    };
+  },
 });
 </script>
 

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

@@ -84,7 +84,7 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="收票金额" class="relative mb40" name="InvoiceAmount">
-              <a-input-number v-model:value="formState.InvoiceAmount" class="dialogInput" style="width: 200px" :min="0" suffix="元" placeholder="请输入收票金额" />
+              <a-input-number v-model:value="formState.InvoiceAmount" class="dialogInput" style="width: 200px" :min="1" suffix="元" placeholder="请输入收票金额" />
               <div class="tip">
                 <div>应收票额：{{ selectedRow.daikaiamount + " 元" }} </div>
                 <div><a class="blue fr">全部登记</a></div>

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

@@ -78,7 +78,7 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="点价价格" name="PricedPrice">
-              <a-input-number class="dialogInput" style="width: 200px" v-model:value="formState.PricedPrice" :min="0" placeholder="请输入点价价格" />
+              <a-input-number class="dialogInput" style="width: 200px" v-model:value="formState.PricedPrice" :min="1" placeholder="请输入点价价格" />
             </a-form-item>
           </a-col>
           <a-col :span="12">
@@ -98,7 +98,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="点价数量" class="relative" name="PricedQty">
-              <a-input-number class="dialogInput" style="width: 200px" v-model:value="formState.PricedQty" :min="0" :max="selectedRow.unpricedqty" placeholder="请输入点价数量" />
+              <a-input-number class="dialogInput" style="width: 200px" v-model:value="formState.PricedQty" :min="1" :max="selectedRow.unpricedqty" placeholder="请输入点价数量" />
               <div class="tip mt10">
                 <span>未定价量<span class="white">{{ selectedRow.unpricedqty }}{{ selectedRow.enumdicname }}</span>
                 </span>

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

@@ -82,7 +82,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="入库数量" name="Qty">
-              <a-input-number class="dialogInput" style="width: 200px" suffix="单位" :min="0" placeholder="请输入入库数量" v-model:value="formState.Qty"> </a-input-number>
+              <a-input-number class="dialogInput" style="width: 200px" suffix="单位" :min="1" placeholder="请输入入库数量" v-model:value="formState.Qty"> </a-input-number>
             </a-form-item>
           </a-col>
         </a-row>

src/views/business/search/spot/index.vue

@@ -19,7 +19,7 @@
 
 <script lang="ts">
 import MtpTableScroll from '@/common/components/tableScroll/index.vue';
-import { queryTableList, MtpTableButton, contextMenu, defineComponent, handleComposeTable, ComposeTableParam } from '@/common/export/commonTable';
+import { queryTableList, MtpTableButton, contextMenu, defineComponent, defineAsyncComponent, handleComposeTable, ComposeTableParam } from '@/common/export/commonTable';
 import filterCustomTable from './components/filter/index.vue';
 import { formatTime, formatValue } from '@/common/methods';
 import { getColumns } from './setup';
@@ -37,6 +37,7 @@ export default defineComponent({
     filterCustomTable,
     MtpTableButton,
     contextMenu,
+    detail: defineAsyncComponent(() => import('@/views/information/spot-contract/components/detail/index.vue')),
   },
   setup() {
     const { name: routeName } = useRoute();

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

@@ -1,138 +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">{{ handleNoneValue(selectedRow.unpayamount, ' 元') }}</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">{{ handleNoneValue(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="1" 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">
@@ -145,52 +145,58 @@ import { handleForm } from './setup';
 import { _closeModal } from '@/common/setup/modal/modal';
 
 export default defineComponent({
-    name: 'sell_pending_funds',
-    components: {},
-    emits: ['cancel', 'update'],
-    props: {
-        selectedRow: {
-            type: Object as PropType<Ermcp3SellBuyContract>,
-            default: {},
-        },
+  name: 'sell_pending_funds',
+  components: {},
+  emits: ['cancel', 'update'],
+  props: {
+    selectedRow: {
+      type: Object as PropType<Ermcp3SellBuyContract>,
+      default: {},
     },
-    setup(props, context) {
-        const { visible, cancel } = _closeModal(context);
-        const loading = ref<boolean>(false);
-        const { rules, formState, formRef } = handleForm();
+  },
+  setup(props, context) {
+    const { visible, cancel } = _closeModal(context);
+    const loading = ref<boolean>(false);
+    const { rules, formState, formRef } = handleForm();
 
-        function submit() {
-            const wrapEl = unref(formRef);
-            wrapEl.validate().then(() => {
-                loading.value = true;
-                const params: any = {};
-                if (formState.payType === 1) {
-                    params.PayAmount = Number(formState.Amount);
-                } else {
-                    params.DeductAmount = Number(formState.Amount);
-                }
-                // 发出发票登记
-                fundsReq(props.selectedRow.spotcontractid, params, loading, formState.Remark.toString()).then(() => {
-                    cancel(true);
-                });
-            });
-        }
-        function handleCurrencyname(currencyname: string) {
-            return currencyname === '人民币' ? '' : currencyname;
+    // 处理 空值  或者 0的时候，显示 --  的情况，
+    function handleNoneValue(value: number | string, suffix = '') {
+      return value < 0 ? '--' : value.toString() + suffix
+    }
+
+    function submit() {
+      const wrapEl = unref(formRef);
+      wrapEl.validate().then(() => {
+        loading.value = true;
+        const params: any = {};
+        if (formState.payType === 1) {
+          params.PayAmount = Number(formState.Amount);
+        } else {
+          params.DeductAmount = Number(formState.Amount);
         }
-        return {
-            visible,
-            cancel,
-            submit,
-            loading,
-            formState,
-            formatValue,
-            formRef,
-            rules,
-            getPriceTypeName,
-            handleCurrencyname,
-        };
-    },
+        // 发出发票登记
+        fundsReq(props.selectedRow.spotcontractid, params, loading, formState.Remark.toString()).then(() => {
+          cancel(true);
+        });
+      });
+    }
+    function handleCurrencyname(currencyname: string) {
+      return currencyname === '人民币' ? '' : currencyname;
+    }
+    return {
+      visible,
+      cancel,
+      submit,
+      loading,
+      formState,
+      formatValue,
+      formRef,
+      rules,
+      getPriceTypeName,
+      handleCurrencyname,
+      handleNoneValue,
+    };
+  },
 });
 </script>
 

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

@@ -84,7 +84,7 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="开票金额" class="relative mb40" name="InvoiceAmount">
-              <a-input-number v-model:value="formState.InvoiceAmount" class="dialogInput" style="width: 200px" suffix="元" :min="0" placeholder="请输入开票金额" />
+              <a-input-number v-model:value="formState.InvoiceAmount" class="dialogInput" style="width: 200px" suffix="元" :min="1" placeholder="请输入开票金额" />
               <div class="tip">
                 <div>应开票额：{{ selectedRow.daikaiamount + " 元" }}
                   {{ handleCurrencyname(selectedRow.currencyname) }}</div>

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

@@ -17,8 +17,7 @@
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="定价.
-                        类型">
+            <a-form-item label="定价类型">
               <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</span>
             </a-form-item>
           </a-col>
@@ -79,7 +78,7 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="点价价格" name="PricedPrice">
-              <a-input-number class="dialogInput" style="width: 200px" v-model:value="formState.PricedPrice" :min="0" placeholder="请输入点价价格" />
+              <a-input-number class="dialogInput" style="width: 200px" v-model:value="formState.PricedPrice" :min="1" placeholder="请输入点价价格" />
             </a-form-item>
           </a-col>
           <a-col :span="12">
@@ -99,7 +98,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="点价数量" class="relative" name="PricedQty">
-              <a-input-number class="dialogInput" style="width: 200px" v-model:value="formState.PricedQty" :min="0" :max="selectedRow.unpricedqty" placeholder="请输入点价数量" />
+              <a-input-number class="dialogInput" style="width: 200px" v-model:value="formState.PricedQty" :min="1" :max="selectedRow.unpricedqty" placeholder="请输入点价数量" />
               <div class="tip mt10">
                 <span>未定价量<span class="white">{{ selectedRow.unpricedqty }}{{ selectedRow.enumdicname }}</span>
                 </span>

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

@@ -87,7 +87,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="出库数量" name="Qty">
-              <a-input-number class="dialogInput" style="width: 200px" suffix="单位" :min="0" placeholder="请输入出库数量" v-model:value="formState.Qty">
+              <a-input-number class="dialogInput" style="width: 200px" suffix="单位" :min="1" placeholder="请输入出库数量" v-model:value="formState.Qty">
               </a-input-number>
             </a-form-item>
           </a-col>

src/views/iframe/setup.ts

@@ -28,6 +28,22 @@ const iframeCode: { code: string, tabIndex: number }[] = [
         tabIndex: 1,
     },
     {
+        code: 'account_spot', // 账户管理-现货账户
+        tabIndex: 1,
+    },
+    {
+        code: 'account_trade', // 账户管理-交易账户
+        tabIndex: 2,
+    },
+    {
+        code: 'account_info_manager', // 账户管理-管理账户
+        tabIndex: 3,
+    },
+    {
+        code: 'account_futures', // 账户管理-期货账户
+        tabIndex: 4,
+    },
+    {
         code: 'futures_spot_finish', // 现货套保-期现关联-外部成交单关联
         tabIndex: 1,
     },

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

@@ -1,23 +1,9 @@
 <template>
   <!-- 停用客户资料-->
-  <a-modal class="commonModal warehouse-disable"
-           title="停用客户资料"
-           v-model:visible="visible"
-           centered
-           :maskClosable="false"
-           @cancel="cancel"
-           width="890px">
+  <a-modal class="commonModal warehouse-disable" title="停用客户资料" v-model:visible="visible" centered :maskClosable="false" @cancel="cancel" width="890px">
     <template #footer>
-      <a-button key="submit"
-                class="cancelBtn"
-                :loading="loading"
-                :disabled="loading"
-                @click="cancel">取消 </a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                :disabled="loading"
-                @click="submit">确认停用 </a-button>
+      <a-button key="submit" class="cancelBtn" :loading="loading" :disabled="loading" @click="cancel">取消 </a-button>
+      <a-button key="submit" type="primary" :loading="loading" :disabled="loading" @click="submit">确认停用 </a-button>
     </template>
     <Detail :selectedRow="selectedRow" />
   </a-modal>
@@ -33,50 +19,45 @@ import { defineComponent, PropType, ref } from 'vue';
 import Detail from '../common-detail/index.vue';
 
 export default defineComponent({
-    name: 'custom-disable',
-    emits: ['cancel', 'update'],
-    components: { Detail },
-    props: {
-        selectedRow: {
-            type: Object as PropType<QueryCustomInfoType>,
-            default: {},
-        },
+  name: 'custom-disable',
+  emits: ['cancel', 'update'],
+  components: { Detail },
+  props: {
+    selectedRow: {
+      type: Object as PropType<QueryCustomInfoType>,
+      default: {},
     },
-    setup(props, context) {
-        const { visible, cancel } = _closeModal(context);
-        const maskClosableFlag = ref<boolean>(false);
-        const loading = ref<boolean>(false);
+  },
+  setup(props, context) {
+    const { visible, cancel } = _closeModal(context);
+    const maskClosableFlag = ref<boolean>(false);
+    const loading = ref<boolean>(false);
 
-        function submit() {
-            Modal.confirm({
-                title: '是否确认停用客户资料',
-                okText: '确认停用',
-                cancelText: '取消',
-                onOk() {
-                    let reqParams: UpdateUserAccountReq = {
-                        userID: props.selectedRow.userid,
-                        accountStatus: 6,
-                    };
-                    requestResultLoadingAndInfo(UpdateUserAccountStatus, reqParams, loading, ['停用成功', '停用失败:']).then(() => {
-                        cancel(true);
-                    });
-                },
-                onCancel() {},
-            });
-        }
+    function submit() {
+      Modal.confirm({
+        title: '是否确认停用客户资料',
+        okText: '确认停用',
+        cancelText: '取消',
+        onOk() {
+          let reqParams: UpdateUserAccountReq = {
+            userID: props.selectedRow.userid,
+            accountStatus: 6,
+          };
+          requestResultLoadingAndInfo(UpdateUserAccountStatus, reqParams, loading, ['停用成功', '停用失败:']).then(() => {
+            cancel(true);
+          });
+        },
+        onCancel() { },
+      });
+    }
 
-        return {
-            visible,
-            cancel,
-            submit,
-            loading,
-            maskClosableFlag,
-        };
-    },
+    return {
+      visible,
+      cancel,
+      submit,
+      loading,
+      maskClosableFlag,
+    };
+  },
 });
 </script>
-
-<style lang="less">
-.warehouse-disable {
-}
-</style>

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

@@ -173,18 +173,13 @@
               </a-form-item>
             </a-col>
             <a-col :span="12" v-if="formState.PriceType === 3">
-              <a-form-item label="暂定价">
-                <a-input class="dialogInput suffixGrey" style="width: 200px" :suffix="payCurrencyUnit" placeholder="请输入暂定价" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="点价说明" name="Remark">
-                <a-input class="dialogInput" style="width: 608px" v-model:value="formState.Remark" placeholder="请输入点价说明" />
+              <a-form-item label="暂定价" name="Price">
+                <a-input class="dialogInput suffixGrey" style="width: 200px" v-model:value="formState.Price" :suffix="payCurrencyUnit" placeholder="请输入暂定价" />
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="升贴水" name="PriceMove">
-                <a-input-number class="dialogInput suffixGrey" v-model:value="formState.PriceMove" placeholder="请输入升贴水" :min="0" :suffix="`${payCurrencyUnit}/${numberUnit}`" style="width: 200px" />
+                <a-input-number class="dialogInput suffixGrey" v-model:value="formState.PriceMove" placeholder="请输入升贴水" :suffix="`${payCurrencyUnit}/${numberUnit}`" style="width: 200px" />
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -192,6 +187,11 @@
                 <a-range-picker v-model:value="priceDate" class="commonPicker" :disabled-date="disabledDate" style="width: 200px" :show-time="{ hideDisabledOptions: true }" format="YYYY-MM-DD" />
               </a-form-item>
             </a-col>
+            <a-col :span="24">
+              <a-form-item label="点价说明" name="PointDesc">
+                <a-input class="dialogInput" style="width: 608px" v-model:value="formState.PointDesc" placeholder="请输入点价说明" />
+              </a-form-item>
+            </a-col>
           </template>
           <!-- 以上是点价的价格信息 end -->
           <template v-if="formState.PriceType === 1">

src/views/information/spot-contract/components/add/setup.ts

@@ -40,7 +40,7 @@ export function addContractReq() {
             // 以上必填
             // 以下选填
             BizType: form.BizType, //                       业务类型 - 1:套保 2:套利
-            Remark: form.Remark,  //       合同备注
+            PointDesc: form.PointDesc, // 点价备注
             ContractMargin: form.ContractMargin ? Number(form.ContractMargin) : 0, //         合同保证金
 
             Amount: [1, 3].includes(form.PriceType) ? Number(form.Price) * Number(form.Qty) : 0, //    金额

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

@@ -88,7 +88,7 @@ export default defineComponent({
 
         if (data.pricetype > 1 && data.goodsid) {
           price.push({ label: '点价合约', value: data.goodsid > 0 ? '期货 ' + formatValue(data.goodscode) : '现货' })
-          price.push({ label: '点价说明', value: formatValue(data.remark) })
+          price.push({ label: '点价说明', value: formatValue(data.pointdesc) })
         } else {
           price.push({ label: '价格', value: formatValue(data.price) })
         }

src/views/information/spot-contract/components/interface.ts

@@ -23,14 +23,14 @@ export interface FormState {
     GoodsID: number | undefined // uint64 点价合约ID-0:为现货，其它为期货商品合约ID[2:点价3:暂定价]
     StartDate: string // string 点价开始日期[2:点价3:暂定价]
     EndDate: string // string 点价结束日期[2:点价3:暂定价]
-    // PointDesc: string // string 点价备注[2:点价3:暂定价]
+    PointDesc: string // string 点价备注[2:点价3:暂定价]
     // DeliveryDesc: string  // string 交收方式
     MerUserID: number | undefined // uint64 跟单员ID
     TradeUserID: number | undefined// uint64 交易员ID
     // PricedQty: number // double 已定价量
     // PricedAmount: number // double 已定价金额
     SpotGoodsBrandID: number | undefined // uint64 现货品牌ID
-    Remark: string // string 合同备注
+    // Remark: string // string 合同备注
     SaleUserID: number | undefined // uint64 业务员ID
     AccountID: number | undefined // uint64 期货账户ID
     BizType: number // uint32 业务类型 - 1:套保 2:套利

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

@@ -169,18 +169,13 @@
               </a-form-item>
             </a-col>
             <a-col :span="12" v-if="formState.PriceType === 3">
-              <a-form-item label="暂定价">
-                <a-input class="dialogInput suffixGrey" style="width: 200px" :suffix="payCurrencyUnit" placeholder="请输入暂定价" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="点价说明" name="Remark">
-                <a-input class="dialogInput" style="width: 608px" v-model:value="formState.Remark" placeholder="请输入点价说明" />
+              <a-form-item label="暂定价" name="Price">
+                <a-input class="dialogInput suffixGrey" style="width: 200px" v-model:value="formState.Price" :suffix="payCurrencyUnit" placeholder="请输入暂定价" />
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="升贴水" name="PriceMove">
-                <a-input-number class="dialogInput suffixGrey" v-model:value="formState.PriceMove" placeholder="请输入升贴水" :min="0" :suffix="`${payCurrencyUnit}/${numberUnit}`" style="width: 200px" />
+                <a-input-number class="dialogInput suffixGrey" v-model:value="formState.PriceMove" placeholder="请输入升贴水" :suffix="`${payCurrencyUnit}/${numberUnit}`" style="width: 200px" />
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -188,6 +183,11 @@
                 <a-range-picker v-model:value="priceDate" class="commonPicker" :disabled-date="disabledDate" style="width: 200px" :show-time="{ hideDisabledOptions: true }" format="YYYY-MM-DD" />
               </a-form-item>
             </a-col>
+            <a-col :span="24">
+              <a-form-item label="点价说明" name="PointDesc">
+                <a-input class="dialogInput" style="width: 608px" v-model:value="formState.PointDesc" placeholder="请输入点价说明" />
+              </a-form-item>
+            </a-col>
           </template>
           <!-- 以上是点价的价格信息 end -->
           <template v-if="formState.PriceType === 1">
@@ -322,7 +322,7 @@ export default defineComponent({
     mergeTwoObj(formState, props.selectedRow);
     isSell.value = formState.ContractType === 1 ? false : true;
 
-    const { deliverygoodsid, goodsid, qty, price, wrstandardid, spotcontractid, spotgoodsbrandid, currencyid, attachment, deliverystartdate, deliveryenddate, startdate, enddate, subjectid, meruserid, tradeuserid, convertfactor } = props.selectedRow;
+    const { deliverygoodsid, goodsid, qty, price, wrstandardid, spotcontractid, spotgoodsbrandid, currencyid, attachment, deliverystartdate, deliveryenddate, startdate, enddate, subjectid, meruserid, tradeuserid, convertfactor, pointdesc } = props.selectedRow;
     if (deliverygoodsid) {
       deliveryGoodsChange(deliverygoodsid).then(() => {
         formState.GoodsID = goodsid;
@@ -338,6 +338,7 @@ export default defineComponent({
     formState.Qty = qty.toString();
     formState.Price = price.toString();
     formState.CurrencyID = currencyid;
+    formState.PointDesc = pointdesc;
     formState.SubjectID = subjectid || undefined;
     formState.MerUserID = meruserid || undefined;
     formState.TradeUserID = tradeuserid;

src/views/information/spot-contract/components/setup.ts

@@ -87,7 +87,7 @@ export function handleFromState(contractType: number) {
             SaleUserID: undefined, // uint64 业务员ID
             MerUserID: undefined, // uint64 跟单员ID
             AccountID: undefined, // uint64 期货账户ID
-            Remark: '', // string 合同备注
+            PointDesc: '', // string 点价备注
             CurrencyID: undefined, // 结算币种ID
             GoodsID: undefined, // uint64 点价合约ID-0:为现货，其它为期货商品合约ID[2:点价3:暂定价]
             PriceMove: null,// double 升贴水[2:点价3:暂定价]

src/views/market/futures/compoments/futures-trade/index.vue

@@ -279,16 +279,16 @@ export default defineComponent({
       // 按钮提交类型
       switch (submitType) {
         case 'buy': {
-          successMsg = '买入成功';
-          failMsg = '买入失败';
+          successMsg = '买入委托成功';
+          failMsg = '买入委托失败';
           formData.BuyOrSell = BuyOrSell.buy;
           formData.ChannelBuildType = BuildType.open;
           formData.OrderPrice = buyPrice.value;
           break;
         }
         case 'sell': {
-          successMsg = '卖出成功';
-          failMsg = '卖出失败';
+          successMsg = '卖出委托成功';
+          failMsg = '卖出委托失败';
           formData.BuyOrSell = BuyOrSell.sell;
           formData.ChannelBuildType = BuildType.open;
           formData.OrderPrice = sellPrice.value;

src/views/order/futures_information/components/futures_information_entrust/index.vue

@@ -2,37 +2,15 @@
   <!-- 期货订单-委托 -->
   <mtp-table-scroll>
     <template #default="{ scroll }">
-      <a-table
-        :columns="getColumns()"
-        class="srcollYTable"
-        :scroll="scroll"
-        :pagination="false"
-        :loading="loading"
-        :expandedRowKeys="expandedRowKeys"
-        :customRow="Rowclick"
-        :expandIcon="expandIcon"
-        :expandIconAsCell="false"
-        :rowKey="(record, index) => index"
-        :data-source="tableList"
-      >
+      <a-table :columns="getColumns()" class="srcollYTable" :scroll="scroll" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" :rowKey="(record, index) => index" :data-source="tableList">
         <!-- 额外的展开行 -->
         <template v-if="btnList.length" #expandedRowRender="{ record }">
-          <BtnList
-            :btnList="handleBtnList(btnList, record)"
-            :record="record"
-            class="btn-list-sticky"
-            @click="openComponent"
-          />
+          <BtnList :btnList="handleBtnList(btnList, record)" :record="record" class="btn-list-sticky" @click="openComponent" />
         </template>
       </a-table>
     </template>
   </mtp-table-scroll>
-  <component
-    :is="componentId"
-    v-if="componentId"
-    :selectedRow="selectedRow"
-    @cancel="closeComponent"
-  ></component>
+  <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
 </template>
 
 <script lang="ts">
@@ -61,12 +39,10 @@ export default defineComponent({
 
     // 处理根据状态显示对应按钮
     const handleBtnList = (btnList: BtnListType[], item: QueryErmcpOrderDetailsRsp) => {
-      switch (item.channelinnerorderstatus) {
-        case 9: // 全部成交
-          return btnList.filter((e) => e.code !== 'cancel');
-        default:
-          return btnList;
+      if ([1, 4, 5].includes(item.channelinnerorderstatus)) {
+        return btnList;
       }
+      return btnList.filter((e) => e.code !== 'cancel');
     };
 
     // 表格通用逻辑

src/views/order/futures_information/components/futures_information_position/columns.tsx

@@ -1,3 +1,4 @@
+import { unref } from 'vue';
 import { getBuyOrSellName } from '@/common/constants/enumsName';
 import { TradePosition } from "@/hooks/account/interface";
 
@@ -27,12 +28,18 @@ export function getColumns() {
         {
             title: '开仓均价',
             key: 'openAveragePrice',
-            customRender: ({ text }: { text: number }) => text.toFixed(2)
+            customRender: ({ record }: { record: TradePosition }) => {
+                const value = unref(record.openAveragePrice);
+                return value.toFixed(record.decimalplace);
+            }
         },
         {
             title: '持仓均价',
             key: 'positionAveragePrice',
-            customRender: ({ text }: { text: number }) => text.toFixed(2)
+            customRender: ({ record }: { record: TradePosition }) => {
+                const value = unref(record.positionAveragePrice);
+                return value.toFixed(record.decimalplace);
+            }
         },
         {
             title: '浮动盈亏',