Merge branch 'feature/pdf' of http://git.jimijiayuan.cn/jml0128/xrk-bi into feature/pdf

src/packages/task-recored/src/components/header.vue

@@ -21,7 +21,7 @@
         </div>
         </div>
       </div>
       </div>
       <div class="info">
       <div class="info">
-        <div class="info-item">
+        <div v-if="+from === 2" class="info-item">
           <span>项目执行人：</span>
           <span>项目执行人：</span>
           <span>{{ resData.fullName }}</span>
           <span>{{ resData.fullName }}</span>
         </div>
         </div>
@@ -29,7 +29,7 @@
           <span>项目名称：</span>
           <span>项目名称：</span>
           <span>{{ resData.projectName }}</span>
           <span>{{ resData.projectName }}</span>
         </div>
         </div>
-        <div class="info-item">
+        <div v-if="+from === 2" class="info-item">
           <span>电话：</span>
           <span>电话：</span>
           <span>{{ resData.phone }}</span>
           <span>{{ resData.phone }}</span>
         </div>
         </div>
@@ -40,7 +40,7 @@
           </span>
           </span>
         </div>
         </div>
         <div class="info-item">
         <div class="info-item">
-          <span>{{ resData.enterpriseTitle }}</span>
+          <span>{{ resData.enterpriseTitle }}：</span>
           <span>{{ resData.enterpriseName }}</span>
           <span>{{ resData.enterpriseName }}</span>
         </div>
         </div>
         <div class="info-item">
         <div class="info-item">
@@ -64,7 +64,7 @@
 import dateFormat from '@/utils/dateFormat';
 import dateFormat from '@/utils/dateFormat';
 export default {
 export default {
   props: {
   props: {
-    from: String,
+    from: String || Number,
     resData: Object
     resData: Object
   },
   },
   methods: {
   methods: {

src/packages/task-recored/src/main.vue

@@ -24,7 +24,7 @@ export default {
   props: {
   props: {
     from: {
     from: {
       type: String,
       type: String,
-      default: 'gongye'
+      default: '1'
     },
     },
     projectType: {
     projectType: {
       type: [Number, String]
       type: [Number, String]
@@ -49,6 +49,7 @@ export default {
     makeSceneTaskInfo({ taskId: this.taskId }).then(res => {
     makeSceneTaskInfo({ taskId: this.taskId }).then(res => {
       this.resData = res.data;
       this.resData = res.data;
     });
     });
+    console.log(this.from, 'v-if="+from===1"');
   }
   }
 };
 };
 </script>
 </script>

src/packages/task-recored/src/style/index.css

@@ -4,9 +4,9 @@
 * Autoprefixer: v10.3.1
 * Autoprefixer: v10.3.1
 * Browsers: >1%,last 2 versions
 * Browsers: >1%,last 2 versions
 */
 */
-
 @page {
 @page {
-  size: 1190px;
+  size: auto;
+  margin: 20px 20px;
 }
 }
 * {
 * {
   font-family: SimSun;
   font-family: SimSun;