1

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

@@ -72,7 +72,7 @@
         <van-checkbox v-model="isAllChecked" :disabled="distributionList.length == 0" @click="allChecked" shape="square" style="padding-left:3vw"></van-checkbox>
         <div style="padding:1vh 2vw">
         <van-button @click="batchReceive()" :disabled="!isCanAgree || distributionList.length == 0" type="info" size="small">批量接收</van-button>
-        <van-button @click="cancellationReceiveBatch()" :disabled="!isCanAgree || distributionList.length == 0" type="info" size="small">批量取消接收</van-button>
+        <!-- <van-button @click="cancellationReceiveBatch()" :disabled="!isCanAgree || distributionList.length == 0" type="info" size="small">批量取消接收</van-button> -->
         <!-- <van-button @click="batchAgree(false)" :disabled="!isCanAgree || distributionList.length == 0" type="danger" size="small" style="margin-left:2vw">批量驳回</van-button> -->
         </div>
   </div>
@@ -303,10 +303,9 @@ export default {
         if (res.code == "ok") {
           res.data.forEach(item => { item.flg = false })
           let arr = res.data 
-          // checkboxDisabled
           for(var i in arr) {
             arr[i].checkboxDisabled = true
-            if(arr[i].prodProcedureTeamList.length > 0) {
+            if(arr[i].prodProcedureTeamList&&arr[i].prodProcedureTeamList.length > 0) {
               let arrList = arr[i].prodProcedureTeamList.filter(item => item.status == 0 && item.userId==this.user.id)
               console.log(arrList, 'arrList')
               if(arrList.length > 0) {
@@ -315,7 +314,6 @@ export default {
             }
           }
           // this.distributionList = res.data
-          console.log(arr,'')
           this.distributionList = arr
         } else {
           this.$toast.clear();

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

@@ -21,12 +21,13 @@
         </div>
       </div>
       <!-- table数据 -->
-      <div v-if="TabIndex == 0" v-loading="tableDataLoading">
+      <!-- <div> -->
         <el-table
           :data="JobtableData"
           :key="tableKey"
           style="width: 100%"
-          v-loading="tableDataLoading"
+          :height="tableHight"
+          v-if="TabIndex == 0" v-loading="tableDataLoading"
         >
           <el-table-column label="工序名称" width="400">
             <template slot-scope="scope">
@@ -72,7 +73,7 @@
             </template>
           </el-table-column>
         </el-table>
-      </div>
+      <!-- </div> -->
       <!-- <div v-if="TabIndex == 1"  v-loading="tableDataLoading">
                 <el-table
                 :data="MaterialtableData"
@@ -143,6 +144,7 @@ export default {
       MaterialtableData: [],
       LackMaterialtableData: [],
       tableKey: 1,
+      tableHight: 0
     };
   },
   computed: {},
@@ -158,6 +160,8 @@ export default {
     this.topText = productSchedulingNum;
     this.leftText = productName;
     this.getPlanDetail();
+    // tableHight
+    this.tableHight = window.innerHeight - 200
   },
   methods: {
     toBack() {
@@ -249,13 +253,12 @@ export default {
 }
 .planComponentDetil {
   width: 100%;
-  height: 100%;
+  // height: 100%;
   display: flex;
   flex-wrap: wrap;
-  // flex-direction: inherit;
   flex-direction: column;
   box-sizing: border-box;
-  // padding: 20px;
+  overflow: auto;
   .planComponentDetil-top,
   .planComponentDetil-con,
   .planComponentDetil-bon {