Merge branch 'main' of http://gogs.ainets.net/mirendemianbaona/nc-admin

src/views/order/BuyCard/index.vue

@@ -28,7 +28,7 @@
     </div>
     <!-- 数据表格 -->
     <a-table :data="tableData" :pagination="pageData" :columns="columns" @page-change="evChangePage"
-      :scroll="{ x: '100%', y: '800px' }">
+             :scroll="{ x: 'auto' }">
       <!-- <template #status="{ record }">
         {{ record.status }}
       </template>
@@ -45,10 +45,10 @@
         <div v-if="userType == 2">
           <a-popconfirm :content="`是否确认退订?`" type="warning" @ok="adminCancel(record)">
             <a-button type="text">退订</a-button>
-          </a-popconfirm> 
-          <a-button @click="openDetail(record, 2)" type="text">查看</a-button>   
+          </a-popconfirm>
+          <a-button @click="openDetail(record, 2)" type="text">查看</a-button>
         </div>
-       
+
       </template>
     </a-table>
     <a-modal v-model:visible="uploadContract" title="上传合同" @cancel="handleCancel" @before-ok="handleBeforeOk"
@@ -254,17 +254,17 @@ const searchForm = reactive({
 });
 
 const columns = [
-  { title: '序号', dataIndex: 'index', align: 'center' },
-  { title: '订单编号', dataIndex: 'id', align: 'center', width: 300 },
-  { title: '审核状态', dataIndex: 'orderTypeName', align: 'center' },
-  { title: '订单状态', dataIndex: 'statusName', align: 'center' },
-  { title: '客户名称', dataIndex: 'userName', align: 'center' },
-  { title: '采购数量', dataIndex: 'quantity', align: 'center' },
-  { title: '运营商名称', dataIndex: 'quantity', align: 'center' },
-  { title: '资费', dataIndex: 'quantity', align: 'center' },
-  { title: '支付金额', dataIndex: 'paymentAmount', align: 'center' },
-  { title: '下单时间', dataIndex: 'createdAt', align: 'center' },
-  { title: '操作', slotName: 'operate', align: 'center' }
+  { title: '序号', dataIndex: 'index', align: 'center',ellipsis:true },
+  { title: '订单编号', dataIndex: 'id', align: 'center', ellipsis:true },
+  { title: '审核状态', dataIndex: 'orderTypeName', align: 'center' ,ellipsis:true},
+  { title: '订单状态', dataIndex: 'statusName', align: 'center' ,ellipsis:true},
+  { title: '客户名称', dataIndex: 'userName', align: 'center',ellipsis:true },
+  { title: '采购数量', dataIndex: 'quantity', align: 'center' ,ellipsis:true},
+  { title: '运营商名称', dataIndex: 'quantity', align: 'center',ellipsis:true },
+  { title: '资费', dataIndex: 'quantity', align: 'center',ellipsis:true },
+  { title: '支付金额', dataIndex: 'paymentAmount', align: 'center',ellipsis:true },
+  { title: '下单时间', dataIndex: 'createdAt', align: 'center',ellipsis:true },
+  { title: '操作', slotName: 'operate', align: 'center',ellipsis:true}
 ];
 const columnsDetail = [{ title: 'ICCID', dataIndex: 'iccid' },
 { title: '池名称及编号', dataIndex: 'nameAndId' },
@@ -435,7 +435,7 @@ const adminCancel = (data) => {
   })
 }
 
-// 
+//
 const tariffChange = (e) => {
   formState.value.tariffId = e;
   // tariffObj.value = res.data.records.map(item=>{
@@ -443,7 +443,7 @@ const tariffChange = (e) => {
   // })
 }
 
-// 
+//
 const operateHandle = () => {
   if (currentIndex.value == 1) {
 
@@ -591,4 +591,4 @@ const submitCard = () => {
 .detail-table {
   margin-top: 20px;
 }
-</style>
+</style>

src/views/tariffManagement/config.js

@@ -1,18 +1,18 @@
 export let columns = [
-    { title: window.$t('tariffManagement.id'), dataIndex: 'id', align: 'center', width: 200 },
+    { title: window.$t('tariffManagement.id'), dataIndex: 'id', align: 'center', width: 200 ,ellipsis:true},
     // { title: window.$t('tariffManagement.feeCode'), dataIndex: 'feeCode', align: 'center', width: 200 },
-    { title: window.$t('tariffManagement.userName'), dataIndex: 'userName', align: 'center', width: 200 },
-    { title: window.$t('tariffManagement.label'), dataIndex: 'label', align: 'center', width: 200 },
-    { title: window.$t('tariffManagement.source'), dataIndex: 'sourceName', align: 'center', width: 200 },
+    { title: window.$t('tariffManagement.userName'), dataIndex: 'userName', align: 'center', width: 200,ellipsis:true },
+    { title: window.$t('tariffManagement.label'), dataIndex: 'label', align: 'center', width: 200,ellipsis:true },
+    { title: window.$t('tariffManagement.source'), dataIndex: 'sourceName', align: 'center', width: 200,ellipsis:true },
     // { title: window.$t('tariffManagement.trafficType'), dataIndex: 'trafficTypeName', align: 'center', width: 200 },
     // { title: window.$t('tariffManagement.billingType'), dataIndex: 'billingTypeName', align: 'center', width: 200 },
-    { title: window.$t('tariffManagement.billingCycle'), dataIndex: 'billingCycleName', align: 'center', width: 200 },
+    { title: window.$t('tariffManagement.billingCycle'), dataIndex: 'billingCycleName', align: 'center', width: 200 ,ellipsis:true},
     // { title: window.$t('tariffManagement.bagSize'), dataIndex: 'bagSize', align: 'center', width: 200 },
-    { title: window.$t('tariffManagement.pricing'), dataIndex: 'pricingName', align: 'center', width: 200 },
+    { title: window.$t('tariffManagement.pricing'), dataIndex: 'pricingName', align: 'center', width: 200 ,ellipsis:true},
     // { title: window.$t('tariffManagement.billingMethod'), dataIndex: 'billing_method', align: 'center', width: 200 },
-    { title: window.$t('tariffManagement.settlementCycleLabel'), dataIndex: 'settlementCycle', align: 'center', width: 200 },
-    { title: window.$t('tariffManagement.ActivatedNames'), dataIndex: 'Activated', align: 'center', width: 200 },
-    { title: window.$t('tariffManagement.feeStatus'), dataIndex: 'status', align: 'center', width: 200 },
+    { title: window.$t('tariffManagement.settlementCycleLabel'), dataIndex: 'settlementCycle', align: 'center', width: 200,ellipsis:true },
+    { title: window.$t('tariffManagement.ActivatedNames'), dataIndex: 'Activated', align: 'center', width: 200,ellipsis:true },
+    { title: window.$t('tariffManagement.feeStatus'), dataIndex: 'status', align: 'center', width: 200 ,ellipsis:true},
     {
         title: window.$t('global.common.operations'),
         dataIndex: 'id',
@@ -24,20 +24,20 @@ export let columns = [
 ]
 
 export const columnsCustomer = [
-    { title: window.$t('tariffManagement.id'), dataIndex: 'id', align: 'center', width: 200 },
+    { title: window.$t('tariffManagement.id'), dataIndex: 'id', align: 'center', width: 200,ellipsis:true },
     // { title: window.$t('tariffManagement.feeCode'), dataIndex: 'feeCode', align: 'center', width: 200 },
-    { title: window.$t('tariffManagement.userName'), dataIndex: 'userName', align: 'center', width: 200 },
-    { title: window.$t('tariffManagement.label'), dataIndex: 'label', align: 'center', width: 200 },
-    { title: window.$t('tariffManagement.source'), dataIndex: 'sourceName', align: 'center', width: 200 },
+    { title: window.$t('tariffManagement.userName'), dataIndex: 'userName', align: 'center', width: 200,ellipsis:true },
+    { title: window.$t('tariffManagement.label'), dataIndex: 'label', align: 'center', width: 200 ,ellipsis:true},
+    { title: window.$t('tariffManagement.source'), dataIndex: 'sourceName', align: 'center', width: 200 ,ellipsis:true},
     // { title: window.$t('tariffManagement.trafficType'), dataIndex: 'trafficTypeName', align: 'center', width: 200 },
     // { title: window.$t('tariffManagement.billingType'), dataIndex: 'billingTypeName', align: 'center', width: 200 },
-    { title: window.$t('tariffManagement.billingCycle'), dataIndex: 'billingCycleName', align: 'center', width: 200 },
+    { title: window.$t('tariffManagement.billingCycle'), dataIndex: 'billingCycleName', align: 'center', width: 200,ellipsis:true },
     // { title: window.$t('tariffManagement.bagSize'), dataIndex: 'bagSize', align: 'center', width: 200 },
-    { title: window.$t('tariffManagement.pricing'), dataIndex: 'pricingName', align: 'center', width: 200 },
+    { title: window.$t('tariffManagement.pricing'), dataIndex: 'pricingName', align: 'center', width: 200 ,ellipsis:true},
     // { title: window.$t('tariffManagement.billingMethod'), dataIndex: 'billing_method', align: 'center', width: 200 },
-    { title: window.$t('tariffManagement.settlementCycleLabel'), dataIndex: 'settlementCycle', align: 'center', width: 200 },
-    { title: window.$t('tariffManagement.ActivatedNames'), dataIndex: 'Activated', align: 'center', width: 200 },
-    { title: window.$t('tariffManagement.feeStatus'), dataIndex: 'status', align: 'center', width: 200 },
+    { title: window.$t('tariffManagement.settlementCycleLabel'), dataIndex: 'settlementCycle', align: 'center', width: 200,ellipsis:true },
+    { title: window.$t('tariffManagement.ActivatedNames'), dataIndex: 'Activated', align: 'center', width: 200,ellipsis:true },
+    { title: window.$t('tariffManagement.feeStatus'), dataIndex: 'status', align: 'center', width: 200,ellipsis:true },
 ]