Merge branch 'master' into test

src/views/inspectionReport/template/inspection_report1.vue

@@ -275,6 +275,10 @@ export default {
             if(this.currentRow.reportTemplateJson?.basicInfoData) {
                 this.basicInfoData = this.currentRow.reportTemplateJson.basicInfoData || {};
                 this.inspectionItems = this.currentRow.reportTemplateJson.inspectionItems || [];
+
+                this.$set(this.basicInfoData, 'inspectionTime', this.basicInfoData.inspectionTime?.split(' ')[0] || '');
+                this.$set(this.basicInfoData, 'reviewTime', this.basicInfoData.reviewTime?.split(' ')[0] || '');
+                this.$set(this.basicInfoData, 'approvedDate', this.basicInfoData.approvedDate?.split(' ')[0] || '');
             } else {
                 this.getBasicInfo();
                 this.getInspectionItems();
@@ -283,6 +287,9 @@ export default {
         getBasicInfo() {
             queryInspectionReportData(this.currentRow.id).then(res => {
                 this.basicInfoData = res;
+                this.$set(this.basicInfoData, 'inspectionTime', this.basicInfoData.inspectionTime?.split(' ')[0] || '');
+                this.$set(this.basicInfoData, 'reviewTime', this.basicInfoData.reviewTime?.split(' ')[0] || '');
+                this.$set(this.basicInfoData, 'approvedDate', this.basicInfoData.approvedDate?.split(' ')[0] || '');
             });
         },
         getInspectionItems() {

src/views/inspectionWork/index.vue

@@ -114,7 +114,7 @@
             v-if="
                 row.status == 1 &&
                 isReportApproval == 1 &&
-                (!row.reportApprovalStatus || row.reportApprovalStatus == 0) && 
+                (!row.reportApprovalStatus || row.reportApprovalStatus == 0) && isEmptyObject(row.reportTemplateJson) &&
                 $hasPermission('qms:quality_work_order:generateReport')
               "
           >
@@ -136,7 +136,7 @@
             v-if="
                 row.status == 1 &&
                 isReportApproval == 1 &&
-                row.reportApprovalStatus &&
+                (row.reportApprovalStatus || !isEmptyObject(row.reportTemplateJson)) &&
                 $hasPermission('qms:quality_work_order:generateReport')
               "
             type="primary"
@@ -683,6 +683,9 @@
           // page: 1
         });
       },
+      isEmptyObject(obj) {
+        return Object.keys(obj).length === 0;
+      },
       async openEdit(type, row) {
         const menusList = this.$store.state.user.menus;
         let found = false;