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

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

@@ -44,7 +44,7 @@
       </div>
 
       <!-- 各部分数据列表 -->
-      <el-table :data="tableData" style="width: 100%; flex: 1" v-loading="tableDataLoading"
+      <el-table :data="tableData" style="width: 100%;" height="0" v-loading="tableDataLoading"
         @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"> </el-table-column>
         <el-table-column prop="productSchedulingNum" label="排产工单号" width="180">
@@ -848,7 +848,7 @@ export default {
   width: 100%;
   height: 100%;
   display: flex;
-  flex-wrap: wrap;
+  // flex-wrap: wrap;
   flex-direction: column;
   box-sizing: border-box;
   padding: 10px;
@@ -863,6 +863,7 @@ export default {
     flex: 1;
     display: flex;
     flex-direction: column;
+    overflow: auto;
   }
 
   .layout-container-floor {

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

@@ -15,7 +15,7 @@
                 <el-table
                 :data="JobtableData"
                 :key="tableKey"
-                style="width: 100%;height: 80vh;"
+                style="width: 100%;"
                 v-loading="tableDataLoading">
                     <el-table-column label="工序名称">
                         <template slot-scope="scope">{{ scope.row.prodProcedure.name }}</template>

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/product/list.vue

@@ -1104,6 +1104,7 @@ export default {
                 .catch(_ => { });
         },
         changeProcedureVersion(row) {
+            
             let index = null
             for (var i in this.list) {
                 if (this.list[i].id === row.id) {
@@ -1111,7 +1112,8 @@ export default {
                     break
                 }
             }
-            this.getProdProcedureVersion(row.id, index)
+            
+            this.getProdProcedureVersion(row.id, row.tableProdProcedure.version, index)
         },
         changeMaterialVersion(row) {
             let index = null
@@ -1121,7 +1123,8 @@ export default {
                     break
                 }
             }
-            this.getProdMaterialVersion(row.id, index)
+            
+            this.getProdMaterialVersion(row.id,row. index)
         },
         // 获取row的key值
         getRowKeys(row) {