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

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

@@ -107,9 +107,9 @@ export default defineComponent({
                 console.error(`${lable}没有配置对应的code: ${code},`);
                 return;
             }
-            const goodsid = selectedRow.value?.goodsid;
-            if (goodsid) {
-                queryResultLoadingAndInfo(QueryExposureHedgePositionDetail, loading, { goodsid }).then((res) => {
+            const goodsId = selectedRow.value?.goodsid;
+            if (goodsId) {
+                queryResultLoadingAndInfo(QueryExposureHedgePositionDetail, loading, { goodsId }).then((res) => {
                     detailTableList.value = res;
                 });
             }

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

@@ -19,10 +19,10 @@
         <span>{{ record.TotalNeedHedgeQty.toFixed(2) + " " + record.ENUMDICNAME }}</span>
       </template>
       <template #DiffSpotHedgeQty="{ record }">
-        <span>{{ record.DiffSpotHedgeQty.toFixed(2) + " " + record.ENUMDICNAME }}</span>
+        <span>{{ record.diffSpotHedgeQty.toFixed(2) + " " + record.ENUMDICNAME }}</span>
       </template>
       <template #OriTotalSpotQty="{ record }">
-        <span>{{ record.OriTotalSpotQty.toFixed(2) + " " + record.ENUMDICNAME }}</span>
+        <span>{{ record.oriTotalSpotQty.toFixed(2) + " " + record.ENUMDICNAME }}</span>
       </template>
     </a-table>
     <!-- 明细 -->
@@ -36,9 +36,14 @@
                rowKey="key"
                :data-source="detailTableList"
                :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
+          <!-- 套保品种/代码 -->
+          <template #middlegoodsname="{ record }">
+              <span>{{ record.middlegoodsname + "/" +  record.middlegoodscode}}</span>
+          </template>
+
           <!-- 类型 -->
-          <template #logtype="{ record }">
-              <span>{{ getLogType(record.logtype) }}</span>
+          <template #contracttype="{ record }">
+              <span>{{ getPlanContractType(record.contracttype) }}</span>
           </template>
       </a-table>
     </Description>
@@ -60,6 +65,7 @@ import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { formatValue } from '@/common/methods';
 import { formatNumber } from '@/common/methods/format';
 import {getBizTypeName, getContractTypeName, getLogType} from "@/common/constants/enumsName";
+import {getPlanContractType} from "@/views/business/plan/setup";
 
 export default defineComponent({
     name: EnumRouterName.exposure_realtime,
@@ -126,7 +132,7 @@ export default defineComponent({
             }
         });
 
-        return { loading, tableList, visible, closeDrawer, columns, updateColumn, columnsDetail, detailTableList, expandedRowKeys, selectedRow, Rowclick, tabList, changeTab, formatNumber, getBizTypeName
+        return { loading, tableList, visible, closeDrawer, columns, updateColumn, columnsDetail, detailTableList, expandedRowKeys, selectedRow, Rowclick, tabList, changeTab, formatNumber, getBizTypeName, getPlanContractType
             ,getLogType  };
     },
 });

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

@@ -1,5 +1,5 @@
 <template>
-  <!-- 采敞口: 现货头寸-->
+  <!-- 敞口: 现货头寸-->
   <div class="exposure-spot table-height"
        :loading="loading">
     <filterCustomTable @search="updateColumn">
@@ -27,6 +27,10 @@
                :data-source="detailTableList"
                :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
       </a-table>
+        <!-- 类型 -->
+        <template #logtype="{ record }">
+            <span>{{ getLogType(record.logtype) }}</span>
+        </template>
     </Description>
   </div>
 </template>
@@ -42,6 +46,7 @@ import { queryResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 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";
 
 export default defineComponent({
     name: EnumRouterName.exposure_spot,
@@ -99,7 +104,7 @@ export default defineComponent({
                 }
             }
         });
-        return { loading, tableList, visible, closeDrawer, columns, changeTab, updateColumn, columnsDetail, detailTableList, expandedRowKeys, selectedRow, Rowclick, tabList };
+        return { loading, tableList, visible, closeDrawer, columns, changeTab, updateColumn, columnsDetail, detailTableList, expandedRowKeys, selectedRow, Rowclick, tabList, getLogType };
     },
 });
 </script>

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

@@ -1,5 +1,5 @@
 <template>
-  <!-- 点价登记-->
+  <!-- 采购 点价登记-->
   <a-modal class="commonModal someprice"
            :title="selectedRow.contracttype===1? '采购合同-点价登记': '销售合同-点价登记'"
            v-model:visible="visible"
@@ -104,7 +104,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="升贴水">
-              <span class="white">{{ formatValue(selectedRow.pricemove) }}</span>
+              <span class="white">{{ formatValue(selectedRow.pricemove.toFixed(2)) }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -142,8 +142,9 @@
           <a-col :span="12">
             <a-form-item label="点价金额">
               <span class="white">{{
-                                    (Number(selectedRow.pricemove) + Number(formState.PricedPrice)) * formState.PricedQty
-                                }}{{selectedRow.currencyname}}</span>
+                  ((Number(selectedRow.pricemove) + Number(formState.PricedPrice)) * formState.PricedQty).toFixed(2)
+                               + " 元" }}
+                  </span>
             </a-form-item>
           </a-col>
         </a-row>

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

@@ -1,5 +1,5 @@
 <template>
-  <!-- 销售点价登记-->
+  <!-- 销售: 点价登记-->
   <a-modal class="commonModal someprice"
            title="点价登记"
            v-model:visible="visible"
@@ -105,7 +105,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="升贴水">
-              <span class="white">{{ formatValue(selectedRow.pricemove) }}</span>
+              <span class="white">{{ formatValue(selectedRow.pricemove.toFixed(2)) }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -114,7 +114,7 @@
           <a-col :span="12">
             <a-form-item label="商品价格">
               <span class="white">{{
-                      Number(selectedRow.pricemove) + Number(formState.PricedPrice)
+                  (Number(selectedRow.pricemove) + Number(formState.PricedPrice)).toFixed(2)
                   }}</span>
             </a-form-item>
           </a-col>
@@ -143,8 +143,8 @@
           <a-col :span="12">
             <a-form-item label="点价金额">
               <span class="white">{{
-                      (Number(selectedRow.pricemove) + Number(formState.PricedPrice)) * formState.PricedQty
-                  }}{{selectedRow.currencyname}}</span>
+                  ((Number(selectedRow.pricemove) + Number(formState.PricedPrice)) * formState.PricedQty).toFixed(2)
+                  + " 元" }} </span>
             </a-form-item>
           </a-col>
         </a-row>

src/views/manage/finance-review/list/funds/index.vue

@@ -83,7 +83,7 @@ export default defineComponent({
         Filter,
         BtnList,
         [ModalEnum.detail]: Detail,
-        [ModalEnum.finance_review_invoice_audit]: Audit,
+        [ModalEnum.finance_review_funds_audit]: Audit,
         [ModalEnum.finance_review_funds_cancel]: Cancel,
     },
     setup() {

src/views/manage/inventory-review/list/checkin/index.vue

@@ -18,26 +18,26 @@
                  :record="record"
                  @click="openComponent" />
       </template>
-      <!-- 状态 -->
-      <template #applystatus="{ text }">
-        <a>{{ getApplyStatusName(text) }}</a>
-      </template>
-      <!-- 现货合同类型 -->
-      <template #contracttype="{ text }">
-        <a>{{ getContractTypeName(text) }}</a>
-      </template>
-      <!-- 点价类型 -->
-      <template #pricetype="{ text }">
-        <a>{{ getPriceTypeName(text) }}</a>
-      </template>
-      <!-- 出入库类型 -->
-      <template #inouttype="{ text }">
-        <a>{{ InOutTypeName(text) }}</a>
-      </template>
-      <template #buynicknameOrsellusername="{ record }">
-        <a>{{ handleName(record) }}</a>
-      </template>
-
+        <!-- 状态 -->
+        <template #applystatus="{ text }">
+            <a>{{ getApplyStatusName(text) }}</a>
+        </template>
+        <!-- 现货合同类型 -->
+        <template #contracttype="{ text }">
+            <a>{{ getContractTypeName(text) }}</a>
+        </template>
+        <!-- 点价类型 -->
+        <template #pricetype="{ text }">
+            <a>{{ getPriceTypeName(text) }}</a>
+        </template>
+        <!-- 出入库类型 -->
+        <template #inouttype="{ text }">
+            <a>{{ InOutTypeName(text) }}</a>
+        </template>
+        <!-- 对手方 -->
+        <template #buynicknameOrsellusername="{ record }">
+            <a>{{ handleName(record) }}</a>
+        </template>
     </a-table>
     <!-- 右键 -->
     <contextMenu :contextMenu="contextMenu"

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

@@ -13,23 +13,23 @@
              :data-source="tableList">
       <!-- 出现浮点失真  强行处理-->
       <template #spotactualpl="{ record }">
-        <a>{{ record.spotactualpl.toFixed(2) }}</a>
+        <span>{{ record.spotactualpl.toFixed(2) }}</span>
       </template>
 
       <template #spotfloatpl="{ record }">
-        <a>{{ record.spotfloatpl.toFixed(2) }}</a>
+        <span>{{ record.spotfloatpl.toFixed(2) }}</span>
       </template>
 
       <template #futureactualpl="{ record }">
-        <a>{{ record.futureactualpl.toFixed(2) }}</a>
+        <span>{{ record.futureactualpl.toFixed(2) }}</span>
       </template>
 
       <template #sumactualpl="{ record }">
-        <a>{{ record.sumactualpl.toFixed(2) }}</a>
+        <span>{{ record.sumactualpl.toFixed(2) }}</span>
       </template>
 
       <template #sumpl="{ record }">
-        <a>{{ record.sumpl.toFixed(2) }}</a>
+        <span>{{ record.sumpl.toFixed(2) }}</span>
       </template>
 
     </a-table>
@@ -44,6 +44,26 @@
                rowKey="key"
                :data-source="detailTableList"
                :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
+          <!-- 出现浮点失真  强行处理 * 2-->
+          <template #spotactualpl="{ record }">
+              <span>{{ record.spotactualpl.toFixed(2) }}</span>
+          </template>
+
+          <template #spotfloatpl="{ record }">
+              <span>{{ record.spotfloatpl.toFixed(2) }}</span>
+          </template>
+
+          <template #futureactualpl="{ record }">
+              <span>{{ record.futureactualpl.toFixed(2) }}</span>
+          </template>
+
+          <template #sumactualpl="{ record }">
+              <span>{{ record.sumactualpl.toFixed(2) }}</span>
+          </template>
+
+          <template #sumpl="{ record }">
+              <span>{{ record.sumpl.toFixed(2) }}</span>
+          </template>
       </a-table>
     </Description>
   </div>