胶料维护规则

jeecgboot-vue3/src/views/mes/material/modules/MesMaterialSelectModal.vue

@@ -16,6 +16,7 @@
   const { createMessage } = useMessage();
 
   const selectedRow = ref<Recordable | null>(null);
+  const onlySales = ref(false);
 
   const [registerTable, { reload, getSelectRowKeys, getSelectRows, setSelectedRowKeys, clearSelectedRowKeys }] = useTable({
     api: materialList,
@@ -33,6 +34,7 @@
     beforeFetch: (params) => ({
       ...params,
       enableFlag: params.enableFlag ?? 1,
+      onlySales: onlySales.value ? 1 : undefined,
     }),
     rowSelection: {
       type: 'radio',
@@ -46,6 +48,7 @@
 
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
     selectedRow.value = null;
+    onlySales.value = !!data?.onlySales;
     clearSelectedRowKeys?.();
     setModalProps({ confirmLoading: false });
     const materialId = data?.materialId as string | undefined;

jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue

@@ -831,7 +831,7 @@
     if (!showFooterFlag.value) {
       return;
     }
-    openRubberMaterialModalInner(true, { materialId: rubberMaterialPickerId.value || '' });
+    openRubberMaterialModalInner(true, { materialId: rubberMaterialPickerId.value || '', onlySales: true });
   }
 
   function openIssueNumberPicker() {

jeecgboot-vue3/src/views/xslmes/mesXslRawMaterialInspectRecord/MesXslRawMaterialInspectRecord.data.ts

@@ -68,7 +68,12 @@ export const lineJVxeColumns: JVxeColumn[] = [
     key: 'inspectValue',
     type: JVxeTypes.inputNumber,
     width: 120,
-    validateRules: [{ required: true, message: '${title}必填' }],
+    props: {
+      isDisabledCell: ({ row }) => {
+        const passFlag = String(row?.passFlag ?? '');
+        return passFlag !== '' && passFlag !== '0';
+      },
+    },
   },
   {
     title: '判定',

jeecgboot-vue3/src/views/xslmes/mesXslRawMaterialInspectRecord/modules/MesXslRawMaterialInspectRecordResultModal.vue

@@ -114,15 +114,14 @@
     }
     try {
       const lineRef = lineTableRef.value as any;
-      if (lineRef?.validateTable) {
-        const err = await lineRef.validateTable();
-        if (err) {
-          createMessage.warning('请完善检验值');
-          return;
-        }
-      }
       const tableData = (lineRef?.getTableData?.() || []) as Recordable[];
-      const lineList = tableData.map((item) => ({
+      const editableRows = tableData.filter((item) => String(item?.passFlag ?? '0') === '0');
+      const hasInput = editableRows.some((item) => item.inspectValue !== null && item.inspectValue !== undefined && item.inspectValue !== '');
+      if (!hasInput) {
+        createMessage.warning('请至少录入一条检验值');
+        return;
+      }
+      const lineList = editableRows.map((item) => ({
         id: item.id,
         inspectValue: item.inspectValue,
       }));