fix stock

src/api/erp/stock/in/index.ts

@@ -61,11 +61,11 @@ export const StockInApi = {
     return await request.download({ url: `/erp/stock-in/export-excel`, params })
   },
 
-  // 查询其它入库单分页
+  // 查询生产入库单分页
   getMesStockInPage: async (params: any) => {
     return await request.get({ url: `/erp/stock-in/pageMesStockIn`, params })
   },
-  // 新增其它入库单
+  // 新增生产入库单
   createMesStockIn: async (data: StockInVO) => {
     return await request.post({ url: `/erp/stock-in/createMesStockIn`, data })
   },

src/api/mes/stockindetail/index.ts

@@ -41,5 +41,15 @@ export const StockInDetailApi = {
   // 导出生产入库分配明细 Excel
   exportStockInDetail: async (params) => {
     return await request.download({ url: `/mes/stock-in-detail/export-excel`, params })
-  }
+  },
-}
+  // 更新生产入库状态（审核、反审核）
+  updateMesStockInStatus: async (id: number, status: number) => {
+    return await request.put({
+      url: `/mes/stock-in-detail/updateStockInStatus`,
+      params: {
+        id,
+        status
+      }
+    })
+  },
+}

src/views/mes/plan/index.vue

@@ -206,7 +206,7 @@
             type="primary"
             @click="handleStatus(scope.row.code, scope.row.id, 'start',2,'开工')"
             v-hasPermi="['mes:plan:update']"
-            v-if="scope.row.status === 1 || scope.row.status ===3"
+            v-if="scope.row.status === 1 || scope.row.status ===3 || scope.row.status ===4"
           >
             开工
           </el-button>

src/views/mes/stockin/index.vue

@@ -115,9 +115,8 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column width="30" label="选择" type="selection" />
-      <el-table-column min-width="180" label="入库单号" align="center" prop="no" />
+      <el-table-column min-width="160" label="入库单号" align="center" prop="no" />
       <el-table-column label="产品信息" align="center" prop="productNames" min-width="200" sortable/>
-      <el-table-column label="供应商" align="center" prop="supplierName" />
       <el-table-column
         label="入库时间"
         align="center"
@@ -130,6 +129,7 @@
         label="数量"
         align="center"
         prop="totalCount"
+        min-width="160"
         :formatter="erpCountTableColumnFormatter"
       />
       <el-table-column
@@ -208,12 +208,11 @@ import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import { dateFormatter2 } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { StockInApi, StockInVO } from '@/api/erp/stock/in'
+import { StockInDetailApi, StockInDetailVO } from '@/api/mes/stockindetail'
 import StockInForm from './StockInForm.vue'
 import { ProductApi, ProductVO } from '@/api/erp/product/product'
 import { WarehouseApi, WarehouseVO } from '@/api/erp/stock/warehouse'
-import { SupplierApi, SupplierVO } from '@/api/erp/purchase/supplier'
+
-import { UserVO } from '@/api/system/user'
-import * as UserApi from '@/api/system/user'
 import { erpCountTableColumnFormatter, erpPriceTableColumnFormatter } from '@/utils'
 
 /** ERP 其它入库单列表 */
@@ -292,7 +291,7 @@ const handleUpdateStatus = async (id: number, status: number) => {
     // 审批的二次确认
     await message.confirm(`确定${status === 20 ? '审批' : '反审批'}该入库单吗？`)
     // 发起审批
-    await StockInApi.updateStockInStatus(id, status)
+    await StockInDetailApi.updateMesStockInStatus(id, status)
     message.success(`${status === 20 ? '审批' : '反审批'}成功`)
     // 刷新列表
     await getList()