huangxw hace 8 meses
padre
commit
c1044727c9

+ 1 - 1
src/views/cdt/models/orderInfo.vue

@@ -169,7 +169,7 @@
                         <el-descriptions-item label="收件人:">{{ info?.reciveAddress?.contactName  }}</el-descriptions-item>
                         <el-descriptions-item label="联系电话:">{{ info?.reciveAddress?.contactPhone  }}</el-descriptions-item>
                     </el-descriptions>
-                    <el-descriptions title="发票信息" :column="4">
+                    <el-descriptions v-if="+info?.hasInvoice" title="发票信息" :column="4">
                         <el-descriptions-item label="发票抬头:">{{ info?.invoiceInfo?.headTitle  }}</el-descriptions-item>
                         <el-descriptions-item label="税号:">{{ info?.invoiceInfo?.taxSn  }}</el-descriptions-item>
                         <el-descriptions-item label="收票邮箱:">{{ info?.invoiceInfo?.email || '-'  }}</el-descriptions-item>

+ 1 - 1
src/views/cdt/orders/index.vue

@@ -74,7 +74,7 @@
                                     <span></span>
                                     <el-button @click="clickRowReport(row)" text class="small-btn-font" type="primary" size="small">上传报告</el-button>
                                 </template>
-                                <template v-if="row?.status === '5'">
+                                <template v-if="row?.status === '5' && +row?.hasInvoice">
                                     <span></span>
                                     <el-button @click="clickRownvoice(row)" text class="small-btn-font" type="primary" size="small">上传发票</el-button>
                                 </template>

+ 9 - 8
src/views/dgtmedicine/model/MemberPayLog.vue

@@ -9,11 +9,12 @@
             </vxe-column>
             <vxe-column title="发票信息" min-width="100">
                 <template #default="{ row }">
-                    <div v-if="row?.invoiceInfo" @click="openInvoiceInfo(row)" class="cs-p">
+                    <div v-if="row?.invoiceInfo && +row?.hasInvoice " @click="openInvoiceInfo(row)" class="cs-p">
                         <div>发票抬头:{{ row?.invoiceInfo?.headTitle || '-' }}</div>
                         <div class="f-s-12">发票税号:{{ row?.invoiceInfo?.taxSn || '-' }}</div>
                         <div class="f-s-12">收票邮箱:{{ row?.invoiceInfo?.email || '-' }}</div>
                     </div>
+                    <div v-else-if="!+row?.hasInvoice">本次不开具发票</div>
                     <div v-else>-</div>
                 </template>
             </vxe-column>
@@ -31,15 +32,15 @@
                 <template #default="{ row }">
                     <el-button @click="confirmPay(row)" v-if="!+row?.paymentStatus" type="success" text>确认付款</el-button>
                     <span></span>
-                    <el-button v-if="+row.invoiceStatus" style="color: #999;" tag="a" text :underline="false"
-                        type="primary" :href="row.invoiceUrlAddr" target="_blank">查看发票</el-button>
-                    <el-button v-else type="primary" text @click="clickRowEdit(row)">上传发票</el-button>
+                    <template v-if="+row?.hasInvoice">
+                        <el-button v-if="+row.invoiceStatus" style="color: #999;" tag="a" text :underline="false" type="primary" :href="row.invoiceUrlAddr" target="_blank">查看发票</el-button>
+                        <el-button v-else type="primary" text @click="clickRowEdit(row)">上传发票</el-button>
+                    </template>
                 </template>
             </vxe-column>
         </vxe-table>
     </div>
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-        v-model:limit="queryParams.pageSize" @pagination="getList" />
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     <uploadInvoiceForm v-if="showInvoice" v-model:show="showInvoice" :info="rowInfo"></uploadInvoiceForm>
     <InvoiceInfo v-if="showInvoiceInfo" v-model:show="showInvoiceInfo" :info="rowInfo"></InvoiceInfo>
 </template>
@@ -48,7 +49,7 @@ import { colNoData } from '@/utils/noData';
 import { listVipPayment, VipConfirmPay } from '@/api/dgtmedicine/vipPayment/index';
 import { DateRange } from '@/views/models/index';
 import { uploadInvoiceForm } from '../model/index';
-const { query }: any = useRoute()
+const { query }: any = useRoute();
 const router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const list = ref<any[]>([]);
@@ -65,7 +66,7 @@ const data = reactive<any>({
         dateRange: [],
         id: '',
         startDate: '',
-        endDate: '',
+        endDate: ''
     }
 });
 const { queryParams } = toRefs(data);

+ 7 - 5
src/views/dgtmedicine/pay-log/index.vue

@@ -44,11 +44,12 @@
                         </vxe-column>
                         <vxe-column title="发票信息" min-width="100">
                             <template #default="{ row }">
-                                <div v-if="row?.invoiceInfo" @click="openInvoiceInfo(row)" class="cs-p">
+                                <div v-if="row?.invoiceInfo && +row?.hasInvoice " @click="openInvoiceInfo(row)" class="cs-p">
                                     <div>发票抬头:{{ row?.invoiceInfo?.headTitle || '-' }}</div>
                                     <div class="f-s-12">发票税号:{{ row?.invoiceInfo?.taxSn || '-' }}</div>
                                     <div class="f-s-12">收票邮箱:{{ row?.invoiceInfo?.email || '-' }}</div>
                                 </div>
+                                <div v-else-if="!+row?.hasInvoice">本次不开具发票</div>
                                 <div v-else>-</div>
                             </template>
                         </vxe-column>
@@ -65,9 +66,11 @@
                         <vxe-column title="操作" align="center" width="200" class-name="small-padding fixed-width">
                             <template #default="{ row }">
                                 <el-button @click="confirmPay(row)" v-if="!+row?.paymentStatus" type="success" text>确认付款</el-button>
-                                <span></span>
-                                <el-button v-if="+row.invoiceStatus" style="color: #999;" tag="a" text :underline="false" type="primary" :href="row.invoiceUrlAddr" target="_blank">查看发票</el-button>
-                                <el-button v-else type="primary" text @click="clickRowEdit(row)">上传发票</el-button>
+                                <template v-if="+row?.hasInvoice">
+                                    <span></span>
+                                    <el-button v-if="+row.invoiceStatus" style="color: #999;" tag="a" text :underline="false" type="primary" :href="row.invoiceUrlAddr" target="_blank">查看发票</el-button>
+                                    <el-button v-else type="primary" text @click="clickRowEdit(row)">上传发票</el-button>
+                                </template>
                             </template>
                         </vxe-column>
                     </vxe-table>
@@ -160,7 +163,6 @@ const resetQuery = () => {
     handleQuery();
 };
 
-
 onMounted(() => {
     getList();
 });