From d638022f25817174059d85c6c4b88679389b43fb Mon Sep 17 00:00:00 2001
From: chenshuichuan <1154693969@qq.com>
Date: Fri, 21 Jun 2024 19:58:13 +0800
Subject: [PATCH] fix mes some status

---
 src/views/mes/feedingrecord/index.vue         | 27 +++----
 src/views/mes/itemrequisition/index.vue       | 67 ++++++----------
 src/views/mes/plan/index.vue                  |  6 +-
 .../ProduceReportDetailIndex.vue              | 25 +++---
 src/views/mes/producereport/index.vue         | 18 +----
 src/views/mes/stockout/index.vue              | 23 +-----
 .../StockWorkshopDetailIndex.vue              | 11 +++
 src/views/mes/task/TaskForm.vue               | 16 +---
 src/views/mes/task/index.vue                  | 79 ++++++-------------
 .../tasksummary/components/TaskDetailList.vue | 14 ++--
 src/views/mes/tasksummary/index.vue           | 65 +++++----------
 11 files changed, 116 insertions(+), 235 deletions(-)

diff --git a/src/views/mes/feedingrecord/index.vue b/src/views/mes/feedingrecord/index.vue
index 5f9ce8d2..eac7f9e2 100644
--- a/src/views/mes/feedingrecord/index.vue
+++ b/src/views/mes/feedingrecord/index.vue
@@ -34,22 +34,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="投料类型" prop="feedingType">
-        <el-select
-          v-model="queryParams.feedingType"
-          placeholder="请选择投料类型"
-          clearable
-          @change="handleQuery"
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.MES_FEEDING_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
 
       <el-form-item label="投料时间" prop="feedingTime">
         <el-date-picker
@@ -107,6 +91,12 @@
 
   <!-- 列表 -->
   <ContentWrap>
+    <el-tabs v-model="activeName" @tab-click="handleTabClick">
+      <el-tab-pane label="所有" name="" />
+      <el-tab-pane label="领料" name="org" />
+      <el-tab-pane label="干废品" name="dry" />
+      <el-tab-pane label="湿废品" name="wet" />
+    </el-tabs>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <!-- 子表的列表 -->
       <el-table-column type="expand">
@@ -301,4 +291,9 @@ const handleUpdateStatus = async (id: number, status:string) => {
   } catch {}
 }
 
+/** tab 切换 */
+const handleTabClick = (tab: TabsPaneContext) => {
+  queryParams.feedingType = tab.paneName
+  handleQuery()
+}
 </script>
diff --git a/src/views/mes/itemrequisition/index.vue b/src/views/mes/itemrequisition/index.vue
index babb3bb5..da1afb37 100644
--- a/src/views/mes/itemrequisition/index.vue
+++ b/src/views/mes/itemrequisition/index.vue
@@ -29,31 +29,6 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择领料单状态"
-          clearable
-          @change="handleQuery"
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.MES_PRODUCE_ITEM_REQUISITION)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-<!--      <el-form-item label="计划" prop="planId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.planId"-->
-<!--          placeholder="请输入计划"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--          class="!w-240px"-->
-<!--        />-->
-<!--      </el-form-item>-->
 
       <el-form-item label="备注" prop="remark">
         <el-input
@@ -96,6 +71,13 @@
 
   <!-- 列表 -->
   <ContentWrap>
+    <el-tabs v-model="activeName" @tab-click="handleTabClick">
+    <el-tab-pane label="所有" name="" />
+    <el-tab-pane label="下达" name="2" />
+    <el-tab-pane label="投料" name="3" />
+    <el-tab-pane label="完成" name="4" />
+  </el-tabs>
+
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <!-- 子表的列表 -->
       <el-table-column type="expand">
@@ -142,26 +124,16 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="操作" align="center" fixed="right" width="150">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['mes:item-requisition:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['mes:item-requisition:delete']"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="操作" align="center" fixed="right" width="150">-->
+<!--        <template #default="scope">-->
+<!--          <el-button link type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['mes:item-requisition:update']">-->
+<!--            编辑-->
+<!--          </el-button>-->
+<!--          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['mes:item-requisition:delete']">-->
+<!--            删除-->
+<!--          </el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
     <!-- 分页 -->
     <Pagination
@@ -271,4 +243,9 @@ const handleExport = async () => {
 onMounted(() => {
   getList()
 })
+/** tab 切换 */
+const handleTabClick = (tab: TabsPaneContext) => {
+  queryParams.status = tab.paneName
+  handleQuery()
+}
 </script>
diff --git a/src/views/mes/plan/index.vue b/src/views/mes/plan/index.vue
index 5c493b2e..eccc2fe7 100644
--- a/src/views/mes/plan/index.vue
+++ b/src/views/mes/plan/index.vue
@@ -79,10 +79,10 @@
         />
       </el-form-item>
 
-      <el-form-item label="生产主管" prop="productionManagerId">
+      <el-form-item label="领料人" prop="productionManagerId">
         <el-input
           v-model="queryParams.productionManagerId"
-          placeholder="请输入生产主管"
+          placeholder="请输入领料人"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
@@ -125,6 +125,7 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
+      <el-tab-pane label="所有" name="" />
       <el-tab-pane label="计划" name="0" />
       <el-tab-pane label="派工" name="1" />
       <el-tab-pane label="开工" name="2" />
@@ -145,6 +146,7 @@
       <el-table-column label="计划开始时间" align="center" sortable prop="planStartTime" :formatter="dateFormatter2" width="150px"/>
       <el-table-column label="计划结束时间" align="center" sortable prop="planEndTime" :formatter="dateFormatter2" width="150px"/>
       <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="领料人" align="center" prop="productionManagerName" />
       <el-table-column label="制浆线" align="center" prop="feedingPipeline">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MES_FEEDING_PIPELINE" :value="scope.row.feedingPipeline" />
diff --git a/src/views/mes/producereport/ProduceReportDetailIndex.vue b/src/views/mes/producereport/ProduceReportDetailIndex.vue
index 62b205e0..7e7a6d3a 100644
--- a/src/views/mes/producereport/ProduceReportDetailIndex.vue
+++ b/src/views/mes/producereport/ProduceReportDetailIndex.vue
@@ -48,21 +48,7 @@
         />
       </el-form-item>
 
-      <el-form-item label="状态" prop="reportStatus">
-        <el-select
-          v-model="queryParams.reportStatus"
-          placeholder="请选择报工状态"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.MES_RECORD_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+
       <el-form-item label="日期" prop="reportDate">
         <el-date-picker
           v-model="queryParams.reportDate"
@@ -108,6 +94,10 @@
 
   <!-- 列表 -->
   <ContentWrap>
+    <el-tabs v-model="activeName" @tab-click="handleTabClick">
+      <el-tab-pane label="所有" name="100" />
+      <el-tab-pane label="通过" name="2" />
+    </el-tabs>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
 
       <el-table-column label="报工单" align="center" prop="reportId" />
@@ -280,4 +270,9 @@ const handleExport = async () => {
 onMounted(() => {
   getList()
 })
+/** tab 切换 */
+const handleTabClick = (tab: TabsPaneContext) => {
+  queryParams.reportStatus = tab.paneName
+  handleQuery()
+}
 </script>
diff --git a/src/views/mes/producereport/index.vue b/src/views/mes/producereport/index.vue
index d1ede90b..c00f32a0 100644
--- a/src/views/mes/producereport/index.vue
+++ b/src/views/mes/producereport/index.vue
@@ -38,21 +38,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择状态"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.MES_RECORD_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+
       <el-form-item label="白班/夜班" prop="groupType">
         <el-select
           v-model="queryParams.groupType"
@@ -104,6 +90,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
+
     <el-table
       v-loading="loading"
       :data="list"
@@ -285,4 +272,5 @@ const handleCurrentChange = (row) => {
 onMounted(() => {
   getList()
 })
+
 </script>
diff --git a/src/views/mes/stockout/index.vue b/src/views/mes/stockout/index.vue
index dd74bafc..76b9aa2b 100644
--- a/src/views/mes/stockout/index.vue
+++ b/src/views/mes/stockout/index.vue
@@ -48,24 +48,6 @@
         />
       </el-form-item>
 
-      <el-form-item label="仓库" prop="warehouseId">
-        <el-select
-          v-model="queryParams.warehouseId"
-          @change="handleQuery"
-          clearable
-          filterable
-          placeholder="请选择仓库"
-          class="!w-240px"
-        >
-          <el-option
-            v-for="item in warehouseList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status"  @change="handleQuery" placeholder="请选择状态" clearable class="!w-240px">
           <el-option
@@ -248,7 +230,7 @@ const queryParams = reactive({
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 const productList = ref<ProductVO[]>([]) // 产品列表
-const warehouseList = ref<WarehouseVO[]>([]) // 仓库列表
+
 
 
 /** 查询列表 */
@@ -332,9 +314,8 @@ const handleSelectionChange = (rows: StockOutVO[]) => {
 /** 初始化 **/
 onMounted(async () => {
   await getList()
-  // 加载产品、仓库列表、客户
+  // 加载产品、
   productList.value = await ProductApi.getItemSimpleList()
-  warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
 
 })
 // TODO 芋艿：可优化功能：列表界面，支持导入
diff --git a/src/views/mes/stockworkshop/StockWorkshopDetailIndex.vue b/src/views/mes/stockworkshop/StockWorkshopDetailIndex.vue
index f90a4615..d770c249 100644
--- a/src/views/mes/stockworkshop/StockWorkshopDetailIndex.vue
+++ b/src/views/mes/stockworkshop/StockWorkshopDetailIndex.vue
@@ -74,6 +74,12 @@
 
   <!-- 列表 -->
   <ContentWrap>
+    <el-tabs v-model="activeName" @tab-click="handleTabClick">
+      <el-tab-pane label="所有" name="" />
+      <el-tab-pane label="投料出库" name="out" />
+      <el-tab-pane label="领料入库" name="in" />
+      <el-tab-pane label="损耗调整" name="clear" />
+    </el-tabs>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column label="明细类别" align="center" prop="detailType">
         <template #default="scope">
@@ -215,4 +221,9 @@ onMounted(async () => {
   // 加载产品、
   productList.value = await ProductApi.getItemSimpleList()
 })
+/** tab 切换 */
+const handleTabClick = (tab: TabsPaneContext) => {
+  queryParams.detailType = tab.paneName
+  handleQuery()
+}
 </script>
diff --git a/src/views/mes/task/TaskForm.vue b/src/views/mes/task/TaskForm.vue
index c2fa6dbb..f5410b7c 100644
--- a/src/views/mes/task/TaskForm.vue
+++ b/src/views/mes/task/TaskForm.vue
@@ -41,17 +41,7 @@
       <el-form-item label="备注" prop="remark">
         <el-input v-model="formData.remark" placeholder="请输入备注" />
       </el-form-item>
-      <el-form-item label="是否启用" prop="isEnable">
-        <el-radio-group v-model="formData.isEnable">
-          <el-radio
-            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-            :key="dict.value"
-            :label="dict.value"
-          >
-            {{ dict.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
+
     </el-form>
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@@ -86,8 +76,8 @@ const formData = ref({
 const formRules = reactive({
   code: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
   deliveryDate: [{ required: true, message: '交货日期不能为空', trigger: 'blur' }],
-  status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
-  isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }]
+  status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
+
 })
 const formRef = ref() // 表单 Ref
 
diff --git a/src/views/mes/task/index.vue b/src/views/mes/task/index.vue
index f23518ef..9af9585a 100644
--- a/src/views/mes/task/index.vue
+++ b/src/views/mes/task/index.vue
@@ -8,7 +8,7 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="" prop="code">
+      <el-form-item label="编码" prop="code">
         <el-input
           v-model="queryParams.code"
           placeholder="请输入编码"
@@ -41,22 +41,6 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          @change="handleQuery"
-          placeholder="请选择状态"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.MES_TASK_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
 
       <el-form-item label="备注" prop="remark">
         <el-input
@@ -105,6 +89,16 @@
 
   <!-- 列表 -->
   <ContentWrap>
+    <el-tabs v-model="activeName" @tab-click="handleTabClick">
+      <el-tab-pane label="所有" name="" />
+      <el-tab-pane label="草稿" name="0" />
+      <el-tab-pane label="送审" name="1" />
+      <el-tab-pane label="下达" name="2" />
+      <el-tab-pane label="计划" name="3" />
+      <el-tab-pane label="开工" name="4" />
+      <el-tab-pane label="完工" name="5" />
+      <el-tab-pane label="入库" name="6" />
+    </el-tabs>
     <el-table
       v-loading="loading"
       :data="list"
@@ -122,53 +116,20 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="是否启用" align="center" prop="isEnable">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
-        </template>
-      </el-table-column>
 
       <el-table-column label="操作" align="center" min-width="200px">
         <template #default="scope">
-          <el-button
-            link
-            type="success"
-            @click="openSaleForm(scope.row.id)"
-            v-hasPermi="['mes:task:update']"
-          >
-            销售单
-          </el-button>
-          <el-button
-            link
-            type="info"
-            @click="openItemNeed(scope.row.code, scope.row.id)"
-            v-hasPermi="['mes:task:update']"
-          >
+          <el-button link type="info" @click="openItemNeed(scope.row.code, scope.row.id)" v-hasPermi="['mes:task:update']">
             物料
           </el-button>
-
-          <el-button
-            link
-            type="success"
-            v-hasPermi="['mes:task:update']"
-          >
-            做计划
+          <!-- 下达后不可更改-->
+          <el-button v-if="scope.row.status<2" link type="success" @click="openSaleForm(scope.row.id)" v-hasPermi="['mes:task:update']">
+            销售单
           </el-button>
-
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['mes:task:update']"
-          >
+          <el-button v-if="scope.row.status<2" link type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['mes:task:update']">
             编辑
           </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['mes:task:delete']"
-          >
+          <el-button v-if="scope.row.status<2" link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['mes:task:delete']">
             删除
           </el-button>
         </template>
@@ -310,4 +271,10 @@ const itemFormRef = ref()
 const openItemNeed = (taskCode:string, taskId: number) => {
   itemFormRef.value.open("task","任务单-"+taskCode, taskId)
 }
+
+/** tab 切换 */
+const handleTabClick = (tab: TabsPaneContext) => {
+  queryParams.status = tab.paneName
+  handleQuery()
+}
 </script>
diff --git a/src/views/mes/tasksummary/components/TaskDetailList.vue b/src/views/mes/tasksummary/components/TaskDetailList.vue
index 0a04fab1..ec0b964f 100644
--- a/src/views/mes/tasksummary/components/TaskDetailList.vue
+++ b/src/views/mes/tasksummary/components/TaskDetailList.vue
@@ -28,19 +28,19 @@
           <el-button
             link
             type="primary"
-            @click="addPlanForm(scope.row.taskId, scope.row.productId,
-            scope.row.totalNumber - scope.row.planNumber)"
-            v-hasPermi="['mes:task:update']"
+            @click="openPlan(scope.row.taskId, scope.row.productId)"
+            v-hasPermi="['mes:plan:query']"
           >
-            新增计划
+            查看计划
           </el-button>
           <el-button
             link
             type="success"
-            @click="openPlan(scope.row.taskId, scope.row.productId)"
-            v-hasPermi="['mes:plan:query']"
+            @click="addPlanForm(scope.row.taskId, scope.row.productId,
+            scope.row.totalNumber - scope.row.planNumber)"
+            v-hasPermi="['mes:task:update']"
           >
-            生产计划
+            新增计划
           </el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/tasksummary/index.vue b/src/views/mes/tasksummary/index.vue
index 28a8406b..c2bea15e 100644
--- a/src/views/mes/tasksummary/index.vue
+++ b/src/views/mes/tasksummary/index.vue
@@ -8,7 +8,7 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="" prop="code">
+      <el-form-item label="编码" prop="code">
         <el-input
           v-model="queryParams.code"
           placeholder="请输入编码"
@@ -41,23 +41,6 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择状态"
-          @change="handleQuery"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.MES_TASK_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-
       <el-form-item label="备注" prop="remark">
         <el-input
           v-model="queryParams.remark"
@@ -82,14 +65,7 @@
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['mes:task:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
+
         <el-button
           type="success"
           plain
@@ -105,6 +81,16 @@
 
   <!-- 列表 -->
   <ContentWrap>
+    <el-tabs v-model="activeName" @tab-click="handleTabClick">
+      <el-tab-pane label="所有" name="" />
+<!--      <el-tab-pane label="草稿" name="0" />-->
+<!--      <el-tab-pane label="送审" name="1" />-->
+      <el-tab-pane label="下达" name="2" />
+      <el-tab-pane label="计划" name="3" />
+      <el-tab-pane label="开工" name="4" />
+      <el-tab-pane label="完工" name="5" />
+      <el-tab-pane label="入库" name="6" />
+    </el-tabs>
     <el-table
       v-loading="loading"
       :data="list"
@@ -125,29 +111,13 @@
 
       <el-table-column label="操作" align="center" min-width="200px">
         <template #default="scope">
-
-          <el-button
-            link
-            type="info"
-            @click="openItemNeed(scope.row.code, scope.row.id)"
-            v-hasPermi="['mes:task:query']"
-          >
+          <el-button link type="info" @click="openItemNeed(scope.row.code, scope.row.id)" v-hasPermi="['mes:task:query']">
             物料
           </el-button>
-          <el-button
-            link
-            type="success"
-            @click="openPlan(scope.row.id)"
-            v-hasPermi="['mes:plan:query']"
-          >
+          <el-button link type="primary" @click="openPlan(scope.row.id)" v-hasPermi="['mes:plan:query']">
             查看计划
           </el-button>
-          <el-button
-            link
-            type="success"
-            @click="openTaskPlanForm(scope.row.id, scope.row.code)"
-            v-hasPermi="['mes:plan:query']"
-          >
+          <el-button link v-if="scope.row.status<5" type="success" @click="openTaskPlanForm(scope.row.id, scope.row.code)" v-hasPermi="['mes:plan:query']">
             排产
           </el-button>
         </template>
@@ -276,4 +246,9 @@ const taskPlanFormRef = ref()
 const openTaskPlanForm = (taskId: number, taskCode:string) => {
   taskPlanFormRef.value.open(taskCode, taskId )
 }
+/** tab 切换 */
+const handleTabClick = (tab: TabsPaneContext) => {
+  queryParams.status = tab.paneName
+  handleQuery()
+}
 </script>