qymljy 1 месяц назад
Родитель
Сommit
86be7fe5e7

+ 16 - 14
src/HDrpManagement/serveWorkBill/components/printTable.vue

@@ -21,8 +21,8 @@
           </h2>
           <h3 style="text-align: center">{{ $t("服务确认单") }}</h3>
           <div class="flex">
-            <p>{{ $t("日期") }}:{{ detail.createdate }}</p>
-            <p>{{ $t("编号") }}:{{ detail.confirmationno }}</p>
+            <p>{{ $t("日期") }}:{{ detail.createdate || "--" }}</p>
+            <p>{{ $t("编号") }}:{{ detail.confirmationno || "--"}}</p>
           </div>
         </div>
         <table
@@ -224,8 +224,8 @@
             {{ $t("BZ/Q(EO)P38-02系统《E服务确认单》") }}
           </h3>
           <div class="flex">
-            <p>{{ $t("日期") }}:{{ detail.createdate }}</p>
-            <p>{{ $t("编号") }}:{{ detail.confirmationno }}</p>
+            <p>{{ $t("日期") }}:{{ detail.createdate || "--"}}</p>
+            <p>{{ $t("编号") }}:{{ detail.confirmationno || "--"}}</p>
           </div>
         </div>
         <table
@@ -399,8 +399,8 @@
             {{ $t("售后服务确认单") }}
           </h3>
           <div class="flex">
-            <p>{{ $t("日期") }}:{{ detail.createdate }}</p>
-            <p>{{ $t("编号") }}:{{ detail.confirmationno }}</p>
+            <p>{{ $t("日期") }}:{{ detail.createdate || "--"}}</p>
+            <p>{{ $t("编号") }}:{{ detail.confirmationno || "--"}}</p>
           </div>
         </div>
         <table
@@ -489,8 +489,8 @@
             <td colspan="5">
               {{
                 detail.confirmationcontent[8]
-                  ? detail.confirmationcontent[8].treatment.confirm_value
-                  : ""
+                  ? detail.confirmationcontent[8].treatment ? detail.confirmationcontent[8].treatment.confirm_value
+                  : "" : ""
               }}
             </td>
           </tr>
@@ -499,9 +499,9 @@
             <td colspan="5">
               {{
                 detail.confirmationcontent[7]
-                  ? detail.confirmationcontent[7].nextTreatmentTime
+                  ? detail.confirmationcontent[7].nextTreatmentTime ?  detail.confirmationcontent[7].nextTreatmentTime
                       .confirm_value
-                  : ""
+                  : "" : ""
               }}
             </td>
           </tr>
@@ -510,8 +510,8 @@
             <td colspan="5">
               {{
                 detail.confirmationcontent[9]
-                  ? detail.confirmationcontent[9].explain.confirm_value
-                  : ""
+                  ? detail.confirmationcontent[9].explain ? detail.confirmationcontent[9].explain.confirm_value
+                  : "" : ""
               }}
             </td>
           </tr>
@@ -559,8 +559,8 @@
             {{ $t("BZ/Q(EO)P38-02系统《E服务确认单》") }}
           </h3>
           <div class="flex">
-            <p>{{ $t("日期") }}:{{ detail.createdate }}</p>
-            <p>{{ $t("编号") }}:{{ detail.confirmationno }}</p>
+            <p>{{ $t("日期") }}:{{ detail.createdate || "--"}}</p>
+            <p>{{ $t("编号") }}:{{ detail.confirmationno || "--"}}</p>
           </div>
         </div>
         <table
@@ -785,6 +785,7 @@ export default {
         },
       };
       let res = await this.$api.requested(param);
+      console.log(res.data,'输出单据信息')
       if (res.data.workorder.type == "安装测试") {
         res.data.confirmationcontent.forEach((e) => {
           Object.keys(e).map((key, index) => {
@@ -818,6 +819,7 @@ export default {
           });
         });
       } else {
+
         res.data.confirmationcontent.forEach((e) => {
           Object.keys(e).map((key, index) => {
             this.text.descriptions4 += e[key].amount;

+ 3 - 1
src/HDrpManagement/serveWorkBill/modules/detail.vue

@@ -249,8 +249,10 @@ export default {
           this.$refs.serviceWorkOrderRef.$refs.taskRefDetail.tableData = this.nodes
         })
       }
+      this.$nextTick(()=>{
+        this.$refs.serviceWorkOrderRef.changeDataStructure(this.mainData)
+      })
 
-      this.$refs.serviceWorkOrderRef.changeDataStructure(this.mainData)
     },
     downLoadBill(data) {
       let result = data.attinfos.filter(

+ 4 - 1
src/HDrpManagement/serveWorkBill/modules/serviceWorkOrder/index.vue

@@ -324,6 +324,7 @@ export default {
       return arr;
     },
     downLoadBill(data) {
+      console.log(data,'输出data22322')
 
       let result = data.attinfos.filter(
           (item) => item.usetype == "comfirmbill"
@@ -363,7 +364,9 @@ export default {
     handleClick(){
       if (this.activeName == '服务确认单'){
         let id = this.internalData.sa_workorderid ? this.internalData.sa_workorderid : -1
-        this.$refs.checkBillRef.listData(id)
+        this.$nextTick(()=>{
+          this.$refs.checkBillRef.listData(id)
+        })
       }else if (this.activeName == '服务团队'){
         let id = this.internalData.sa_workorderid ? this.internalData.sa_workorderid : -1
         this.$refs.teamList.listData(id)