From 68272b20d4a506b4ab4f9ff38d4019906b2549eb Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 16 Jun 2022 11:17:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_client/src/views/dashboard/index.vue |  1 -
 hb_client/src/views/pm/plan.vue         | 31 ++++++++++++-------------
 hb_client/src/views/pm/work.vue         |  3 ++-
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/hb_client/src/views/dashboard/index.vue b/hb_client/src/views/dashboard/index.vue
index 738d691..480d859 100644
--- a/hb_client/src/views/dashboard/index.vue
+++ b/hb_client/src/views/dashboard/index.vue
@@ -604,7 +604,6 @@
           page: val,
           show_atwork:true,
           page_size: that.userPageSize,
-          fields: 'id,name,dept_name,is_atwork'
         }).then((response) => {
           if (response.data) {
             that.userList = response.data.results;
diff --git a/hb_client/src/views/pm/plan.vue b/hb_client/src/views/pm/plan.vue
index 9688864..da9c19f 100644
--- a/hb_client/src/views/pm/plan.vue
+++ b/hb_client/src/views/pm/plan.vue
@@ -37,42 +37,42 @@
         :height="domHeight"
       >
         <el-table-column type="index" width="50"/>
-        <el-table-column label="任务编号" prop="number" width="110">
+        <el-table-column label="任务编号" prop="number" min-width="110">
         </el-table-column>
-        <el-table-column label="订单编号" width="110">
+        <el-table-column label="订单编号" min-width="110">
           <template slot-scope="scope">{{ scope.row.order_.number }}</template>
         </el-table-column>
-        <el-table-column label="合同编号" width="110">
+        <el-table-column label="合同编号" min-width="110">
           <template slot-scope="scope" v-if="scope.row.order_.contract_">
             <span v-if="scope.row.order_.contract_">{{scope.row.order_.contract_.number }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="产品名称" width="150" show-overflow-tooltip>
+        <el-table-column label="产品名称" min-width="150" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.product_.name }}</template>
         </el-table-column>
-        <el-table-column label="产品型号" width="110">
+        <el-table-column label="产品型号" min-width="110">
           <template slot-scope="scope">
             {{scope.row.product_.specification}}
           </template>
         </el-table-column>
-        <el-table-column label="产品单位" width="110">
+        <el-table-column label="产品单位" min-width="110">
           <template slot-scope="scope">{{ scope.row.product_.unit }}</template>
         </el-table-column>
-        <el-table-column label="生产数量" prop="count" width="110">
+        <el-table-column label="生产数量" prop="count" min-width="110">
         </el-table-column>
-        <el-table-column label="状态" width="110">
+        <el-table-column label="状态" min-width="110">
           <template slot-scope="scope">{{ state_[scope.row.state] }}</template>
         </el-table-column>
-        <el-table-column label="计划开工时间" prop="start_date" width="110">
+        <el-table-column label="计划开工时间" prop="start_date" min-width="110">
         </el-table-column>
-        <el-table-column label="计划完工时间" prop="end_date" width="110">
+        <el-table-column label="计划完工时间" prop="end_date" min-width="110">
         </el-table-column>
-        <el-table-column label="交货日期" width="110">
+        <el-table-column label="交货日期" min-width="110">
           <template slot-scope="scope">
             {{scope.row.order_.delivery_date}}
           </template>
         </el-table-column>
-        <el-table-column label="是否生成子计划" width="120">
+        <el-table-column label="是否生成子计划" min-width="120">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.is_planed == false">否</el-tag>
             <el-tag v-if="scope.row.is_planed == true">是</el-tag>
@@ -88,7 +88,7 @@
         >
           <template slot-scope="scope">
             <el-link
-              v-if="checkPermission(['plan_toggle'])&&scope.row.state!==70&&scope.row.state!==80"
+              v-if="checkPermission(['plan_toggle'])&&scope.row.state===40"
               type="warning"
               @click="handlestatesuspended(scope)"
             >
@@ -110,14 +110,13 @@
               终止
             </el-link>
             <el-link
-              v-if="checkPermission(['plan_subcreate'])&&scope.row.is_planed"
               type="primary"
               @click="handleselectplan(scope)"
             >
-              查看子计划
+              查看
             </el-link>
             <el-link
-              v-if="checkPermission(['plan_subcreate'])&&!scope.row.is_planed&&scope.row.state!==70&&scope.row.state!==80"
+              v-if="checkPermission(['gen_subplan'])&&!scope.row.is_planed"
               type="primary"
               @click="handleWork(scope)"
             >
diff --git a/hb_client/src/views/pm/work.vue b/hb_client/src/views/pm/work.vue
index 5f738f1..3993d40 100644
--- a/hb_client/src/views/pm/work.vue
+++ b/hb_client/src/views/pm/work.vue
@@ -69,7 +69,7 @@
         >
           <template slot-scope="scope">
             <el-link
-              v-if="scope.row.state===10&&checkPermission(['subplan_issue'])&&scope.row.production_plan_.state!==70&&scope.row.production_plan_.state!==80"
+              v-if="scope.row.state!==50&&checkPermission(['subplan_issue'])&&scope.row.production_plan_.state!==70&&scope.row.production_plan_.state!==80"
               type="primary"
               @click="handleclick(scope)"
             >
@@ -245,6 +245,7 @@
           30: '已接受',
           40: '生产中',
           50: '已完成',
+
           60: "军检完成",
           70: "暂停",
           80: "终止",