commit 解决bug

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

@@ -13,16 +13,16 @@
              :data-source="tableList"
              :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
       <template #DiffSpotQty="{ record }">
-        <a>{{ record.DiffSpotQty.toFixed(2) + " " + record.ENUMDICNAME }}</a>
+        <span>{{ record.DiffSpotQty.toFixed(2) + " " + record.ENUMDICNAME }}</span>
       </template>
       <template #TotalNeedHedgeQty="{ record }">
-        <a>{{ record.TotalNeedHedgeQty.toFixed(2) + " " + record.ENUMDICNAME }}</a>
+        <span>{{ record.TotalNeedHedgeQty.toFixed(2) + " " + record.ENUMDICNAME }}</span>
       </template>
       <template #DiffSpotHedgeQty="{ record }">
-        <a>{{ record.DiffSpotHedgeQty.toFixed(2) + " " + record.ENUMDICNAME }}</a>
+        <span>{{ record.DiffSpotHedgeQty.toFixed(2) + " " + record.ENUMDICNAME }}</span>
       </template>
       <template #OriTotalSpotQty="{ record }">
-        <a>{{ record.OriTotalSpotQty.toFixed(2) + " " + record.ENUMDICNAME }}</a>
+        <span>{{ record.OriTotalSpotQty.toFixed(2) + " " + record.ENUMDICNAME }}</span>
       </template>
     </a-table>
     <!-- 明细 -->

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

@@ -11,6 +11,9 @@
              :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"

src/views/business/purchase/list/all/index.vue

@@ -38,6 +38,16 @@
       <template #unpricedqty="{ text, record }">
         <span>{{ handleEnumdic(text, record) }}</span>
       </template>
+        <template #deliverystartdate,deliveryenddate="{ record }">
+            <span>{{ formatValue(formatTime(record.deliverystartdate, "d") + '--' +
+                        formatTime(record.deliveryenddate, "d"))  }}</span>
+        </template>
+        <template #startdate,enddate="{ record }">
+            <span>{{ formatValue(formatTime(record.startdate, "d") + '--' +
+                        formatTime(record.enddate, "d"))  }}</span>
+        </template>
+
+
 
     </a-table>
     <!-- 右键 -->
@@ -61,6 +71,7 @@ import { QueryPurchase } from '@/services/go/ermcp/purchase';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { getContractStatusName } from '@/common/constants/enumsName';
 import { handleEnumdic } from '../setup';
+import {formatTime, formatValue} from "@/common/methods";
 
 const Detail = defineAsyncComponent(() => import('../../components/detail/index.vue'));
 const Settlement = defineAsyncComponent(() => import('../../components/settlement/index.vue')); //交收登记
@@ -102,6 +113,8 @@ export default defineComponent({
             loading,
             getContractStatusName,
             handleEnumdic,
+            formatTime,
+            formatValue
         };
     },
 });

src/views/business/purchase/list/pending/index.vue

@@ -35,6 +35,15 @@
       <template #unpricedqty="{ text, record }">
         <span>{{ handleEnumdic(text, record) }}</span>
       </template>
+        <template #deliverystartdate,deliveryenddate="{ record }">
+            <span>{{ formatValue(formatTime(record.deliverystartdate, "d") + '--' +
+                        formatTime(record.deliveryenddate, "d"))  }}</span>
+        </template>
+        <template #startdate,enddate="{ record }">
+            <span>{{ formatValue(formatTime(record.startdate, "d") + '--' +
+                        formatTime(record.enddate, "d"))  }}</span>
+        </template>
+
     </a-table>
     <!-- 右键 -->
     <contextMenu :contextMenu="contextMenu"
@@ -56,6 +65,7 @@ import { filterCustomTable } from '../../components';
 import { QueryPurchase } from '@/services/go/ermcp/purchase';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { handleEnumdic } from '../setup';
+import {formatTime, formatValue} from "@/common/methods";
 
 const Detail = defineAsyncComponent(() => import('../../components/detail/index.vue'));
 const SomePrice = defineAsyncComponent(() => import('../../components/someprice/index.vue')); //采购点价登记
@@ -88,6 +98,8 @@ export default defineComponent({
             tableList,
             loading,
             handleEnumdic,
+            formatTime,
+            formatValue
         };
     },
 });

src/views/business/purchase/list/performance/index.vue

@@ -34,6 +34,14 @@
       <template #unpricedqty="{ text, record }">
         <span>{{ handleEnumdic(text, record) }}</span>
       </template>
+        <template #deliverystartdate,deliveryenddate="{ record }">
+            <span>{{ formatValue(formatTime(record.deliverystartdate, "d") + '--' +
+                        formatTime(record.deliveryenddate, "d"))  }}</span>
+        </template>
+        <template #startdate,enddate="{ record }">
+            <span>{{ formatValue(formatTime(record.startdate, "d") + '--' +
+                        formatTime(record.enddate, "d"))  }}</span>
+        </template>
     </a-table>
     <!-- 右键 -->
     <contextMenu :contextMenu="contextMenu"
@@ -55,6 +63,7 @@ import { QueryPurchase } from '@/services/go/ermcp/purchase';
 import { Ermcp3SellBuyContract } from '@/views/business/sell/list';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { handleEnumdic } from '../setup';
+import {formatTime, formatValue} from "@/common/methods";
 
 const Detail = defineAsyncComponent(() => import('../../components/detail/index.vue'));
 const Settlement = defineAsyncComponent(() => import('../../components/settlement/index.vue')); //交收登记
@@ -92,6 +101,8 @@ export default defineComponent({
             tableList,
             loading,
             handleEnumdic,
+            formatTime,
+            formatValue
         };
     },
 });

src/views/business/sell/list/all/index.vue

@@ -38,6 +38,14 @@
       <template #unpricedqty="{ text, record }">
         <span>{{ handleEnumdic(text, record) }}</span>
       </template>
+        <template #deliverystartdate,deliveryenddate="{ record }">
+            <span>{{ formatValue(formatTime(record.deliverystartdate, "d") + '--' +
+                        formatTime(record.deliveryenddate, "d"))  }}</span>
+        </template>
+        <template #startdate,enddate="{ record }">
+            <span>{{ formatValue(formatTime(record.startdate, "d") + '--' +
+                        formatTime(record.enddate, "d"))  }}</span>
+        </template>
     </a-table>
     <!-- 右键 -->
     <contextMenu :contextMenu="contextMenu"
@@ -59,6 +67,7 @@ import { Ermcp3SellBuyContract } from '@/views/business/purchase/list';
 import { filterCustomTable } from '../../components';
 import { getContractStatusName } from '@/common/constants/enumsName';
 import { handleEnumdic } from '../setup';
+import {formatTime, formatValue} from "@/common/methods";
 
 const Detail = defineAsyncComponent(() => import('../../components/detail/index.vue'));
 const Settlement = defineAsyncComponent(() => import('../../components/settlement/index.vue')); //交收登记
@@ -99,6 +108,8 @@ export default defineComponent({
             loading,
             getContractStatusName,
             handleEnumdic,
+            formatTime,
+            formatValue
         };
     },
 });

src/views/business/sell/list/pending/index.vue

@@ -34,6 +34,14 @@
       <template #unpricedqty="{ text, record }">
         <span>{{ handleEnumdic(text, record) }}</span>
       </template>
+        <template #deliverystartdate,deliveryenddate="{ record }">
+            <span>{{ formatValue(formatTime(record.deliverystartdate, "d") + '--' +
+                        formatTime(record.deliveryenddate, "d"))  }}</span>
+        </template>
+        <template #startdate,enddate="{ record }">
+            <span>{{ formatValue(formatTime(record.startdate, "d") + '--' +
+                        formatTime(record.enddate, "d"))  }}</span>
+        </template>
     </a-table>
     <!-- 右键 -->
     <contextMenu :contextMenu="contextMenu"
@@ -55,6 +63,7 @@ import { Ermcp3SellBuyContract } from '@/views/business/purchase/list';
 import { handleEnumdic } from '../setup';
 
 import { filterCustomTable } from '../../components';
+import {formatTime, formatValue} from "@/common/methods";
 const Detail = defineAsyncComponent(() => import('../../components/detail/index.vue'));
 const SomePrice = defineAsyncComponent(() => import('../../components/someprice/index.vue')); //采购点价登记
 
@@ -86,6 +95,8 @@ export default defineComponent({
             tableList,
             loading,
             handleEnumdic,
+            formatTime,
+            formatValue
         };
     },
 });

src/views/business/sell/list/performance/index.vue

@@ -34,6 +34,14 @@
       <template #unpricedqty="{ text, record }">
         <span>{{ handleEnumdic(text, record) }}</span>
       </template>
+        <template #deliverystartdate,deliveryenddate="{ record }">
+            <span>{{ formatValue(formatTime(record.deliverystartdate, "d") + '--' +
+                        formatTime(record.deliveryenddate, "d"))  }}</span>
+        </template>
+        <template #startdate,enddate="{ record }">
+            <span>{{ formatValue(formatTime(record.startdate, "d") + '--' +
+                        formatTime(record.enddate, "d"))  }}</span>
+        </template>
     </a-table>
     <!-- 右键 -->
     <contextMenu :contextMenu="contextMenu"
@@ -54,6 +62,7 @@ import { QueryWareHouse } from '@/services/go/ermcp/sell';
 import { Ermcp3SellBuyContract } from '@/views/business/purchase/list';
 import { handleEnumdic } from '../setup';
 import { filterCustomTable } from '../../components';
+import {formatTime, formatValue} from "@/common/methods";
 const Detail = defineAsyncComponent(() => import('../../components/detail/index.vue'));
 const Settlement = defineAsyncComponent(() => import('../../components/settlement/index.vue')); //交收登记
 const Funds = defineAsyncComponent(() => import('../../components/funds/index.vue')); // 款项登记
@@ -90,6 +99,8 @@ export default defineComponent({
             tableList,
             loading,
             handleEnumdic,
+            formatTime,
+            formatValue
         };
     },
 });

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

@@ -55,6 +55,13 @@
         <template #kxtype="{ text }">
           <a>{{ kxtypeName(text) }}</a>
         </template>
+
+        <!-- 金额-->
+        <template #payamount= "{ text, record }">
+            <a>{{ record.kxtype === 2 ? record.deductamount : text }}</a>
+        </template>
+
+          <!-- 款项记录 款项类型为退款  则金额使用deductamount-->
       </a-table>
     </div>
   </a-modal>