Merge remote-tracking branch 'origin/dev' into dev

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

@@ -27,6 +27,9 @@ public class MaterialRespVO {
     @ExcelProperty("物料名称")
     private String name;
 
+    @Schema(description = "物料名称和编码")
+    private String codeAndName;
+
     @Schema(description = "品牌")
     @ExcelProperty("品牌")
     private String brand;

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java

@@ -39,7 +39,7 @@ public interface MaterialMapper extends BaseMapperX<MaterialDO> {
                 .eq(!StringUtils.isEmpty(reqVO.getVirtualPart()), MaterialDO::getVirtualPart, reqVO.getVirtualPart());
 
         if(!StringUtils.isEmpty(reqVO.getCodeAndName())){
-            query.like(MaterialDO::getName, reqVO.getName()).or().like(MaterialDO::getCode, reqVO.getCode());
+            query.like(MaterialDO::getName, reqVO.getCodeAndName()).or().like(MaterialDO::getCode, reqVO.getCodeAndName());
         }
 
         return selectPage(reqVO, query);

mes-ui/mes-ui-admin-vue3/src/layout/components/warnmessage.vue

@@ -168,11 +168,11 @@ onMounted(() => {
     }
   }
   .warncenter {
-    height: 400px;
+    height: 410px;
     background-color: #fff;
     padding: 10px;
     overflow-y: auto;
-    max-height: 400px;
+    max-height: 410px;
     .warntext {
       display: flex;
       justify-content: space-between;

mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue

@@ -361,7 +361,6 @@ const formData = ref({
   purchaseNo:undefined,
   supplierId:undefined,
   contractNo:undefined,
-  purchaseNo:undefined,
   projectMaterialPlanNo: undefined,
   projectMaterialPlanId: undefined,
   goodsType: undefined,

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

@@ -21,7 +21,7 @@
       </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.HELI_STORAGE_MAT_CHECK_STATUS)" :key="dict.value"
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_STATUS).filter(item=> item.value !==3)" :key="dict.value"
             :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
@@ -95,11 +95,11 @@
       </el-table-column>
       <el-table-column label="操作" fixed="right" align="center" min-width="140">
         <template #default="scope">
-          <el-button link type="primary" @click="openDetail('update', scope.row.id)">
+          <el-button link type="primary" @click="openDetail('update', scope.row.id)" v-if="scope.row.status == 1">
             编辑
           </el-button>
           <el-button link type="primary" @click="openDetail('review', scope.row.id)">
-            查看
+            查看详情
           </el-button>
         </template>
       </el-table-column>