Browse Source

bug处理

ljb 5 months ago
parent
commit
8d211f431d

+ 5 - 0
src/styles/common.scss

@@ -45,4 +45,9 @@ a{
 .page-title {
   margin: 5px 0 12px;
   text-align: center;
+}
+
+.el-table--fluid-height .el-table__fixed,
+.el-table--fluid-height .el-table__fixed-right {
+  background-color: #fff;
 }

+ 8 - 4
src/views/basic-resource/comp-basic-info/comp-info-setting.vue

@@ -62,7 +62,10 @@ export default {
     return {
       yearAndMonth: '',
 
-      logoForm: {},
+      tenantInfo: {},
+      logoForm: {
+        logoUrl: ''
+      },
       logoOption: {
         submitText: '保存',
         emptyBtn: false,
@@ -177,15 +180,16 @@ export default {
       this.tenantLoading = true;
       getTenantDetail(tenantId).then(({ data }) => {
         this.tenantLoading = false;
-        if (data.code == 200) {
-          this.logoForm = data.data;
+        if (data.code == 200 && !!data.data) {
+          this.tenantInfo = data.data
+          this.logoForm.logoUrl = data.data.logoUrl
         }
       }).catch(() => {
         this.tenantLoading = false;
       });
     },
     handleSubmitLogo(form, done) {
-      const params = { ...this.logoForm, tenantId: this.userInfo.tenant_id };
+      const params = { ...this.tenantInfo, ...this.logoForm };
       updateTenant(params).then(({ data }) => {
         done();
         if (data.code == 200) {

+ 6 - 0
src/views/project-manage/components/accept-form.vue

@@ -451,6 +451,12 @@ export default {
   }
 }
 
+@media print {
+  .doc-page {
+    zoom: 90%;
+  }
+}
+
 .doc-page {
   width: 760px;
   margin: 0 auto 30px;

+ 6 - 0
src/views/project-manage/components/apply-form.vue

@@ -753,6 +753,12 @@ export default {
   }
 }
 
+@media print {
+  .apply-form {
+    zoom: 90%;
+  }
+}
+
 .apply-form {
   width: 760px;
   margin: 30px auto;

+ 6 - 0
src/views/project-manage/components/change-form.vue

@@ -459,6 +459,12 @@ export default {
   margin: 0;
 }
 
+@media print {
+  .doc-page {
+    zoom: 90%;
+  }
+}
+
 .doc-page {
   width: 760px;
   margin: 0 auto;

+ 7 - 1
src/views/project-manage/components/implement-form.vue

@@ -97,7 +97,7 @@
             </td>
             <td class="doc-label">研发结束时间</td>
             <td class="doc-input">
-              <span v-if="!disabled">{{ selProject.xmkssj }}</span>
+              <span v-if="!disabled">{{ selProject.xmjssj }}</span>
               <span v-else>{{ formData.xmEntity ? formData.xmEntity.xmjssj : '' }}</span>
             </td>
           </tr>
@@ -396,6 +396,12 @@ export default {
   }
 }
 
+@media print {
+  .doc-page {
+    zoom: 80%;
+  }
+}
+
 
 .doc-page {
   width: 760px;

+ 6 - 6
src/views/project-manage/components/outsourcing-doc.vue

@@ -428,6 +428,12 @@ export default {
   margin: 0;
 }
 
+@media print {
+  .doc-page {
+    zoom: 60%;
+  }
+}
+
 .doc-page {
   width: 1200px;
   height: auto;
@@ -516,10 +522,4 @@ export default {
   margin-top: 12px;
   font-size: 12px;
 }
-
-@media print {
-  .doc-page {
-    zoom: 70%;
-  }
-}
 </style>

+ 2 - 1
src/views/project-manage/components/person-cost.vue

@@ -181,7 +181,8 @@ export default window.$crudCommon({
       item.idCard = item.technician.idCard;
       item.pjrgfy = pjrgfy.toFixed(4);
       item.total = zzsc.mul(pjrgfy).toFixed(4);
-      item.isWp = item.nature === '在职' ? '是' : '否';
+      // item.isWp = item.nature === '在职' ? '是' : '否';
+      item.isWp = item.technician.foreign ? '是' : '否'
       return item;
     });