Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

hb_client/src/views/pm/plan.vue

@@ -74,7 +74,7 @@
            <el-link type="primary"
               v-else
               @click="handleWork(scope)"
-              >生产子计划</el-link>
+              >生成子计划</el-link>
           </template>
         </el-table-column>
       </el-table>
@@ -305,6 +305,7 @@ export default {
           await  createsubplan(scope.row.id).then((res) => {
               if (res.code >= 200) {
                 this.$message.success("生成子计划成功！");
+                 this.$router.push({name: "work", params: { id: scope.row.id }, })
                  this.getplanList()
               }
             });

hb_client/src/views/pm/resources.vue

@@ -12,6 +12,7 @@
          <el-table
         :data="orderList.results"
        border
+       ref="multipleTable"
         fit
         stripe
         style="width: 100%"
@@ -233,7 +234,7 @@ export default {
         this.listLoading = false;
       });
     },
-      handleSelectionChange(row) {
+      handleSelectionChange(rows) {
         let _this=this
         _this.mutipID=[]
         row.forEach((item) => {
@@ -243,12 +244,20 @@ export default {
         });
      
       });
+        setTimeout(() => {
+                    rows.forEach(row => {
+            this.$refs.multipleTable.toggleRowSelection(row);
+          });
+              }, 1)
+
       },
       //物料计算
   handlecount()
   {
     
    
+
+
         createresource(this.mutipID).then((res) => {
               if (res.code >= 200) {
                 this.materialpzTable=res.data;