diff --git a/hb_client/src/views/pm/plan.vue b/hb_client/src/views/pm/plan.vue
index 966e079..9688864 100644
--- a/hb_client/src/views/pm/plan.vue
+++ b/hb_client/src/views/pm/plan.vue
@@ -88,7 +88,7 @@
         >
           <template slot-scope="scope">
             <el-link
-              v-if="checkPermission(['plan_toggle'])&&scope.row.state !== 70"
+              v-if="checkPermission(['plan_toggle'])&&scope.row.state!==70&&scope.row.state!==80"
               type="warning"
               @click="handlestatesuspended(scope)"
             >
@@ -101,6 +101,7 @@
             >
               启用
             </el-link>
+            <!--暂停时才能终止-->
             <el-link
               v-if="checkPermission(['plan_stop'])&&scope.row.state === 70"
               type="danger"
@@ -116,7 +117,7 @@
               查看子计划
             </el-link>
             <el-link
-              v-if="checkPermission(['plan_subcreate'])&&!scope.row.is_planed"
+              v-if="checkPermission(['plan_subcreate'])&&!scope.row.is_planed&&scope.row.state!==70&&scope.row.state!==80"
               type="primary"
               @click="handleWork(scope)"
             >
diff --git a/hb_client/src/views/pm/work.vue b/hb_client/src/views/pm/work.vue
index 7f6e8fc..5f738f1 100644
--- a/hb_client/src/views/pm/work.vue
+++ b/hb_client/src/views/pm/work.vue
@@ -69,14 +69,14 @@
         >
           <template slot-scope="scope">
             <el-link
-              v-if="scope.row.state===10&&checkPermission['subplan_issue']"
+              v-if="scope.row.state===10&&checkPermission(['subplan_issue'])&&scope.row.production_plan_.state!==70&&scope.row.production_plan_.state!==80"
               type="primary"
               @click="handleclick(scope)"
             >
               修改日期
             </el-link>
             <el-link
-              v-if="scope.row.state===10&&checkPermission['subplan_issue']"
+              v-if="scope.row.state===10&&checkPermission(['subplan_issue'])&&scope.row.production_plan_.state!==70&&scope.row.production_plan_.state!==80"
               type="primary"
               @click="handleissuedclick(scope)"
             >
@@ -244,7 +244,10 @@
           20: '已下达',
           30: '已接受',
           40: '生产中',
-          50: '已完成'
+          50: '已完成',
+          60: "军检完成",
+          70: "暂停",
+          80: "终止",
         }
       };
     },
diff --git a/hb_client/src/views/wpm/worktask.vue b/hb_client/src/views/wpm/worktask.vue
index 23fb646..a304125 100644
--- a/hb_client/src/views/wpm/worktask.vue
+++ b/hb_client/src/views/wpm/worktask.vue
@@ -67,6 +67,11 @@
                 {{ state_[scope.row.state] }}
               </template>
             </el-table-column>
+            <el-table-column label="任务状态">
+              <template slot-scope="scope">
+               <span v-if="scope.row.production_plan_"> {{ state_[scope.row.production_plan_.state] }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="领料状态" width="80">
               <template slot-scope="scope">
                 <el-tag v-if="scope.row.is_picked == false">未领料</el-tag>
@@ -86,21 +91,21 @@
             >
               <template slot-scope="scope">
                 <el-link
-                  v-if="checkPermission(['wmaterial_pick'])&&!scope.row.is_picked"
+                  v-if="checkPermission(['wmaterial_pick'])&&!scope.row.is_picked&&scope.row.production_plan_.state!==70&&scope.row.production_plan_.state!==80"
                   type="success"
                   @click="handleNeed(scope)"
                 >
                   领料
                 </el-link>
                 <el-link
-                  v-if="checkPermission(['wmaterial_pick'])&&scope.row.is_picked"
+                  v-if="checkPermission(['wmaterial_pick'])&&scope.row.is_picked&&scope.row.production_plan_.state!==70&&scope.row.production_plan_.state!==80"
                   type="success"
                   @click="handleNeed(scope)"
                 >
                   继续领料
                 </el-link>
                 <el-link
-                  v-if="checkPermission(['wmaterial_pick'])"
+                  v-if="checkPermission(['wmaterial_pick'])&&scope.row.production_plan_.state!==70&&scope.row.production_plan_.state!==80"
                   type="primary"
                   @click="handlepick(scope)"
                 >
@@ -778,11 +783,14 @@
 
         },
         state_: {
-          0: "制定中",
-          1: "已下达",
-          2: "已接受",
-          3: "生产中",
-          4: "已完成",
+          10: "制定中",
+          20: "已下达",
+          30: "已接受",
+          40: "生产中",
+          50: "已完成",
+          60: "军检完成",
+          70: "暂停",
+          80: "终止",
         },
         listLoading: true,
         id: "",