update

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

@@ -88,7 +88,7 @@ export default defineComponent({
                 // 价格信息
                 const price = [
                     { label: '定价类型', value: getPriceTypeName(data.pricetype) },
-                    { label: '数量', value: formatValue(data.qty) },
+                    { label: '数量', value: formatValue(data.qty) + data.enumdicname },
                     { label: '点价合约', value: formatValue(data.goodsname) },
                     { label: '升贴水', value: formatValue(data.pricemove) },
                     { label: '点价期', value: formatValue(formatTime(data.startdate, 'd') + '--' + formatTime(data.enddate, 'd')) },

src/views/information/spot-contract/list/checkpending/index.vue

@@ -42,23 +42,26 @@
         <a>{{ record.contracttype === 1 ? record.sellusername : record.buyusername }}</a>
       </template>
       <template #startdate="{ record }">
-        <a>{{ formatValue(formatTime(record.startdate, "d") + '--' + formatTime(record.enddate, "d")) }}</a>
+        <span>{{ formatValue(formatTime(record.startdate, "d") + '--' + formatTime(record.enddate, "d")) }}</span>
       </template>
       <!-- 交收期 -->
       <template #deliverystartdate="{ record }">
-        <a>{{ formatValue(formatTime(record.deliverystartdate, "d") + '--' +
-                        formatTime(record.deliveryenddate, "d")) }}</a>
+        <span>{{ formatValue(formatTime(record.deliverystartdate, "d") + '--' +
+                        formatTime(record.deliveryenddate, "d")) }}</span>
       </template>
       <!-- 业务员 -->
       <template #saleuserid="{ record }">
-        <a>{{ findManagerName(record.saleuserid) }}</a>
+        <span>{{ findManagerName(record.saleuserid) }}</span>
       </template>
 
       <!-- 跟单员 -->
       <template #meruserid="{ record }">
-        <a>{{ findManagerName(record.meruserid) }}</a>
+        <span>{{ findManagerName(record.meruserid) }}</span>
+      </template>
+      <!-- 合同量 -->
+      <template #qty="{ text, record }">
+        <span>{{ handleEnumdic(text, record) }}</span>
       </template>
-
     </a-table>
     <!-- 右键 -->
     <contextMenu :contextMenu="contextMenu"
@@ -77,7 +80,7 @@ import { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineCompo
 import { filterCustomTable } from '../../components';
 import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/common/constants/enumsName';
 import { formatTime, formatValue } from '@/common/methods';
-import { queryBusinessManager, findManagerName, tableFilterCB } from '../setup';
+import { queryBusinessManager, findManagerName, tableFilterCB, handleEnumdic } from '../setup';
 import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
 import { QuerySpotContract } from '@/services/go/ermcp/spot-contract';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
@@ -127,6 +130,7 @@ export default defineComponent({
             formatTime,
             formatValue,
             findManagerName,
+            handleEnumdic,
         };
     },
 });

src/views/information/spot-contract/list/finished/index.vue

@@ -46,20 +46,23 @@
       </template>
       <!-- 交收期 -->
       <template #deliverystartdate="{ record }">
-        <a>{{ formatValue(formatTime(record.deliverystartdate, "d") + '--' +
-                        formatTime(record.deliveryenddate, "d")) }}</a>
+        <span>{{ formatValue(formatTime(record.deliverystartdate, "d") + '--' +
+                        formatTime(record.deliveryenddate, "d")) }}</span>
       </template>
 
       <!-- 业务员 -->
       <template #saleuserid="{ record }">
-        <a>{{ findManagerName(record.saleuserid) }}</a>
+        <span>{{ findManagerName(record.saleuserid) }}</span>
       </template>
 
       <!-- 跟单员 -->
       <template #meruserid="{ record }">
-        <a>{{ findManagerName(record.meruserid) }}</a>
+        <span>{{ findManagerName(record.meruserid) }}</span>
+      </template>
+      <!-- 合同量 -->
+      <template #qty="{ text, record }">
+        <span>{{ handleEnumdic(text, record) }}</span>
       </template>
-
     </a-table>
     <!-- 右键 -->
     <contextMenu :contextMenu="contextMenu"
@@ -75,7 +78,7 @@
 
 <script lang="ts">
 import { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, handleComposeTable, ComposeTableParam } from '@/common/export/commonTable';
-import { queryBusinessManager, findManagerName, tableFilterCB } from '../setup';
+import { queryBusinessManager, findManagerName, tableFilterCB, handleEnumdic } from '../setup';
 
 import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/common/constants/enumsName';
 import { formatTime, formatValue } from '@/common/methods';
@@ -123,6 +126,7 @@ export default defineComponent({
             formatTime,
             formatValue,
             findManagerName,
+            handleEnumdic,
         };
     },
 });

src/views/information/spot-contract/list/performance/index.vue

@@ -43,21 +43,25 @@
       </template>
       <!-- 点假期 -->
       <template #startdate="{ record }">
-        <a>{{ formatValue(formatTime(record.startdate, "d") + '--' + formatTime(record.enddate, "d")) }}</a>
+        <span>{{ formatValue(formatTime(record.startdate, "d") + '--' + formatTime(record.enddate, "d")) }}</span>
       </template>
       <!-- 交收期 -->
       <template #deliverystartdate="{ record }">
-        <a>{{ formatValue(formatTime(record.deliverystartdate, "d") + '--' +
-                        formatTime(record.deliveryenddate, "d")) }}</a>
+        <span>{{ formatValue(formatTime(record.deliverystartdate, "d") + '--' +
+                        formatTime(record.deliveryenddate, "d")) }}</span>
       </template>
       <!-- 业务员 -->
       <template #saleuserid="{ record }">
-        <a>{{ findManagerName(record.saleuserid) }}</a>
+        <span>{{ findManagerName(record.saleuserid) }}</span>
       </template>
 
       <!-- 跟单员 -->
       <template #meruserid="{ record }">
-        <a>{{ findManagerName(record.meruserid) }}</a>
+        <span>{{ findManagerName(record.meruserid) }}</span>
+      </template>
+      <!-- 合同量 -->
+      <template #qty="{ text, record }">
+        <span>{{ handleEnumdic(text, record) }}</span>
       </template>
     </a-table>
     <!-- 右键 -->
@@ -76,7 +80,7 @@
 import { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, handleComposeTable, ComposeTableParam } from '@/common/export/commonTable';
 import { filterCustomTable } from '../../components';
 
-import { queryBusinessManager, findManagerName, tableFilterCB } from '../setup';
+import { queryBusinessManager, findManagerName, tableFilterCB, handleEnumdic } from '../setup';
 import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
 import { QuerySpotContract } from '@/services/go/ermcp/spot-contract';
 
@@ -126,6 +130,7 @@ export default defineComponent({
             formatTime,
             formatValue,
             findManagerName,
+            handleEnumdic,
         };
     },
 });

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

@@ -56,4 +56,6 @@ export const tableFilterCB = (e: Column, item: ColumnType, filtered: any) => {
 };
 
 
-
+export function handleEnumdic(text: number | string, record: Ermcp3ContractRsp) {
+    return text + record.enumdicname
+}

src/views/information/spot-contract/list/unsubmitted/index.vue

@@ -27,7 +27,7 @@
       </template>
 
       <template #pricetype="{ text }">
-        <a>{{ getPriceTypeName(text) }}</a>
+        <span>{{ getPriceTypeName(text) }}</span>
       </template>
 
       <template #contracctstatus="{ text }">
@@ -43,21 +43,25 @@
       </template>
       <!-- 点假期 -->
       <template #startdate="{ record }">
-        <a>{{ formatValue(formatTime(record.startdate, "d") + '--' + formatTime(record.enddate, "d")) }}</a>
+        <span>{{ formatValue(formatTime(record.startdate, "d") + '--' + formatTime(record.enddate, "d")) }}</span>
       </template>
       <!-- 交收期 -->
       <template #deliverystartdate="{ record }">
-        <a>{{ formatValue(formatTime(record.deliverystartdate, "d") + '--' +
-                        formatTime(record.deliveryenddate, "d")) }}</a>
+        <span>{{ formatValue(formatTime(record.deliverystartdate, "d") + '--' +
+                        formatTime(record.deliveryenddate, "d")) }}</span>
       </template>
       <!-- 业务员 -->
       <template #saleuserid="{ record }">
-        <a>{{ findManagerName(record.saleuserid) }}</a>
+        <span>{{ findManagerName(record.saleuserid) }}</span>
       </template>
 
       <!-- 跟单员 -->
       <template #meruserid="{ record }">
-        <a>{{ findManagerName(record.meruserid) }}</a>
+        <span>{{ findManagerName(record.meruserid) }}</span>
+      </template>
+      <!-- 合同量 -->
+      <template #qty="{ text, record }">
+        <span>{{ handleEnumdic(text, record) }}</span>
       </template>
     </a-table>
     <!-- 右键 -->
@@ -77,7 +81,7 @@ import { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineCompo
 import { filterCustomTable } from '../../components';
 
 import { formatTime, formatValue } from '@/common/methods';
-import { queryBusinessManager, findManagerName, tableFilterCB } from '../setup';
+import { queryBusinessManager, findManagerName, tableFilterCB, handleEnumdic } from '../setup';
 import { getPriceTypeName, getBizTypeName, getContractStatusName, getContractTypeName } from '@/common/constants/enumsName';
 import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
 import { QuerySpotContract } from '@/services/go/ermcp/spot-contract';
@@ -129,6 +133,7 @@ export default defineComponent({
             formatTime,
             formatValue,
             findManagerName,
+            handleEnumdic,
         };
     },
 });