零件采购单审批

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PurchaseOrderMakePageReqVO.java

@@ -26,7 +26,7 @@ public class PurchaseOrderMakePageReqVO extends PageParam {
     private Boolean purchaseType;
 
     @Schema(description = "采购物类型，1物料，2加工件", example = "1")
-    private Boolean goodsType;
+    private Integer goodsType;
 
     @Schema(description = "结算币种", example = "2")
     private Integer currencyType;
@@ -41,7 +41,7 @@ public class PurchaseOrderMakePageReqVO extends PageParam {
     private BigDecimal actualPrice;
 
     @Schema(description = "单据状态,0 待送审，1已送审，2已审核，3已打回 ，默认是1", example = "2")
-    private Boolean status;
+    private Integer status;
 
     @Schema(description = "送审人", example = "17514")
     private Long submitUserId;
@@ -79,7 +79,12 @@ public class PurchaseOrderMakePageReqVO extends PageParam {
     @Schema(description = "项目名称", example = "芋艿")
     private String projectName;
 
+    @Schema(description = "子项目名称", example = "芋艿")
+    private String projectSubName;
+
     @Schema(description = "项目名称简码")
     private String projectNameSim;
 
+    @Schema(description = "供应商名称")
+    private String supplierName;
 }

mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/detail.vue

@@ -60,8 +60,8 @@
       </el-card>
     </el-form>
     <div class="hl-footer text-center">
-      <el-button v-if="formData.status === 1" @click="approve" size="large">批 准</el-button>
+      <el-button v-if="formData.type === 'check'" @click="approve" size="large">批 准</el-button>
-      <el-button v-if="formData.status === 1" @click="handleReject" size="large">驳 回</el-button>
+      <el-button v-if="formData.type === 'cehck'" @click="handleReject" size="large">驳 回</el-button>
     </div>
   </el-card>
 
@@ -114,7 +114,8 @@ const formData = ref({
   boomItemRemoveList: [],
   matBoomDOList: [],
   matItemRemoveList: [],
-  attachments: []
+  attachments: [],
+  type: query.type
 })
 
 const formRef = ref() // 表单 Ref

mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/index.vue

@@ -21,12 +21,12 @@
         <el-input v-model="queryParams.supplierName" placeholder="请输入供应商名称" clearable @keyup.enter="handleQuery" class="!w-240px" />
       </el-form-item>
       <el-form-item label="采购单类型" prop="goodType">
-        <el-select v-model="queryParams.goodType" placeholder="请选择采购单类型" clearable class="!w-240px">
+        <el-select v-model="queryParams.goodsType" placeholder="请选择采购单类型" clearable class="!w-240px">
           <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PART_PURCHASE_ORDER_TYPE)" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="单据状态" prop="documentStatus">
-        <el-select v-model="queryParams.documentStatus" placeholder="请选择单据状态" clearable class="!w-240px">
+        <el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable class="!w-240px">
           <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_DOCUMENT_STATUS)" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
@@ -129,11 +129,11 @@ const queryParams = reactive({
   submitTime: [],
   auditor: undefined,
   auditTime: [],
-  goodType: 2,
+  goodsType: 2,
   description: undefined,
   createTime: [],
   matType:0,
-  documentStatus:1
+  status:1
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
@@ -174,7 +174,10 @@ const openForm = (type: string, id?: number) => {
       router.push({ path: '/purchase/materialplanedit', query: { id: id } })
       break;
     case 'detail':
-      router.push({ path: '/purchase/PartPurchaseCheckDetail', query: { id: id } })
+      router.push({ path: '/purchase/PartPurchaseCheckDetail', query: { id: id , type: type} })
+      break;
+    case 'check':
+      router.push({ path: '/purchase/PartPurchaseCheckDetail', query: { id: id , type: type} })
       break;
     default:
       break;