tangning 1 год назад
Родитель
Сommit
940e67682b
2 измененных файлов с 15 добавлено и 13 удалено
  1. 12 12
      src/views/work/detail.vue
  2. 3 1
      src/views/work/invoiceModal.vue

+ 12 - 12
src/views/work/detail.vue

@@ -21,18 +21,18 @@
                 {{ detailData.customer.phone }}
               </DescriptionsItem>
             </Descriptions>
-            <Descriptions title="发票信息" :column="3">
+            <Descriptions title="发票信息" :column="3" v-if="detailData.repairerVo.invoiceStatus != 0">
               <DescriptionsItem label="是否开票">
-                {{ detailData.repairInvoice.repairId ? '是' : '否' }}</DescriptionsItem
+                {{ detailData.repairerVo.invoiceStatus == 1 ? '是' : '否' }}</DescriptionsItem
               >
               <DescriptionsItem
-                v-if="detailData.repairInvoice && detailData.repairInvoice.invoiceHead"
+                v-if="detailData.repairInvoice && detailData.repairInvoice.invoiceHead && detailData.repairerVo && detailData.repairerVo.invoiceStatus == 1"
                 label="发票抬头"
               >
                 {{ detailData.repairInvoice.invoiceHead }}
               </DescriptionsItem>
               <DescriptionsItem
-                v-if="detailData.repairInvoice && detailData.repairInvoice.invoiceNum"
+                v-if="detailData.repairInvoice && detailData.repairInvoice.invoiceNum && detailData.repairerVo && detailData.repairerVo.invoiceStatus == 1"
                 label="税号"
               >
                 {{ detailData.repairInvoice.invoiceNum }}
@@ -257,7 +257,7 @@
                     <span>{{ item.title || item.remark }}</span>
                   </div>
                   <div class="status" v-if="item.repairLogId">
-                    {{ item.subTitle }} <span>{{ item.createTime }}</span>
+                    {{ item.subTitle }}<div>{{ item.createTime }}</div>
                   </div>
                   <div class="status" v-else>
                     {{ item.subTitle }}
@@ -450,7 +450,7 @@
       ];
       async function enterDialog() {
         const style =
-          '@page { margin:0mm 10mm } @media print {.content{ width: 1200px !important}} ';
+          "@page { margin:0mm 10mm } @media print {.content{ width: 1200px !important} .content_right{width:300px}} ";
         printInfo.width = '1200px !important';
         // const style =
         //   '@page {margin:0mm 10mm;width:100%};' +
@@ -726,9 +726,9 @@
         padding: 40px 0px 40px 20px;
         .timeItem {
           .status {
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
+            // overflow: hidden;
+            // text-overflow: ellipsis;
+            // white-space: nowrap;
           }
           .ant-image-img {
             width: 100%;
@@ -783,9 +783,9 @@
         padding: 40px 0px 40px 20px;
         .timeItem {
           .status {
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
+            // overflow: hidden;
+            // text-overflow: ellipsis;
+            // white-space: nowrap;
           }
           .ant-image-img {
             width: 100%;

+ 3 - 1
src/views/work/invoiceModal.vue

@@ -299,7 +299,9 @@
         fileFlow.invoiceAmount = data.payAmount;
         fileFlow.repairId = data.repairId;
         let getData = await getInvoiceInfo({ repairId: data.repairId });
-        handleUpShow(getData?true:false || data.invoiceStatus != 2, getData && getData.invoiceType == 1 || false);
+        let invoiceStatus = getData && getData.invoiceStatus || data.invoiceStatus
+        console.log(invoiceStatus);
+        handleUpShow(invoiceStatus != 2, getData && getData.invoiceType == 1 || false);
         setFieldsValue({
           ...data,
           ...getData,