Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/planView/InsertionPlan/InsertionPlanItem.vue

@@ -8,7 +8,7 @@
       <div class="item"><p>计划人数:</p><span>{{ planList.planManNum }}人</span></div>
       <div class="item"><div>{{ planList.taskTypeName }}</div></div>
       <div class="item"><p>数量:</p><span>{{ planList.num }}</span></div>
-      <div class="item"><p>工时:</p><span>{{ planList.planWorkHour }}小时</span></div>
+      <div class="item"><p>工时:</p><span>{{ planList.planWorkHour }} h</span></div>
       <div class="item" style="width: 100%;">
         <p>组员:</p>
         <span :style="`color: #333`" @click.stop="distributionProp()" v-if="planList.planProcedureTotals[0] && planList.planProcedureTotals[0].teamNames">
@@ -181,6 +181,7 @@ export default {
       }
       span {
         display: inline-block;
+        font-size: 14px;
         max-width: 220px;
         min-width: 60px;
         .van-icon {

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/planView/component/planComponent.vue

@@ -100,7 +100,10 @@ export default {
           id: item.id,
           departmentId: item.stationId,
           titleText: this.titleText,
-          type: this.type
+          type: this.type,
+          dates: item.startDate + '-' + item.endDate,
+          productSchedulingNum: item.productSchedulingNum,
+          productName: item.productName,
         }
       })
     }

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/planView/todayPlan/distribution.vue

@@ -2,9 +2,9 @@
   <div class="distribution">
     <van-nav-bar :title="titleText" left-text="返回" :right-text="!todayAndTomorrow ? '下发计划' : ''" @click-left="back" @click-right="placeAnOrder" fixed left-arrow/>
     <div class="distribution_header">
-      <div>东湾2号线电池箱</div>
-      <div>00001</div>
-      <div>20230620</div>
+      <div>{{ productName }}</div>
+      <div>{{ productSchedulingNum }}</div>
+      <div>{{ dates }}</div>
     </div>
     <div class="distribution_con contentRoll">
       <div class="distribution_box" v-for="item,index in distributionList" :key="index">
@@ -24,10 +24,10 @@
             <div>总工价：</div><span class="textBeyondHiding">{{ item.totalWages }}</span>
           </div>
           <div class="PlanItem">
-            <div>单件工时：</div><span class="textBeyondHiding">{{ item.prodProcedure.unitPrice }}</span>
+            <div>单件工时：</div><span class="textBeyondHiding">{{ item.prodProcedure.unitPrice }} min</span>
           </div>
           <div class="PlanItem">
-            <div>总工时：</div><span class="textBeyondHiding">{{ item.totalWorkingHours }}</span>
+            <div>总工时：</div><span class="textBeyondHiding">{{ item.totalWorkingHours }} min</span>
           </div>
           <div class="PlanItem" v-if="todayAndTomorrow">
             <div>进度：</div><span class="textBeyondHiding">{{item.totalProgress}}%</span>
@@ -67,6 +67,10 @@ export default {
       departmentId: '', // 部门id
       peopleList: [], // 人员数据
       peopleListId: [], // 回显人员ID
+
+      dates: '',
+      productSchedulingNum: '',
+      productName: ''
     };
   },
   computed: {},
@@ -76,6 +80,9 @@ export default {
     this.id = this.$route.query.id
     this.type = this.$route.query.type
     this.departmentId = this.$route.query.departmentId
+    this.dates = this.$route.query.dates
+    this.productSchedulingNum = this.$route.query.productSchedulingNum
+    this.productName = this.$route.query.productName
     console.log(this.id)
     this.titleText = this.$route.query.titleText
     if(this.titleText == '今日计划') {
@@ -249,6 +256,7 @@ export default {
             span {
               display: inline-block;
               color: #333;
+              font-size: 14px;
             }
           }
         }

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/plan/planComponent.vue

@@ -727,14 +727,20 @@ export default {
         pathUrl = "/plan/planDetil";
       }
       console.log(pathUrl);
+      localStorage.setItem("planDetilData", JSON.stringify(item));
       this.$router.push({
         path: pathUrl,
         name: "计划详情",
-        params: {
-          id: item.id,
-          topText: item.productSchedulingNum,
-          leftText: item.productName,
-        },
+        // query: {
+        //   id: item.id,
+        //   topText: item.productSchedulingNum,
+        //   leftText: item.productName,
+        // },
+        // params: {
+        //   id: item.id,
+        //   topText: item.productSchedulingNum,
+        //   leftText: item.productName,
+        // },
       });
     },
     // 导入数据

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/plan/planComponentDetil.vue

@@ -116,11 +116,14 @@ export default {
     watch: {},
     created() { },
     mounted() { 
-        const { id, topText, leftText } = this.$route.params
-        console.log(this.$route.params, '携带')
+        // const { id, topText, leftText } = this.$route.params
+        // const { id, topText, leftText } = this.$route.query
+        // console.log(this.$route.query, '携带')
+        const planDetilData = JSON.parse(localStorage.getItem('planDetilData'))
+        const { id, productSchedulingNum, productName } = planDetilData
         this.id = id
-        this.topText = topText
-        this.leftText = leftText
+        this.topText = productSchedulingNum
+        this.leftText = productName
         this.getPlanDetail()
      },
     methods: {