xiaodai2017 1 year ago
parent
commit
1cc70149fd

+ 48 - 11
src/views/InvoiceSales/invoiceApply/components/add-edit-form/add-edit-form.vue

@@ -67,7 +67,8 @@ function handleShowEditModal(_, row: any) {
 function handleEdit({ row, inv_fee, num }) {
   mapSequenceNoToInvfee.value[row.sequenceNo] = {
     inv_fee,
-    num
+    num,
+    platform_type
   };
 }
 
@@ -95,12 +96,14 @@ const handleDelete = (index: number) => {
 function generatorOrderArr() {
   const keys = Object.keys(mapSequenceNoToInvfee.value);
   const orderArr = keys.map(sequenceNo => {
-    const { inv_fee, num } = mapSequenceNoToInvfee.value[sequenceNo];
+    const { inv_fee, num, platform_type } =
+      mapSequenceNoToInvfee.value[sequenceNo];
 
     return {
       sequenceNo,
       inv_fee,
-      num
+      num,
+      platform_type
     };
   });
 
@@ -160,12 +163,13 @@ function handleAddOrder(list) {
   ruleForm.value.remark = "";
 
   list.forEach((item, index) => {
-    const { sequenceNo, winv_fee, winv_num, poCode } = item;
+    const { sequenceNo, platform_type, winv_fee, winv_num, poCode } = item;
 
     if (!mapSequenceNoToInvfee.value[sequenceNo]) {
       mapSequenceNoToInvfee.value[sequenceNo] = {
         inv_fee: winv_fee,
-        num: winv_num
+        num: winv_num,
+        platform_type
       };
       orderList.value.push(item);
       ruleForm.value.remark += index === 0 ? poCode : ";" + poCode;
@@ -370,6 +374,7 @@ onMounted(() => {
               <el-table-column
                 prop="sequenceNo"
                 label="销售订单编码"
+                show-overflow-tooltip
                 width="150"
               />
               <el-table-column
@@ -382,6 +387,7 @@ onMounted(() => {
                 prop="customerNo"
                 label="购买方公司编码"
                 width="150"
+                show-overflow-tooltip
               />
               <el-table-column
                 prop="customerName"
@@ -389,22 +395,53 @@ onMounted(() => {
                 show-overflow-tooltip
                 width="200"
               />
-              <el-table-column prop="winv_num" label="未开票数量" width="110" />
-              <el-table-column prop="winv_fee" label="未开票金额" width="110" />
-
-              <el-table-column label="开票金额" width="110">
+              <el-table-column
+                prop="winv_num"
+                label="未开票数量"
+                show-overflow-tooltip
+                width="110"
+              />
+              <el-table-column
+                prop="winv_fee"
+                label="未开票金额"
+                show-overflow-tooltip
+                width="110"
+              />
+              <el-table-column
+                label="平台类型"
+                width="110"
+                show-overflow-tooltip
+              >
+                <template #="{ row }">
+                  <el-tag size="small">{{
+                    useTypeOptions.find(
+                      p => p.value === String(row.platform_type)
+                    )?.label
+                  }}</el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column
+                label="开票金额"
+                width="110"
+                show-overflow-tooltip
+              >
                 <template #="{ row }">{{
                   mapSequenceNoToInvfee[row.sequenceNo].inv_fee
                 }}</template>
               </el-table-column>
 
-              <el-table-column label="开票数量">
+              <el-table-column label="开票数量" show-overflow-tooltip>
                 <template #="{ row }">{{
                   mapSequenceNoToInvfee[row.sequenceNo].num
                 }}</template>
               </el-table-column>
 
-              <el-table-column label="业务员" prop="ownerName" width="80" />
+              <el-table-column
+                label="业务员"
+                show-overflow-tooltip
+                prop="ownerName"
+                width="80"
+              />
 
               <el-table-column fixed="right" width="70">
                 <template #header>

+ 1 - 1
src/views/interest/accountQuery/config/content.config.ts

@@ -14,7 +14,7 @@ const columns = [
   {
     type: "selection",
     width: 40,
-    align: "center"
+    align: "center",
     hide: ({ checkList }) => !checkList.includes("勾选列")
   },
   {

+ 1 - 1
src/views/interest/companyAccount/columns.tsx

@@ -6,7 +6,7 @@ export function useColumns() {
     {
       type: "selection",
       width: 40,
-    align: "center"
+      align: "center",
       hide: ({ checkList }) => !checkList.includes("勾选列")
     },
     {

+ 1 - 1
src/views/purchase/purchPay/component/choose-modal.vue

@@ -204,7 +204,7 @@ defineExpose({
         show-overflow-tooltip
       >
         <template #="{ row }">
-          <el-tag v-if="col.prop === 'pay_status'">{{
+          <el-tag v-if="col.prop === 'pay_status'" size="small">{{
             payStatusOptions.find(p => p.value === String(row.pay_status))
               ?.label
           }}</el-tag>