新疆马铃薯
1.质量管理三种检验要自动判断是否合格
2.指标维护修改权限放开
已添加1个文件
已修改9个文件
1655 ■■■■ 文件已修改
src/api/qualityManagement/rawMaterialInspection.js 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/qualityManagement/finalInspection/components/formDia.vue 236 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/qualityManagement/finalInspection/components/inspectionFormDia.vue 191 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/qualityManagement/metricMaintenance/ParamFormDialog.vue 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/qualityManagement/metricMaintenance/index.vue 60 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/qualityManagement/processInspection/components/formDia.vue 264 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/qualityManagement/processInspection/components/inspectionFormDia.vue 191 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/qualityManagement/rawMaterialInspection/components/formDia.vue 214 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/qualityManagement/rawMaterialInspection/components/inspectionFormDia.vue 191 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
权限变更文档.md 267 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/qualityManagement/rawMaterialInspection.js
@@ -91,3 +91,20 @@
    })
}
// å•参数项自动判断
export function autoJudge(data) {
    return request({
        url: '/quality/qualityInspect/autoJudge',
        method: 'post',
        data,
    })
}
// æ•´ä½“自动判断
export function autoJudgeAll(inspectId) {
    return request({
        url: `/quality/qualityInspect/autoJudgeAll/${inspectId}`,
        method: 'get',
    })
}
src/views/qualityManagement/finalInspection/components/formDia.vue
@@ -120,7 +120,7 @@
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="检验规则" prop="inspectRule">
              <el-radio-group v-model="form.inspectRule">
              <el-radio-group v-model="form.inspectRule" :disabled="isViewMode">
                <el-radio :label="0">全检</el-radio>
                <el-radio :label="1">抽检</el-radio>
              </el-radio-group>
@@ -145,11 +145,11 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="检测结果:" prop="checkResult">
              <el-select v-model="form.checkResult" :disabled="isViewMode">
                <el-option label="合格" value="合格" />
                <el-option label="不合格" value="不合格" />
                <el-option label="部分合格" value="部分合格" />
              </el-select>
              <el-radio-group v-model="form.checkResult" :disabled="isViewMode || autoJudgeResult === '不合格'">
                <el-radio label="合格">合格</el-radio>
                <el-radio label="不合格">不合格</el-radio>
                <el-radio label="部分合格">部分合格</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
        </el-row>
@@ -178,17 +178,65 @@
          </el-col>
        </el-row>
      </el-form>
            <PIMTable
                rowKey="id"
                :column="tableColumn"
                :tableData="tableData"
                :tableLoading="tableLoading"
                height="400"
            >
                <template #slot="{ row }">
                    <el-input v-model="row.testValue" clearable :disabled="isViewMode"/>
                </template>
            </PIMTable>
      <PIMTable
        rowKey="id"
        :column="tableColumn"
        :tableData="tableData"
        :tableLoading="tableLoading"
        :isShowPagination="false"
        height="400"
      >
        <template #judgeTypeSlot="{ row }">
          <el-tag v-if="row.judgeType === '≥'" type="success">≥</el-tag>
          <el-tag v-else-if="row.judgeType === '≤'" type="warning">≤</el-tag>
          <el-tag v-else-if="row.judgeType === '范围'" type="info">范围</el-tag>
          <el-tag v-else>文字</el-tag>
        </template>
        <template #isRequiredSlot="{ row }">
          <el-tag v-if="row.isRequired === 1" type="danger">是</el-tag>
          <el-tag v-else type="info">否</el-tag>
        </template>
        <template #testValueSlot="{ row }">
          <el-input v-model="row.testValue" clearable :disabled="isViewMode" @input="handleTestValueChange(row)" />
        </template>
        <template #isQualifiedSlot="{ row }">
          <template v-if="row.judgeType !== '文字描述'">
            <el-tag v-if="row.isQualified === 1" type="success">合格</el-tag>
            <el-tag v-else-if="row.isQualified === 0" type="danger">不合格</el-tag>
            <span v-else>-</span>
          </template>
          <template v-else>
            <el-select v-model="row.isQualified" placeholder="请选择" size="small" :disabled="isViewMode" @change="handleTextResultChange">
              <el-option :value="1" label="合格" />
              <el-option :value="0" label="不合格" />
            </el-select>
          </template>
        </template>
      </PIMTable>
      <div v-if="!isViewMode" style="margin-top: 16px;">
        <el-form label-width="120px">
          <el-form-item label="自动判断结果">
            <template v-if="autoJudgeResult">
              <el-tag v-if="autoJudgeResult === '合格'" type="success" size="large">合格</el-tag>
              <el-tag v-else-if="autoJudgeResult === '部分合格'" type="warning" size="large">部分合格</el-tag>
              <el-tag v-else type="danger" size="large">不合格</el-tag>
              <span v-if="autoJudgeResult === '不合格'" style="margin-left: 10px; color: #909399;">
                ï¼ˆå¿…要判断参数有不合格项,不可手动修改)
              </span>
              <span v-if="autoJudgeResult === '部分合格'" style="margin-left: 10px; color: #909399;">
                ï¼ˆå¿…要判断参数均合格,非必要参数有不合格项,可手动选择最终结果)
              </span>
            </template>
            <template v-else>
              <el-tag type="info" size="large">需手动判断</el-tag>
              <span style="margin-left: 10px; color: #909399;">
                ï¼ˆæ‰€æœ‰å‚数均为文字描述类型,请手动选择)
              </span>
            </template>
          </el-form-item>
        </el-form>
      </div>
      <template #footer>
        <div class="dialog-footer">
          <template v-if="!isViewMode">
@@ -227,7 +275,7 @@
    model: "",
    testStandardId: "",
    unit: "",
    quantity: "",
    quantity: undefined,
    qualifiedQuantity: "",
    unqualifiedQuantity: "",
    checkCompany: "",
@@ -264,31 +312,20 @@
const supplierList = ref([]);
const productOptions = ref([]);
const tableColumn = ref([
    {
        label: "指标",
        prop: "parameterItem",
    },
    {
        label: "单位",
        prop: "unit",
    },
    {
        label: "厂家标准值",
        prop: "standardValue",
    },
    {
        label: "内控值",
        prop: "controlValue",
    },
    {
        label: "检验值",
        prop: "testValue",
        dataType: 'slot',
        slot: 'slot',
    },
  { label: "指标", prop: "parameterItem" },
  { label: "单位", prop: "unit" },
  { label: "厂家标准值", prop: "standardValue" },
  { label: "下限值", prop: "minValue" },
  { label: "上限值", prop: "maxValue" },
  { label: "内控值", prop: "controlValue" },
  { label: "判断类型", prop: "judgeType", dataType: 'slot', slot: 'judgeTypeSlot' },
  { label: "必要判断", prop: "isRequired", dataType: 'slot', slot: 'isRequiredSlot' },
  { label: "检验值", prop: "testValue", dataType: 'slot', slot: 'testValueSlot' },
  { label: "是否合格", prop: "isQualified", dataType: 'slot', slot: 'isQualifiedSlot' },
]);
const tableData = ref([]);
const tableLoading = ref(false);
const autoJudgeResult = ref(null);
const userList = ref([]);
const currentProductId = ref(0);
const testStandardOptions = ref([]); // æŒ‡æ ‡é€‰æ‹©ä¸‹æ‹‰æ¡†æ•°æ®
@@ -299,6 +336,7 @@
const openDialog = async (type, row) => {
  operationType.value = type;
  dialogFormVisible.value = true;
  autoJudgeResult.value = null;
  // å…ˆæ¸…空表单验证状态,避免闪烁
  await nextTick();
  proxy.$refs.formRef?.clearValidate();
@@ -459,23 +497,25 @@
const handleQualifiedQuantityChange = (value) => {
  if (value === null || value === undefined) {
    form.value.qualifiedQuantity = 0;
    form.value.qualifiedQuantity = undefined;
    return;
  }
  const quantity = parseFloat(form.value.quantity) || 0;
  const quantity = parseFloat(form.value.quantity);
  if (isNaN(quantity) || quantity <= 0) return;
  const qualified = parseFloat(value) || 0;
  form.value.qualifiedQuantity = qualified > quantity?quantity:qualified;
  form.value.qualifiedQuantity = Math.min(qualified, quantity);
  form.value.unqualifiedQuantity = Math.max(0, quantity - qualified);
};
const handleUnqualifiedQuantityChange = (value) => {
  if (value === null || value === undefined) {
    form.value.unqualifiedQuantity = 0;
    form.value.unqualifiedQuantity = undefined;
    return;
  }
  const quantity = parseFloat(form.value.quantity) || 0;
  const quantity = parseFloat(form.value.quantity);
  if (isNaN(quantity) || quantity <= 0) return;
  const unqualified = parseFloat(value) || 0;
  form.value.unqualifiedQuantity = unqualified > quantity?quantity:unqualified;
  form.value.unqualifiedQuantity = Math.min(unqualified, quantity);
  form.value.qualifiedQuantity = Math.max(0, quantity - unqualified);
};
@@ -517,28 +557,95 @@
    return newItem;
  });
}
const handleTestValueChange = (row) => {
  if (isViewMode.value) return;
  if (!row.testValue || !row.judgeType || row.judgeType === '文字描述') {
    return;
  }
  const testVal = parseFloat(row.testValue);
  if (isNaN(testVal)) return;
  let qualified = false;
  if (row.judgeType === '≥') {
    const stdVal = parseFloat(row.standardValue);
    if (isNaN(stdVal)) return;
    qualified = testVal >= stdVal;
  } else if (row.judgeType === '≤') {
    const stdVal = parseFloat(row.standardValue);
    if (isNaN(stdVal)) return;
    qualified = testVal <= stdVal;
  } else if (row.judgeType === '范围') {
    const minVal = parseFloat(row.minValue);
    const maxVal = parseFloat(row.maxValue);
    if (isNaN(minVal) || isNaN(maxVal)) return;
    qualified = testVal >= minVal && testVal <= maxVal;
  } else {
    return;
  }
  row.isQualified = qualified ? 1 : 0;
  performAutoJudgeAll();
};
const handleTextResultChange = () => {
  performAutoJudgeAll()
};
const performAutoJudgeAll = () => {
  if (!tableData.value.length) return;
  const allTextDesc = tableData.value.every(item => item.judgeType === '文字描述');
  if (allTextDesc) {
    autoJudgeResult.value = null;
    return;
  }
  const requiredParams = tableData.value.filter(item => item.isRequired === 1);
  if (requiredParams.length === 0) {
    autoJudgeResult.value = null;
    return;
  }
  const hasUnqualified = requiredParams.some(item => item.isQualified === 0);
  const allJudged = requiredParams.every(item => item.isQualified === 1 || item.isQualified === 0);
  if (!allJudged) {
    autoJudgeResult.value = null;
    return;
  }
  if (hasUnqualified) {
    autoJudgeResult.value = '不合格';
    form.value.checkResult = '不合格';
    return;
  }
  const nonRequiredUnqualified = tableData.value.filter(item => item.isRequired !== 1 && item.isQualified === 0);
  if (nonRequiredUnqualified.length > 0) {
    autoJudgeResult.value = '部分合格';
    form.value.checkResult = '部分合格';
  } else {
    autoJudgeResult.value = '合格';
    form.value.checkResult = '合格';
  }
};
// æäº¤äº§å“è¡¨å•
const submitForm = () => {
  proxy.$refs.formRef.validate(valid => {
    if (valid) {
      form.value.inspectType = 2;
      if (operationType.value === "add") {
        tableData.value.forEach((item) => {
          delete item.id;
        });
      }
      const data = { ...form.value, qualityInspectParams: tableData.value };
      if (operationType.value === "add") {
        qualityInspectAdd(data).then(res => {
          proxy.$modal.msgSuccess("提交成功");
          closeDia();
        });
      } else {
        qualityInspectUpdate(data).then(res => {
          proxy.$modal.msgSuccess("提交成功");
          closeDia();
        });
      }
      performAutoJudgeAll();
        form.value.inspectType = 2;
        if (operationType.value === "add") {
          tableData.value.forEach((item) => {
            delete item.id;
          });
        }
        const data = { ...form.value, qualityInspectParams: tableData.value };
        if (operationType.value === "add") {
          qualityInspectAdd(data).then(res => {
            proxy.$modal.msgSuccess("提交成功");
            closeDia();
          });
        } else {
          qualityInspectUpdate(data).then(res => {
            proxy.$modal.msgSuccess("提交成功");
            closeDia();
          });
        }
    }
  });
}
@@ -593,6 +700,7 @@
  tableData.value = [];
  testStandardOptions.value = [];
  form.value.testStandardId = '';
  autoJudgeResult.value = null;
  dialogFormVisible.value = false;
  emit('close');
}
src/views/qualityManagement/finalInspection/components/inspectionFormDia.vue
@@ -6,7 +6,7 @@
        width="70%"
        @close="closeDia"
    >
      <div style="margin-bottom: 10px;text-align: right">
      <div v-if="!isViewMode" style="margin-bottom: 10px;text-align: right">
        <el-button type="danger" plain @click="handleDelete">删除</el-button>
      </div>
      <PIMTable
@@ -15,17 +15,76 @@
          :tableData="tableData"
          :tableLoading="tableLoading"
          :isSelection="true"
          :isShowPagination="false"
          @selection-change="handleSelectionChange"
          height="600"
          height="400"
      >
        <template #slot="{ row }">
          <el-input v-model="row.testValue" clearable/>
        <template #judgeTypeSlot="{ row }">
          <el-tag v-if="row.judgeType === '≥'" type="success">≥</el-tag>
          <el-tag v-else-if="row.judgeType === '≤'" type="warning">≤</el-tag>
          <el-tag v-else-if="row.judgeType === '范围'" type="info">范围</el-tag>
          <el-tag v-else>文字</el-tag>
        </template>
        <template #isRequiredSlot="{ row }">
          <el-tag v-if="row.isRequired === 1" type="danger">是</el-tag>
          <el-tag v-else type="info">否</el-tag>
        </template>
        <template #testValueSlot="{ row }">
          <el-input v-model="row.testValue" clearable :disabled="isViewMode" @input="handleTestValueChange(row)" />
        </template>
        <template #isQualifiedSlot="{ row }">
          <template v-if="row.judgeType !== '文字描述'">
            <el-tag v-if="row.isQualified === 1" type="success">合格</el-tag>
            <el-tag v-else-if="row.isQualified === 0" type="danger">不合格</el-tag>
            <span v-else>-</span>
          </template>
          <template v-else>
            <el-select v-model="row.isQualified" placeholder="请选择" size="small" :disabled="isViewMode" @change="handleTextResultChange(row)">
              <el-option :value="1" label="合格" />
              <el-option :value="0" label="不合格" />
            </el-select>
          </template>
        </template>
      </PIMTable>
      <div style="margin-top: 16px;">
        <el-form label-width="120px">
          <el-form-item label="自动判断结果">
            <template v-if="autoJudgeResult">
              <el-tag v-if="autoJudgeResult === '合格'" type="success" size="large">合格</el-tag>
              <el-tag v-else-if="autoJudgeResult === '部分合格'" type="warning" size="large">部分合格</el-tag>
              <el-tag v-else type="danger" size="large">不合格</el-tag>
              <span v-if="autoJudgeResult === '不合格'" style="margin-left: 10px; color: #909399;">
                ï¼ˆå¿…要判断参数有不合格项,不可手动修改)
              </span>
              <span v-if="autoJudgeResult === '部分合格'" style="margin-left: 10px; color: #909399;">
                ï¼ˆå¿…要判断参数均合格,非必要参数有不合格项,可手动选择最终结果)
              </span>
            </template>
            <template v-else>
              <el-tag type="info" size="large">需手动判断</el-tag>
              <span style="margin-left: 10px; color: #909399;">
                ï¼ˆæ‰€æœ‰å‚数均为文字描述类型,请手动选择)
              </span>
            </template>
          </el-form-item>
          <el-form-item label="最终判定">
            <el-radio-group v-model="checkResult" :disabled="isViewMode || autoJudgeResult === '不合格'">
              <el-radio label="合格">合格</el-radio>
              <el-radio label="不合格">不合格</el-radio>
              <el-radio label="部分合格">部分合格</el-radio>
            </el-radio-group>
          </el-form-item>
        </el-form>
      </div>
      <template #footer>
        <div class="dialog-footer">
          <el-button type="primary" @click="submitForm">确认</el-button>
          <el-button @click="closeDia">取消</el-button>
          <template v-if="!isViewMode">
            <el-button type="primary" @click="submitForm">确认</el-button>
            <el-button @click="closeDia">取消</el-button>
          </template>
          <el-button v-else @click="closeDia">关闭</el-button>
        </div>
      </template>
    </el-dialog>
@@ -33,14 +92,13 @@
</template>
<script setup>
import {ref} from "vue";
import {Search} from "@element-plus/icons-vue";
import { ref, computed, getCurrentInstance } from "vue";
import {
  qualityInspectParamDel,
  qualityInspectParamInfo,
  qualityInspectParamUpdate
} from "@/api/qualityManagement/qualityInspectParam.js";
import {ElMessageBox} from "element-plus";
import { ElMessageBox } from "element-plus";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])
@@ -48,38 +106,31 @@
const operationType = ref('')
const currentId = ref('')
const selectedRows = ref([]);
const autoJudgeResult = ref(null)
const checkResult = ref('')
const isViewMode = computed(() => operationType.value === 'view')
const tableColumn = ref([
  {
    label: "指标",
    prop: "parameterItem",
  },
  {
    label: "单位",
    prop: "unit",
  },
  {
    label: "厂家标准值",
    prop: "standardValue",
  },
  {
    label: "内控值",
    prop: "controlValue",
  },
  {
    label: "检验值",
    prop: "testValue",
    dataType: 'slot',
    slot: 'slot',
  },
  { label: "指标", prop: "parameterItem" },
  { label: "单位", prop: "unit" },
  { label: "厂家标准值", prop: "standardValue" },
  { label: "下限值", prop: "minValue" },
  { label: "上限值", prop: "maxValue" },
  { label: "内控值", prop: "controlValue" },
  { label: "判断类型", prop: "judgeType", dataType: 'slot', slot: 'judgeTypeSlot' },
  { label: "必要判断", prop: "isRequired", dataType: 'slot', slot: 'isRequiredSlot' },
  { label: "检验值", prop: "testValue", dataType: 'slot', slot: 'testValueSlot' },
  { label: "是否合格", prop: "isQualified", dataType: 'slot', slot: 'isQualifiedSlot' },
]);
const tableData = ref([]);
const tableLoading = ref(false);
// æ‰“开弹框
const openDialog = (type, row) => {
  operationType.value = type;
  dialogFormVisible.value = true;
  if (operationType.value === 'edit') {
  autoJudgeResult.value = null
  checkResult.value = ''
  if (operationType.value === 'edit' || operationType.value === 'view') {
    currentId.value = row.id;
    getList()
  }
@@ -89,23 +140,87 @@
    tableData.value = res.data;
  })
}
// è¡¨æ ¼é€‰æ‹©æ•°æ®
const handleSelectionChange = (selection) => {
  selectedRows.value = selection;
};
// æäº¤äº§å“è¡¨å•
const handleTestValueChange = (row) => {
  if (isViewMode.value) return;
  if (!row.testValue || !row.judgeType || row.judgeType === '文字描述') {
    return;
  }
  const testVal = parseFloat(row.testValue);
  if (isNaN(testVal)) return;
  let qualified = false;
  if (row.judgeType === '≥') {
    const stdVal = parseFloat(row.standardValue);
    if (isNaN(stdVal)) return;
    qualified = testVal >= stdVal;
  } else if (row.judgeType === '≤') {
    const stdVal = parseFloat(row.standardValue);
    if (isNaN(stdVal)) return;
    qualified = testVal <= stdVal;
  } else if (row.judgeType === '范围') {
    const minVal = parseFloat(row.minValue);
    const maxVal = parseFloat(row.maxValue);
    if (isNaN(minVal) || isNaN(maxVal)) return;
    qualified = testVal >= minVal && testVal <= maxVal;
  } else {
    return;
  }
  row.isQualified = qualified ? 1 : 0;
  performAutoJudgeAll();
};
const handleTextResultChange = () => {
  performAutoJudgeAll()
};
const performAutoJudgeAll = () => {
  if (!tableData.value.length) return;
  const allTextDesc = tableData.value.every(item => item.judgeType === '文字描述');
  if (allTextDesc) {
    autoJudgeResult.value = null;
    return;
  }
  const requiredParams = tableData.value.filter(item => item.isRequired === 1);
  if (requiredParams.length === 0) {
    autoJudgeResult.value = null;
    return;
  }
  const hasUnqualified = requiredParams.some(item => item.isQualified === 0);
  const allJudged = requiredParams.every(item => item.isQualified === 1 || item.isQualified === 0);
  if (!allJudged) {
    autoJudgeResult.value = null;
    return;
  }
  if (hasUnqualified) {
    autoJudgeResult.value = '不合格';
    checkResult.value = '不合格';
    return;
  }
  const nonRequiredUnqualified = tableData.value.filter(item => item.isRequired !== 1 && item.isQualified === 0);
  if (nonRequiredUnqualified.length > 0) {
    autoJudgeResult.value = '部分合格';
    checkResult.value = '部分合格';
  } else {
    autoJudgeResult.value = '合格';
    checkResult.value = '合格';
  }
};
const submitForm = () => {
  performAutoJudgeAll();
  qualityInspectParamUpdate(tableData.value).then(res => {
    proxy.$modal.msgSuccess("提交成功");
    closeDia();
  })
}
// å…³é—­å¼¹æ¡†
const closeDia = () => {
  dialogFormVisible.value = false;
  emit('close')
};
// åˆ é™¤
const handleDelete = () => {
  let ids = [];
  if (selectedRows.value.length > 0) {
@@ -136,4 +251,4 @@
<style scoped>
</style>
</style>
src/views/qualityManagement/metricMaintenance/ParamFormDialog.vue
@@ -20,6 +20,20 @@
      <el-form-item label="单位" prop="unit">
        <el-input v-model="form.unit" placeholder="请输入单位" />
      </el-form-item>
            <el-form-item label="判断类型" prop="judgeType">
                <el-select v-model="form.judgeType" placeholder="请选择判断类型" @change="handleJudgeTypeChange">
                    <el-option label="大于等于(≥)" value="≥" />
                    <el-option label="小于等于(≤)" value="≤" />
                    <el-option label="范围" value="范围" />
                    <el-option label="文字描述" value="文字描述" />
                </el-select>
            </el-form-item>
            <el-form-item v-if="form.judgeType === '范围'" label="范围上限值" prop="maxValue">
                <el-input-number v-model="form.maxValue" :precision="4" :min="0" />
            </el-form-item>
            <el-form-item v-if="form.judgeType === '范围'" label="范围下限值" prop="minValue">
                <el-input-number v-model="form.minValue" :precision="4" :min="0" />
            </el-form-item>
      <el-form-item label="厂家标准值" prop="standardValue">
        <el-input v-model="form.standardValue" placeholder="请输入厂家标准值" />
      </el-form-item>
@@ -28,6 +42,9 @@
      </el-form-item>
      <el-form-item label="默认值" prop="defaultValue">
        <el-input v-model="form.defaultValue" placeholder="请输入默认值" />
      </el-form-item>
      <el-form-item label="是否必要判断" prop="isRequired">
        <el-switch v-model="form.isRequired" :active-value="1" :inactive-value="0" />
      </el-form-item>
    </el-form>
  </FormDialog>
@@ -59,6 +76,13 @@
const computedTitle = computed(() => (props.operationType === 'edit' ? '编辑标准参数' : '新增标准参数'))
const handleJudgeTypeChange = (val) => {
  if (val !== '范围') {
    props.form.minValue = null
    props.form.maxValue = null
  }
}
const handleConfirm = () => {
  formRef.value?.validate?.((valid) => {
    if (valid) emit('confirm')
src/views/qualityManagement/metricMaintenance/index.vue
@@ -100,10 +100,10 @@
      </div>
      <div class="right-toolbar">
        <el-button type="primary" :disabled="!currentStandard || isStandardReadonly" @click="openParamDialog('add')">
        <el-button type="primary" :disabled="!currentStandard" @click="openParamDialog('add')">
          æ–°å¢ž
        </el-button>
        <el-button type="danger" plain :disabled="!currentStandard || isStandardReadonly" @click="handleParamBatchDelete" v-hasPermi="['qualityManagement:metricMaintenance:remove']">
        <el-button type="danger" plain :disabled="!currentStandard" @click="handleParamBatchDelete" v-hasPermi="['qualityManagement:metricMaintenance:remove']">
          åˆ é™¤
        </el-button>
      </div>
@@ -124,13 +124,30 @@
        <el-table-column prop="unit" label="单位" width="80" />
        <el-table-column prop="standardValue" label="厂家标准值" min-width="120" />
        <el-table-column prop="controlValue" label="内控值" min-width="120" />
        <el-table-column label="判断类型" width="100">
          <template #default="{ row }">
            <el-tag v-if="row.judgeType === '≥'" type="success">≥</el-tag>
            <el-tag v-else-if="row.judgeType === '≤'" type="warning">≤</el-tag>
            <el-tag v-else-if="row.judgeType === '范围'" type="info">范围</el-tag>
            <el-tag v-else-if="row.judgeType === '文字描述'">文字</el-tag>
            <span v-else>-</span>
          </template>
        </el-table-column>
        <el-table-column label="必要判断" width="80">
          <template #default="{ row }">
            <el-tag v-if="row.isRequired === 1" type="danger">是</el-tag>
            <el-tag v-else type="info">否</el-tag>
          </template>
        </el-table-column>
        <el-table-column prop="minValue" label="范围下限" width="100" />
        <el-table-column prop="maxValue" label="范围上限" width="100" />
        <el-table-column prop="defaultValue" label="默认值" min-width="120" />
        <el-table-column label="操作" width="140" fixed="right" align="center">
          <template #default="{ row }">
            <el-button link type="primary" :disabled="isStandardReadonly" @click="openParamDialog('edit', row)">
            <el-button link type="primary" @click="openParamDialog('edit', row)">
              ç¼–辑
            </el-button>
            <el-button link type="danger" :disabled="isStandardReadonly" @click="handleParamDelete(row)" v-hasPermi="['qualityManagement:metricMaintenance:remove']">
            <el-button link type="danger" @click="handleParamDelete(row)" v-hasPermi="['qualityManagement:metricMaintenance:remove']">
              åˆ é™¤
            </el-button>
          </template>
@@ -167,7 +184,7 @@
<script setup>
import { Search } from '@element-plus/icons-vue'
import { ref, reactive, toRefs, onMounted, getCurrentInstance, computed } from 'vue'
import { ref, reactive, toRefs, onMounted, getCurrentInstance } from 'vue'
import { ElMessageBox } from 'element-plus'
import {
  qualityTestStandardListPage,
@@ -190,11 +207,6 @@
// å·¦ä¾§æ ‡å‡†åˆ—表:整行内容居中(配合样式)
const rowClassNameCenter = () => 'row-center'
// æ ‡å‡†çŠ¶æ€ä¸ºâ€œé€šè¿‡(1)”时,右侧参数禁止增删改
const isStandardReadonly = computed(() => {
  const state = currentStandard.value?.state
  return state === 1 || state === '1'
})
// æœç´¢æ¡ä»¶
const data = reactive({
@@ -270,7 +282,11 @@
  unit: '',
  standardValue: '',
  controlValue: '',
  defaultValue: ''
  defaultValue: '',
  judgeType: null,
  isRequired: 0,
  minValue: null,
  maxValue: null
})
// å¼¹çª—
@@ -508,10 +524,6 @@
const openParamDialog = (type, row) => {
  if (!currentStandard.value?.id) return
  if (isStandardReadonly.value) {
    proxy.$message.warning('该标准已通过,参数不可编辑')
    return
  }
  paramOperationType.value = type
  if (type === 'add') {
    Object.assign(paramForm, {
@@ -520,7 +532,11 @@
      unit: '',
      standardValue: '',
      controlValue: '',
      defaultValue: ''
      defaultValue: '',
      judgeType: null,
      isRequired: 0,
      minValue: null,
      maxValue: null
    })
  } else if (type === 'edit' && row) {
    Object.assign(paramForm, row)
@@ -536,10 +552,6 @@
const submitParamForm = async () => {
  const testStandardId = currentStandard.value?.id
  if (!testStandardId) return
  if (isStandardReadonly.value) {
    proxy.$message.warning('该标准已通过,参数不可编辑')
    return
  }
  const payload = { ...paramForm, testStandardId }
  if (paramOperationType.value === 'edit') {
    await qualityTestStandardParamUpdate(payload)
@@ -554,10 +566,6 @@
const handleParamDelete = async (row) => {
  if (!row?.id) return
  if (isStandardReadonly.value) {
    proxy.$message.warning('该标准已通过,参数不可编辑')
    return
  }
  try {
    await ElMessageBox.confirm('确认删除该参数?', '提示', { type: 'warning' })
  } catch {
@@ -569,10 +577,6 @@
}
const handleParamBatchDelete = async () => {
  if (isStandardReadonly.value) {
    proxy.$message.warning('该标准已通过,参数不可编辑')
    return
  }
  if (!paramSelectedRows.value.length) {
    proxy.$message.warning('请选择数据')
    return
src/views/qualityManagement/processInspection/components/formDia.vue
@@ -132,7 +132,7 @@
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="检验规则" prop="inspectRule">
              <el-radio-group v-model="form.inspectRule">
              <el-radio-group v-model="form.inspectRule" :disabled="isViewMode">
                <el-radio :label="0">全检</el-radio>
                <el-radio :label="1">抽检</el-radio>
              </el-radio-group>
@@ -162,14 +162,11 @@
          <el-col :span="12">
            <el-form-item label="检测结果:"
                          prop="checkResult">
              <el-select v-model="form.checkResult" :disabled="isViewMode">
                <el-option label="合格"
                           value="合格" />
                <el-option label="不合格"
                           value="不合格" />
                <el-option label="部分合格"
                           value="部分合格" />
              </el-select>
              <el-radio-group v-model="form.checkResult" :disabled="isViewMode || autoJudgeResult === '不合格'">
                <el-radio label="合格">合格</el-radio>
                <el-radio label="不合格">不合格</el-radio>
                <el-radio label="部分合格">部分合格</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
        </el-row>
@@ -207,13 +204,62 @@
                :column="tableColumn"
                :tableData="tableData"
                :tableLoading="tableLoading"
                :isShowPagination="false"
                height="400">
        <template #slot="{ row }">
        <template #judgeTypeSlot="{ row }">
          <el-tag v-if="row.judgeType === '≥'" type="success">≥</el-tag>
          <el-tag v-else-if="row.judgeType === '≤'" type="warning">≤</el-tag>
          <el-tag v-else-if="row.judgeType === '范围'" type="info">范围</el-tag>
          <el-tag v-else>文字</el-tag>
        </template>
        <template #isRequiredSlot="{ row }">
          <el-tag v-if="row.isRequired === 1" type="danger">是</el-tag>
          <el-tag v-else type="info">否</el-tag>
        </template>
        <template #testValueSlot="{ row }">
          <el-input v-model="row.testValue"
                    clearable
                    :disabled="isViewMode" />
                    :disabled="isViewMode"
                    @input="handleTestValueChange(row)" />
        </template>
        <template #isQualifiedSlot="{ row }">
          <template v-if="row.judgeType !== '文字描述'">
            <el-tag v-if="row.isQualified === 1" type="success">合格</el-tag>
            <el-tag v-else-if="row.isQualified === 0" type="danger">不合格</el-tag>
            <span v-else>-</span>
          </template>
          <template v-else>
            <el-select v-model="row.isQualified" placeholder="请选择" size="small" :disabled="isViewMode" @change="handleTextResultChange">
              <el-option :value="1" label="合格" />
              <el-option :value="0" label="不合格" />
            </el-select>
          </template>
        </template>
      </PIMTable>
      <div v-if="!isViewMode" style="margin-top: 16px;">
        <el-form label-width="120px">
          <el-form-item label="自动判断结果">
            <template v-if="autoJudgeResult">
              <el-tag v-if="autoJudgeResult === '合格'" type="success" size="large">合格</el-tag>
              <el-tag v-else-if="autoJudgeResult === '部分合格'" type="warning" size="large">部分合格</el-tag>
              <el-tag v-else type="danger" size="large">不合格</el-tag>
              <span v-if="autoJudgeResult === '不合格'" style="margin-left: 10px; color: #909399;">
                ï¼ˆå¿…要判断参数有不合格项,不可手动修改)
              </span>
              <span v-if="autoJudgeResult === '部分合格'" style="margin-left: 10px; color: #909399;">
                ï¼ˆå¿…要判断参数均合格,非必要参数有不合格项,可手动选择最终结果)
              </span>
            </template>
            <template v-else>
              <el-tag type="info" size="large">需手动判断</el-tag>
              <span style="margin-left: 10px; color: #909399;">
                ï¼ˆæ‰€æœ‰å‚数均为文字描述类型,请手动选择)
              </span>
            </template>
          </el-form-item>
        </el-form>
      </div>
      <template #footer>
        <div class="dialog-footer">
          <template v-if="!isViewMode">
@@ -266,7 +312,7 @@
      model: "",
      testStandardId: "",
      unit: "",
      quantity: "",
      quantity: undefined,
      qualifiedQuantity: "",
      unqualifiedQuantity: "",
      checkCompany: "",
@@ -305,31 +351,20 @@
  const productOptions = ref([]);
  const purchaseContractList = ref([]); // é‡‡è´­åˆåŒå·åˆ—表
  const tableColumn = ref([
    {
      label: "指标",
      prop: "parameterItem",
    },
    {
      label: "单位",
      prop: "unit",
    },
    {
      label: "厂家标准值",
      prop: "standardValue",
    },
    {
      label: "内控值",
      prop: "controlValue",
    },
    {
      label: "检验值",
      prop: "testValue",
      dataType: "slot",
      slot: "slot",
    },
    { label: "指标", prop: "parameterItem" },
    { label: "单位", prop: "unit" },
    { label: "厂家标准值", prop: "standardValue" },
    { label: "下限值", prop: "minValue" },
    { label: "上限值", prop: "maxValue" },
    { label: "内控值", prop: "controlValue" },
    { label: "判断类型", prop: "judgeType", dataType: "slot", slot: "judgeTypeSlot" },
    { label: "必要判断", prop: "isRequired", dataType: "slot", slot: "isRequiredSlot" },
    { label: "检验值", prop: "testValue", dataType: "slot", slot: "testValueSlot" },
    { label: "是否合格", prop: "isQualified", dataType: "slot", slot: "isQualifiedSlot" },
  ]);
  const tableData = ref([]);
  const tableLoading = ref(false);
  const autoJudgeResult = ref(null);
  const currentProductId = ref(0);
  const testStandardOptions = ref([]); // æŒ‡æ ‡é€‰æ‹©ä¸‹æ‹‰æ¡†æ•°æ®
  const modelOptions = ref([]);
@@ -360,7 +395,7 @@
      model: "",
      testStandardId: "",
      unit: "",
      quantity: "",
      quantity: undefined,
      checkCompany: "",
      checkResult: "",
      purchaseContractNo: "",
@@ -439,6 +474,7 @@
        getQualityInspectParamList(row.id);
      }
    }
    autoJudgeResult.value = null;
    // æœ€åŽå†æ‰“开弹窗,并清理校验态,避免必填提示闪烁
    dialogFormVisible.value = true;
    nextTick(() => {
@@ -474,23 +510,25 @@
  const handleQualifiedQuantityChange = (value) => {
    if (value === null || value === undefined) {
      form.value.qualifiedQuantity = 0;
      form.value.qualifiedQuantity = undefined;
      return;
    }
    const quantity = parseFloat(form.value.quantity) || 0;
    const quantity = parseFloat(form.value.quantity);
    if (isNaN(quantity) || quantity <= 0) return;
    const qualified = parseFloat(value) || 0;
    form.value.qualifiedQuantity = qualified > quantity?quantity:qualified;
    form.value.qualifiedQuantity = Math.min(qualified, quantity);
    form.value.unqualifiedQuantity = Math.max(0, quantity - qualified);
  };
  const handleUnqualifiedQuantityChange = (value) => {
    if (value === null || value === undefined) {
      form.value.unqualifiedQuantity = 0;
      form.value.unqualifiedQuantity = undefined;
      return;
    }
    const quantity = parseFloat(form.value.quantity) || 0;
    const quantity = parseFloat(form.value.quantity);
    if (isNaN(quantity) || quantity <= 0) return;
    const unqualified = parseFloat(value) || 0;
    form.value.unqualifiedQuantity = unqualified > quantity?quantity:unqualified;
    form.value.unqualifiedQuantity = Math.min(unqualified, quantity);
    form.value.qualifiedQuantity = Math.max(0, quantity - unqualified);
  };
@@ -532,52 +570,119 @@
      return newItem;
    });
  }
  const handleTestValueChange = (row) => {
    if (isViewMode.value) return;
    if (!row.testValue || !row.judgeType || row.judgeType === '文字描述') {
      return;
    }
    const testVal = parseFloat(row.testValue);
    if (isNaN(testVal)) return;
    let qualified = false;
    if (row.judgeType === '≥') {
      const stdVal = parseFloat(row.standardValue);
      if (isNaN(stdVal)) return;
      qualified = testVal >= stdVal;
    } else if (row.judgeType === '≤') {
      const stdVal = parseFloat(row.standardValue);
      if (isNaN(stdVal)) return;
      qualified = testVal <= stdVal;
    } else if (row.judgeType === '范围') {
      const minVal = parseFloat(row.minValue);
      const maxVal = parseFloat(row.maxValue);
      if (isNaN(minVal) || isNaN(maxVal)) return;
      qualified = testVal >= minVal && testVal <= maxVal;
    } else {
      return;
    }
    row.isQualified = qualified ? 1 : 0;
    performAutoJudgeAll();
  };
  const handleTextResultChange = () => {
    performAutoJudgeAll()
  };
  const performAutoJudgeAll = () => {
  if (!tableData.value.length) return;
  const allTextDesc = tableData.value.every(item => item.judgeType === '文字描述');
  if (allTextDesc) {
    autoJudgeResult.value = null;
    return;
  }
  const requiredParams = tableData.value.filter(item => item.isRequired === 1);
  if (requiredParams.length === 0) {
    autoJudgeResult.value = null;
    return;
  }
  const hasUnqualified = requiredParams.some(item => item.isQualified === 0);
  const allJudged = requiredParams.every(item => item.isQualified === 1 || item.isQualified === 0);
  if (!allJudged) {
    autoJudgeResult.value = null;
    return;
  }
  if (hasUnqualified) {
    autoJudgeResult.value = '不合格';
    form.value.checkResult = '不合格';
    return;
  }
  const nonRequiredUnqualified = tableData.value.filter(item => item.isRequired !== 1 && item.isQualified === 0);
  if (nonRequiredUnqualified.length > 0) {
    autoJudgeResult.value = '部分合格';
    form.value.checkResult = '部分合格';
  } else {
    autoJudgeResult.value = '合格';
    form.value.checkResult = '合格';
  }
};
  // å·¥åºå˜åŒ–处理
  // æäº¤äº§å“è¡¨å•
  const submitForm = () => {
    proxy.$refs.formRef.validate(valid => {
      if (valid) {
        form.value.inspectType = 1;
        const processName = form.value.process || "";
        if (operationType.value === "add") {
          tableData.value.forEach(item => {
            delete item.id;
          });
        }
        // ç¡®ä¿æ•°é‡ä¸ä¸ºnull
        const quantity = parseFloat(form.value.quantity) || 0;
        const qualified = parseFloat(form.value.qualifiedQuantity) || 0;
        const unqualified = parseFloat(form.value.unqualifiedQuantity) || 0;
        performAutoJudgeAll();
          form.value.inspectType = 1;
          const processName = form.value.process || "";
          if (operationType.value === "add") {
            tableData.value.forEach(item => {
              delete item.id;
            });
          }
          // ç¡®ä¿æ•°é‡ä¸ä¸ºnull
          const quantity = parseFloat(form.value.quantity) || 0;
          const qualified = parseFloat(form.value.qualifiedQuantity) || 0;
          const unqualified = parseFloat(form.value.unqualifiedQuantity) || 0;
        // éªŒè¯æ•°é‡å…³ç³»
        if (qualified + unqualified !== quantity) {
          proxy.$modal.msgError("合格数量与不合格数量之和必须等于总数量");
          return;
        }
          // éªŒè¯æ•°é‡å…³ç³»
          if (qualified + unqualified !== quantity) {
            proxy.$modal.msgError("合格数量与不合格数量之和必须等于总数量");
            return;
          }
        // æ ¹æ®é‡‡è´­åˆåŒå·æŸ¥æ‰¾å¯¹åº”çš„ purchaseLedgerId
        const selectedContract = purchaseContractList.value.find(
          item => item.purchaseContractNumber === form.value.purchaseContractNo
        );
        const purchaseLedgerId = selectedContract ? selectedContract.id : null;
          // æ ¹æ®é‡‡è´­åˆåŒå·æŸ¥æ‰¾å¯¹åº”çš„ purchaseLedgerId
          const selectedContract = purchaseContractList.value.find(
            item => item.purchaseContractNumber === form.value.purchaseContractNo
          );
          const purchaseLedgerId = selectedContract ? selectedContract.id : null;
        const data = {
          ...form.value,
          process: processName, // ä¿ç•™ process å­—段以兼容后端
          purchaseLedgerId: purchaseLedgerId, // æäº¤ purchaseLedgerId
          qualityInspectParams: tableData.value,
        };
        if (operationType.value === "add") {
          qualityInspectAdd(data).then(res => {
            proxy.$modal.msgSuccess("提交成功");
            closeDia();
          });
        } else {
          qualityInspectUpdate(data).then(res => {
            proxy.$modal.msgSuccess("提交成功");
            closeDia();
          });
        }
          const data = {
            ...form.value,
            process: processName, // ä¿ç•™ process å­—段以兼容后端
            purchaseLedgerId: purchaseLedgerId, // æäº¤ purchaseLedgerId
            qualityInspectParams: tableData.value,
          };
          if (operationType.value === "add") {
            qualityInspectAdd(data).then(res => {
              proxy.$modal.msgSuccess("提交成功");
              closeDia();
            });
          } else {
            qualityInspectUpdate(data).then(res => {
              proxy.$modal.msgSuccess("提交成功");
              closeDia();
            });
          }
      }
    });
  };
@@ -637,6 +742,7 @@
    tableData.value = [];
    testStandardOptions.value = [];
    form.value.testStandardId = "";
    autoJudgeResult.value = null;
    dialogFormVisible.value = false;
    emit("close");
  };
src/views/qualityManagement/processInspection/components/inspectionFormDia.vue
@@ -6,7 +6,7 @@
        width="70%"
        @close="closeDia"
    >
      <div style="margin-bottom: 10px;text-align: right">
      <div v-if="!isViewMode" style="margin-bottom: 10px;text-align: right">
        <el-button type="danger" plain @click="handleDelete">删除</el-button>
      </div>
      <PIMTable
@@ -15,17 +15,76 @@
          :tableData="tableData"
          :tableLoading="tableLoading"
          :isSelection="true"
          :isShowPagination="false"
          @selection-change="handleSelectionChange"
          height="600"
          height="400"
      >
        <template #slot="{ row }">
          <el-input v-model="row.testValue" clearable/>
        <template #judgeTypeSlot="{ row }">
          <el-tag v-if="row.judgeType === '≥'" type="success">≥</el-tag>
          <el-tag v-else-if="row.judgeType === '≤'" type="warning">≤</el-tag>
          <el-tag v-else-if="row.judgeType === '范围'" type="info">范围</el-tag>
          <el-tag v-else>文字</el-tag>
        </template>
        <template #isRequiredSlot="{ row }">
          <el-tag v-if="row.isRequired === 1" type="danger">是</el-tag>
          <el-tag v-else type="info">否</el-tag>
        </template>
        <template #testValueSlot="{ row }">
          <el-input v-model="row.testValue" clearable :disabled="isViewMode" @input="handleTestValueChange(row)" />
        </template>
        <template #isQualifiedSlot="{ row }">
          <template v-if="row.judgeType !== '文字描述'">
            <el-tag v-if="row.isQualified === 1" type="success">合格</el-tag>
            <el-tag v-else-if="row.isQualified === 0" type="danger">不合格</el-tag>
            <span v-else>-</span>
          </template>
          <template v-else>
            <el-select v-model="row.isQualified" placeholder="请选择" size="small" :disabled="isViewMode" @change="handleTextResultChange(row)">
              <el-option :value="1" label="合格" />
              <el-option :value="0" label="不合格" />
            </el-select>
          </template>
        </template>
      </PIMTable>
      <div style="margin-top: 16px;">
        <el-form label-width="120px">
          <el-form-item label="自动判断结果">
            <template v-if="autoJudgeResult">
              <el-tag v-if="autoJudgeResult === '合格'" type="success" size="large">合格</el-tag>
              <el-tag v-else-if="autoJudgeResult === '部分合格'" type="warning" size="large">部分合格</el-tag>
              <el-tag v-else type="danger" size="large">不合格</el-tag>
              <span v-if="autoJudgeResult === '不合格'" style="margin-left: 10px; color: #909399;">
                ï¼ˆå¿…要判断参数有不合格项,不可手动修改)
              </span>
              <span v-if="autoJudgeResult === '部分合格'" style="margin-left: 10px; color: #909399;">
                ï¼ˆå¿…要判断参数均合格,非必要参数有不合格项,可手动选择最终结果)
              </span>
            </template>
            <template v-else>
              <el-tag type="info" size="large">需手动判断</el-tag>
              <span style="margin-left: 10px; color: #909399;">
                ï¼ˆæ‰€æœ‰å‚数均为文字描述类型,请手动选择)
              </span>
            </template>
          </el-form-item>
          <el-form-item label="最终判定">
            <el-radio-group v-model="checkResult" :disabled="isViewMode || autoJudgeResult === '不合格'">
              <el-radio label="合格">合格</el-radio>
              <el-radio label="不合格">不合格</el-radio>
              <el-radio label="部分合格">部分合格</el-radio>
            </el-radio-group>
          </el-form-item>
        </el-form>
      </div>
      <template #footer>
        <div class="dialog-footer">
          <el-button type="primary" @click="submitForm">确认</el-button>
          <el-button @click="closeDia">取消</el-button>
          <template v-if="!isViewMode">
            <el-button type="primary" @click="submitForm">确认</el-button>
            <el-button @click="closeDia">取消</el-button>
          </template>
          <el-button v-else @click="closeDia">关闭</el-button>
        </div>
      </template>
    </el-dialog>
@@ -33,14 +92,13 @@
</template>
<script setup>
import {ref} from "vue";
import {Search} from "@element-plus/icons-vue";
import { ref, computed, getCurrentInstance } from "vue";
import {
  qualityInspectParamDel,
  qualityInspectParamInfo,
  qualityInspectParamUpdate
} from "@/api/qualityManagement/qualityInspectParam.js";
import {ElMessageBox} from "element-plus";
import { ElMessageBox } from "element-plus";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])
@@ -48,38 +106,31 @@
const operationType = ref('')
const currentId = ref('')
const selectedRows = ref([]);
const autoJudgeResult = ref(null)
const checkResult = ref('')
const isViewMode = computed(() => operationType.value === 'view')
const tableColumn = ref([
  {
    label: "指标",
    prop: "parameterItem",
  },
  {
    label: "单位",
    prop: "unit",
  },
  {
    label: "厂家标准值",
    prop: "standardValue",
  },
  {
    label: "内控值",
    prop: "controlValue",
  },
  {
    label: "检验值",
    prop: "testValue",
    dataType: 'slot',
    slot: 'slot',
  },
  { label: "指标", prop: "parameterItem" },
  { label: "单位", prop: "unit" },
  { label: "厂家标准值", prop: "standardValue" },
  { label: "下限值", prop: "minValue" },
  { label: "上限值", prop: "maxValue" },
  { label: "内控值", prop: "controlValue" },
  { label: "判断类型", prop: "judgeType", dataType: 'slot', slot: 'judgeTypeSlot' },
  { label: "必要判断", prop: "isRequired", dataType: 'slot', slot: 'isRequiredSlot' },
  { label: "检验值", prop: "testValue", dataType: 'slot', slot: 'testValueSlot' },
  { label: "是否合格", prop: "isQualified", dataType: 'slot', slot: 'isQualifiedSlot' },
]);
const tableData = ref([]);
const tableLoading = ref(false);
// æ‰“开弹框
const openDialog = (type, row) => {
  operationType.value = type;
  dialogFormVisible.value = true;
  if (operationType.value === 'edit') {
  autoJudgeResult.value = null
  checkResult.value = ''
  if (operationType.value === 'edit' || operationType.value === 'view') {
    currentId.value = row.id;
    getList()
  }
@@ -89,23 +140,87 @@
    tableData.value = res.data;
  })
}
// è¡¨æ ¼é€‰æ‹©æ•°æ®
const handleSelectionChange = (selection) => {
  selectedRows.value = selection;
};
// æäº¤äº§å“è¡¨å•
const handleTestValueChange = (row) => {
  if (isViewMode.value) return;
  if (!row.testValue || !row.judgeType || row.judgeType === '文字描述') {
    return;
  }
  const testVal = parseFloat(row.testValue);
  if (isNaN(testVal)) return;
  let qualified = false;
  if (row.judgeType === '≥') {
    const stdVal = parseFloat(row.standardValue);
    if (isNaN(stdVal)) return;
    qualified = testVal >= stdVal;
  } else if (row.judgeType === '≤') {
    const stdVal = parseFloat(row.standardValue);
    if (isNaN(stdVal)) return;
    qualified = testVal <= stdVal;
  } else if (row.judgeType === '范围') {
    const minVal = parseFloat(row.minValue);
    const maxVal = parseFloat(row.maxValue);
    if (isNaN(minVal) || isNaN(maxVal)) return;
    qualified = testVal >= minVal && testVal <= maxVal;
  } else {
    return;
  }
  row.isQualified = qualified ? 1 : 0;
  performAutoJudgeAll();
};
const handleTextResultChange = () => {
  performAutoJudgeAll()
};
const performAutoJudgeAll = () => {
  if (!tableData.value.length) return;
  const allTextDesc = tableData.value.every(item => item.judgeType === '文字描述');
  if (allTextDesc) {
    autoJudgeResult.value = null;
    return;
  }
  const requiredParams = tableData.value.filter(item => item.isRequired === 1);
  if (requiredParams.length === 0) {
    autoJudgeResult.value = null;
    return;
  }
  const hasUnqualified = requiredParams.some(item => item.isQualified === 0);
  const allJudged = requiredParams.every(item => item.isQualified === 1 || item.isQualified === 0);
  if (!allJudged) {
    autoJudgeResult.value = null;
    return;
  }
  if (hasUnqualified) {
    autoJudgeResult.value = '不合格';
    checkResult.value = '不合格';
    return;
  }
  const nonRequiredUnqualified = tableData.value.filter(item => item.isRequired !== 1 && item.isQualified === 0);
  if (nonRequiredUnqualified.length > 0) {
    autoJudgeResult.value = '部分合格';
    checkResult.value = '部分合格';
  } else {
    autoJudgeResult.value = '合格';
    checkResult.value = '合格';
  }
};
const submitForm = () => {
  performAutoJudgeAll();
  qualityInspectParamUpdate(tableData.value).then(res => {
    proxy.$modal.msgSuccess("提交成功");
    closeDia();
  })
}
// å…³é—­å¼¹æ¡†
const closeDia = () => {
  dialogFormVisible.value = false;
  emit('close')
};
// åˆ é™¤
const handleDelete = () => {
  let ids = [];
  if (selectedRows.value.length > 0) {
@@ -136,4 +251,4 @@
<style scoped>
</style>
</style>
src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
@@ -86,14 +86,14 @@
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="合格数量:" prop="qualifiedQuantity">
              <el-input-number :step="0.01" :min="0" :max="form.quantity || 0" style="width: 100%"
              <el-input-number :step="0.01" :min="0" :max="form.quantity || undefined" style="width: 100%"
                               v-model="form.qualifiedQuantity" placeholder="请输入" :precision="2"
                               @change="onQualifiedChange" :disabled="isViewMode"/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="不合格数量:" prop="unqualifiedQuantity">
              <el-input-number :step="0.01" :min="0" :max="form.quantity || 0" style="width: 100%"
              <el-input-number :step="0.01" :min="0" :max="form.quantity || undefined" style="width: 100%"
                               v-model="form.unqualifiedQuantity" placeholder="请输入" :precision="2"
                               @change="onUnqualifiedChange" :disabled="isViewMode"/>
            </el-form-item>
@@ -110,7 +110,7 @@
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="检验规则" prop="inspectRule">
              <el-radio-group v-model="form.inspectRule">
              <el-radio-group v-model="form.inspectRule" :disabled="isViewMode">
                <el-radio :label="0">全检</el-radio>
                <el-radio :label="1">抽检</el-radio>
              </el-radio-group>
@@ -135,11 +135,11 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="检测结果:" prop="checkResult">
              <el-select v-model="form.checkResult" :disabled="isViewMode">
                <el-option label="合格" value="合格"/>
                <el-option label="不合格" value="不合格"/>
                <el-option label="部分合格" value="部分合格"/>
              </el-select>
              <el-radio-group v-model="form.checkResult" :disabled="isViewMode || autoJudgeResult === '不合格'">
                <el-radio label="合格">合格</el-radio>
                <el-radio label="不合格">不合格</el-radio>
                <el-radio label="部分合格">部分合格</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
        </el-row>
@@ -175,12 +175,60 @@
          :column="tableColumn"
          :tableData="tableData"
          :tableLoading="tableLoading"
          :isShowPagination="false"
          height="400"
      >
        <template #slot="{ row }">
          <el-input v-model="row.testValue" clearable :disabled="isViewMode"/>
        <template #judgeTypeSlot="{ row }">
          <el-tag v-if="row.judgeType === '≥'" type="success">≥</el-tag>
          <el-tag v-else-if="row.judgeType === '≤'" type="warning">≤</el-tag>
          <el-tag v-else-if="row.judgeType === '范围'" type="info">范围</el-tag>
          <el-tag v-else>文字</el-tag>
        </template>
        <template #isRequiredSlot="{ row }">
          <el-tag v-if="row.isRequired === 1" type="danger">是</el-tag>
          <el-tag v-else type="info">否</el-tag>
        </template>
        <template #testValueSlot="{ row }">
          <el-input v-model="row.testValue" clearable :disabled="isViewMode" @input="handleTestValueChange(row)" />
        </template>
        <template #isQualifiedSlot="{ row }">
          <template v-if="row.judgeType !== '文字描述'">
            <el-tag v-if="row.isQualified === 1" type="success">合格</el-tag>
            <el-tag v-else-if="row.isQualified === 0" type="danger">不合格</el-tag>
            <span v-else>-</span>
          </template>
          <template v-else>
            <el-select v-model="row.isQualified" placeholder="请选择" size="small" :disabled="isViewMode" @change="handleTextResultChange">
              <el-option :value="1" label="合格" />
              <el-option :value="0" label="不合格" />
            </el-select>
          </template>
        </template>
      </PIMTable>
      <div v-if="!isViewMode" style="margin-top: 16px;">
        <el-form label-width="120px">
          <el-form-item label="自动判断结果">
            <template v-if="autoJudgeResult">
              <el-tag v-if="autoJudgeResult === '合格'" type="success" size="large">合格</el-tag>
              <el-tag v-else-if="autoJudgeResult === '部分合格'" type="warning" size="large">部分合格</el-tag>
              <el-tag v-else type="danger" size="large">不合格</el-tag>
              <span v-if="autoJudgeResult === '不合格'" style="margin-left: 10px; color: #909399;">
                ï¼ˆå¿…要判断参数有不合格项,不可手动修改)
              </span>
              <span v-if="autoJudgeResult === '部分合格'" style="margin-left: 10px; color: #909399;">
                ï¼ˆå¿…要判断参数均合格,非必要参数有不合格项,可手动选择最终结果)
              </span>
            </template>
            <template v-else>
              <el-tag type="info" size="large">需手动判断</el-tag>
              <span style="margin-left: 10px; color: #909399;">
                ï¼ˆæ‰€æœ‰å‚数均为文字描述类型,请手动选择)
              </span>
            </template>
          </el-form-item>
        </el-form>
      </div>
      <template #footer>
        <div class="dialog-footer">
          <template v-if="!isViewMode">
@@ -219,7 +267,7 @@
    model: "",
    testStandardId: "",
    unit: "",
    quantity: "",
    quantity: undefined,
    stockInRatio: 100.00,
    checkCompany: "",
    checkResult: "",
@@ -259,31 +307,20 @@
  },
});
const tableColumn = ref([
  {
    label: "指标",
    prop: "parameterItem",
  },
  {
    label: "单位",
    prop: "unit",
  },
  {
    label: "厂家标准值",
    prop: "standardValue",
  },
  {
    label: "内控值",
    prop: "controlValue",
  },
  {
    label: "检验值",
    prop: "testValue",
    dataType: 'slot',
    slot: 'slot',
  },
  { label: "指标", prop: "parameterItem" },
  { label: "单位", prop: "unit" },
  { label: "厂家标准值", prop: "standardValue" },
  { label: "下限值", prop: "minValue" },
  { label: "上限值", prop: "maxValue" },
  { label: "内控值", prop: "controlValue" },
  { label: "判断类型", prop: "judgeType", dataType: 'slot', slot: 'judgeTypeSlot' },
  { label: "必要判断", prop: "isRequired", dataType: 'slot', slot: 'isRequiredSlot' },
  { label: "检验值", prop: "testValue", dataType: 'slot', slot: 'testValueSlot' },
  { label: "是否合格", prop: "isQualified", dataType: 'slot', slot: 'isQualifiedSlot' },
]);
const tableData = ref([]);
const tableLoading = ref(false);
const autoJudgeResult = ref(null);
const {form, rules} = toRefs(data);
const supplierList = ref([]);
@@ -316,8 +353,8 @@
    console.error("加载检验员列表失败", e);
    userList.value = [];
  }
  // å…ˆé‡ç½®è¡¨å•数据(保持字段完整,避免弹窗首次渲染时触发必填红框“闪一下”)
    form.value = {
  // å…ˆé‡ç½®è¡¨å•数据(保持字段完整,避免弹窗首次渲染时触发必填红框"闪一下")
  form.value = {
    checkTime: "",
    supplier: "",
    checkName: "",
@@ -327,7 +364,7 @@
    model: "",
    testStandardId: "",
    unit: "",
    quantity: "",
    quantity: undefined,
    stockInRatio: 100.00,
    checkCompany: "",
    checkResult: "",
@@ -398,6 +435,7 @@
      getQualityInspectParamList(row.id);
    }
  }
  autoJudgeResult.value = null;
  // æœ€åŽå†æ‰“开弹窗,并清理校验态,避免必填提示闪烁
  dialogFormVisible.value = true;
  nextTick(() => {
@@ -469,16 +507,83 @@
  });
}
const handleTestValueChange = (row) => {
  if (isViewMode.value) return;
  if (!row.testValue || !row.judgeType || row.judgeType === '文字描述') {
    return;
  }
  const testVal = parseFloat(row.testValue);
  if (isNaN(testVal)) return;
  let qualified = false;
  if (row.judgeType === '≥') {
    const stdVal = parseFloat(row.standardValue);
    if (isNaN(stdVal)) return;
    qualified = testVal >= stdVal;
  } else if (row.judgeType === '≤') {
    const stdVal = parseFloat(row.standardValue);
    if (isNaN(stdVal)) return;
    qualified = testVal <= stdVal;
  } else if (row.judgeType === '范围') {
    const minVal = parseFloat(row.minValue);
    const maxVal = parseFloat(row.maxValue);
    if (isNaN(minVal) || isNaN(maxVal)) return;
    qualified = testVal >= minVal && testVal <= maxVal;
  } else {
    return;
  }
  row.isQualified = qualified ? 1 : 0;
  performAutoJudgeAll();
};
const handleTextResultChange = () => {
  performAutoJudgeAll()
};
const performAutoJudgeAll = () => {
  if (!tableData.value.length) return;
  const allTextDesc = tableData.value.every(item => item.judgeType === '文字描述');
  if (allTextDesc) {
    autoJudgeResult.value = null;
    return;
  }
  const requiredParams = tableData.value.filter(item => item.isRequired === 1);
  if (requiredParams.length === 0) {
    autoJudgeResult.value = null;
    return;
  }
  const hasUnqualified = requiredParams.some(item => item.isQualified === 0);
  const allJudged = requiredParams.every(item => item.isQualified === 1 || item.isQualified === 0);
  if (!allJudged) {
    autoJudgeResult.value = null;
    return;
  }
  if (hasUnqualified) {
    autoJudgeResult.value = '不合格';
    form.value.checkResult = '不合格';
    return;
  }
  const nonRequiredUnqualified = tableData.value.filter(item => item.isRequired !== 1 && item.isQualified === 0);
  if (nonRequiredUnqualified.length > 0) {
    autoJudgeResult.value = '部分合格';
    form.value.checkResult = '部分合格';
  } else {
    autoJudgeResult.value = '合格';
    form.value.checkResult = '合格';
  }
};
// æäº¤äº§å“è¡¨å•
const submitForm = () => {
  proxy.$refs.formRef.validate(valid => {
    if (valid) {
      performAutoJudgeAll();
      form.value.inspectType = 0
            if (operationType.value === "add") {
                tableData.value.forEach((item) => {
                    delete item.id
                })
            }
      if (operationType.value === "add") {
        tableData.value.forEach((item) => {
          delete item.id
        })
      }
      const data = {...form.value, qualityInspectParams: tableData.value}
      if (operationType.value === "add") {
        qualityInspectAdd(data).then(res => {
@@ -543,28 +648,18 @@
}
// è‡ªåŠ¨è®¡ç®—åˆæ ¼æ•°é‡å˜åŒ–æ—¶çš„ä¸åˆæ ¼æ•°é‡
const onQualifiedChange = (value) => {
  if (form.value.quantity !== undefined && form.value.quantity !== null) {
    const maxUnqualified = form.value.quantity - value;
    if (maxUnqualified >= 0) {
      form.value.unqualifiedQuantity = maxUnqualified;
    } else {
      form.value.qualifiedQuantity = form.value.quantity;
      form.value.unqualifiedQuantity = 0;
    }
  }
  const qty = parseFloat(form.value.quantity);
  if (isNaN(qty) || qty <= 0) return;
  const val = parseFloat(value) || 0;
  form.value.unqualifiedQuantity = Math.max(0, qty - val);
};
// è‡ªåŠ¨è®¡ç®—ä¸åˆæ ¼æ•°é‡å˜åŒ–æ—¶çš„åˆæ ¼æ•°é‡
const onUnqualifiedChange = (value) => {
  if (form.value.quantity !== undefined && form.value.quantity !== null) {
    const maxQualified = form.value.quantity - value;
    if (maxQualified >= 0) {
      form.value.qualifiedQuantity = maxQualified;
    } else {
      form.value.unqualifiedQuantity = form.value.quantity;
      form.value.qualifiedQuantity = 0;
    }
  }
  const qty = parseFloat(form.value.quantity);
  if (isNaN(qty) || qty <= 0) return;
  const val = parseFloat(value) || 0;
  form.value.qualifiedQuantity = Math.max(0, qty - val);
};
// å…³é—­å¼¹æ¡†
@@ -573,6 +668,7 @@
  tableData.value = [];
  testStandardOptions.value = [];
  form.value.testStandardId = '';
  autoJudgeResult.value = null;
  dialogFormVisible.value = false;
  emit('close')
};
src/views/qualityManagement/rawMaterialInspection/components/inspectionFormDia.vue
@@ -6,7 +6,7 @@
        width="70%"
        @close="closeDia"
    >
      <div style="margin-bottom: 10px;text-align: right">
      <div v-if="!isViewMode" style="margin-bottom: 10px;text-align: right">
        <el-button type="danger" plain @click="handleDelete">删除</el-button>
      </div>
      <PIMTable
@@ -15,17 +15,76 @@
          :tableData="tableData"
          :tableLoading="tableLoading"
          :isSelection="true"
          :isShowPagination="false"
          @selection-change="handleSelectionChange"
          height="600"
          height="400"
      >
        <template #slot="{ row }">
          <el-input v-model="row.testValue" clearable/>
        <template #judgeTypeSlot="{ row }">
          <el-tag v-if="row.judgeType === '≥'" type="success">≥</el-tag>
          <el-tag v-else-if="row.judgeType === '≤'" type="warning">≤</el-tag>
          <el-tag v-else-if="row.judgeType === '范围'" type="info">范围</el-tag>
          <el-tag v-else>文字</el-tag>
        </template>
        <template #isRequiredSlot="{ row }">
          <el-tag v-if="row.isRequired === 1" type="danger">是</el-tag>
          <el-tag v-else type="info">否</el-tag>
        </template>
        <template #testValueSlot="{ row }">
          <el-input v-model="row.testValue" clearable :disabled="isViewMode" @input="handleTestValueChange(row)" />
        </template>
        <template #isQualifiedSlot="{ row }">
          <template v-if="row.judgeType !== '文字描述'">
            <el-tag v-if="row.isQualified === 1" type="success">合格</el-tag>
            <el-tag v-else-if="row.isQualified === 0" type="danger">不合格</el-tag>
            <span v-else>-</span>
          </template>
          <template v-else>
            <el-select v-model="row.isQualified" placeholder="请选择" size="small" :disabled="isViewMode" @change="handleTextResultChange(row)">
              <el-option :value="1" label="合格" />
              <el-option :value="0" label="不合格" />
            </el-select>
          </template>
        </template>
      </PIMTable>
      <div style="margin-top: 16px;">
        <el-form label-width="120px">
          <el-form-item label="自动判断结果">
            <template v-if="autoJudgeResult">
              <el-tag v-if="autoJudgeResult === '合格'" type="success" size="large">合格</el-tag>
              <el-tag v-else-if="autoJudgeResult === '部分合格'" type="warning" size="large">部分合格</el-tag>
              <el-tag v-else type="danger" size="large">不合格</el-tag>
              <span v-if="autoJudgeResult === '不合格'" style="margin-left: 10px; color: #909399;">
                ï¼ˆå¿…要判断参数有不合格项,不可手动修改)
              </span>
              <span v-if="autoJudgeResult === '部分合格'" style="margin-left: 10px; color: #909399;">
                ï¼ˆå¿…要判断参数均合格,非必要参数有不合格项,可手动选择最终结果)
              </span>
            </template>
            <template v-else>
              <el-tag type="info" size="large">需手动判断</el-tag>
              <span style="margin-left: 10px; color: #909399;">
                ï¼ˆæ‰€æœ‰å‚数均为文字描述类型,请手动选择)
              </span>
            </template>
          </el-form-item>
          <el-form-item label="最终判定">
            <el-radio-group v-model="checkResult" :disabled="isViewMode || autoJudgeResult === '不合格'">
              <el-radio label="合格">合格</el-radio>
              <el-radio label="不合格">不合格</el-radio>
              <el-radio label="部分合格">部分合格</el-radio>
            </el-radio-group>
          </el-form-item>
        </el-form>
      </div>
      <template #footer>
        <div class="dialog-footer">
          <el-button type="primary" @click="submitForm">确认</el-button>
          <el-button @click="closeDia">取消</el-button>
          <template v-if="!isViewMode">
            <el-button type="primary" @click="submitForm">确认</el-button>
            <el-button @click="closeDia">取消</el-button>
          </template>
          <el-button v-else @click="closeDia">关闭</el-button>
        </div>
      </template>
    </el-dialog>
@@ -33,14 +92,13 @@
</template>
<script setup>
import {ref} from "vue";
import {Search} from "@element-plus/icons-vue";
import { ref, computed, getCurrentInstance } from "vue";
import {
  qualityInspectParamDel,
  qualityInspectParamInfo,
  qualityInspectParamUpdate
} from "@/api/qualityManagement/qualityInspectParam.js";
import {ElMessageBox} from "element-plus";
import { ElMessageBox } from "element-plus";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])
@@ -48,38 +106,31 @@
const operationType = ref('')
const currentId = ref('')
const selectedRows = ref([]);
const autoJudgeResult = ref(null)
const checkResult = ref('')
const isViewMode = computed(() => operationType.value === 'view')
const tableColumn = ref([
  {
    label: "指标",
    prop: "parameterItem",
  },
  {
    label: "单位",
    prop: "unit",
  },
  {
    label: "厂家标准值",
    prop: "standardValue",
  },
  {
    label: "内控值",
    prop: "controlValue",
  },
  {
    label: "检验值",
    prop: "testValue",
    dataType: 'slot',
    slot: 'slot',
  },
  { label: "指标", prop: "parameterItem" },
  { label: "单位", prop: "unit" },
  { label: "厂家标准值", prop: "standardValue" },
  { label: "下限值", prop: "minValue" },
  { label: "上限值", prop: "maxValue" },
  { label: "内控值", prop: "controlValue" },
  { label: "判断类型", prop: "judgeType", dataType: 'slot', slot: 'judgeTypeSlot' },
  { label: "必要判断", prop: "isRequired", dataType: 'slot', slot: 'isRequiredSlot' },
  { label: "检验值", prop: "testValue", dataType: 'slot', slot: 'testValueSlot' },
  { label: "是否合格", prop: "isQualified", dataType: 'slot', slot: 'isQualifiedSlot' },
]);
const tableData = ref([]);
const tableLoading = ref(false);
// æ‰“开弹框
const openDialog = (type, row) => {
  operationType.value = type;
  dialogFormVisible.value = true;
  if (operationType.value === 'edit') {
  autoJudgeResult.value = null
  checkResult.value = ''
  if (operationType.value === 'edit' || operationType.value === 'view') {
    currentId.value = row.id;
    getList()
  }
@@ -89,23 +140,87 @@
    tableData.value = res.data;
  })
}
// è¡¨æ ¼é€‰æ‹©æ•°æ®
const handleSelectionChange = (selection) => {
  selectedRows.value = selection;
};
// æäº¤äº§å“è¡¨å•
const handleTestValueChange = (row) => {
  if (isViewMode.value) return;
  if (!row.testValue || !row.judgeType || row.judgeType === '文字描述') {
    return;
  }
  const testVal = parseFloat(row.testValue);
  if (isNaN(testVal)) return;
  let qualified = false;
  if (row.judgeType === '≥') {
    const stdVal = parseFloat(row.standardValue);
    if (isNaN(stdVal)) return;
    qualified = testVal >= stdVal;
  } else if (row.judgeType === '≤') {
    const stdVal = parseFloat(row.standardValue);
    if (isNaN(stdVal)) return;
    qualified = testVal <= stdVal;
  } else if (row.judgeType === '范围') {
    const minVal = parseFloat(row.minValue);
    const maxVal = parseFloat(row.maxValue);
    if (isNaN(minVal) || isNaN(maxVal)) return;
    qualified = testVal >= minVal && testVal <= maxVal;
  } else {
    return;
  }
  row.isQualified = qualified ? 1 : 0;
  performAutoJudgeAll();
};
const handleTextResultChange = () => {
  performAutoJudgeAll()
};
const performAutoJudgeAll = () => {
  if (!tableData.value.length) return;
  const allTextDesc = tableData.value.every(item => item.judgeType === '文字描述');
  if (allTextDesc) {
    autoJudgeResult.value = null;
    return;
  }
  const requiredParams = tableData.value.filter(item => item.isRequired === 1);
  if (requiredParams.length === 0) {
    autoJudgeResult.value = null;
    return;
  }
  const hasUnqualified = requiredParams.some(item => item.isQualified === 0);
  const allJudged = requiredParams.every(item => item.isQualified === 1 || item.isQualified === 0);
  if (!allJudged) {
    autoJudgeResult.value = null;
    return;
  }
  if (hasUnqualified) {
    autoJudgeResult.value = '不合格';
    checkResult.value = '不合格';
    return;
  }
  const nonRequiredUnqualified = tableData.value.filter(item => item.isRequired !== 1 && item.isQualified === 0);
  if (nonRequiredUnqualified.length > 0) {
    autoJudgeResult.value = '部分合格';
    checkResult.value = '部分合格';
  } else {
    autoJudgeResult.value = '合格';
    checkResult.value = '合格';
  }
};
const submitForm = () => {
  performAutoJudgeAll();
  qualityInspectParamUpdate(tableData.value).then(res => {
    proxy.$modal.msgSuccess("提交成功");
    closeDia();
  })
}
// å…³é—­å¼¹æ¡†
const closeDia = () => {
  dialogFormVisible.value = false;
  emit('close')
};
// åˆ é™¤
const handleDelete = () => {
  let ids = [];
  if (selectedRows.value.length > 0) {
@@ -136,4 +251,4 @@
<style scoped>
</style>
</style>
ȨÏÞ±ä¸üÎĵµ.md
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,267 @@
# åˆ é™¤æŒ‰é’®æƒé™å˜æ›´æ–‡æ¡£
## å˜æ›´æ¦‚è¿°
为项目中所有删除按钮添加了 `v-hasPermi` æƒé™æŒ‡ä»¤ï¼Œæ¶‰åŠ **149 ä¸ªé¡µé¢æ–‡ä»¶**,新增 **107 ä¸ªæƒé™æ ‡è¯†**。
## å˜æ›´æ–¹å¼
### 1. ç›´æŽ¥ `<el-button>` å…ƒç´ 
在删除按钮的 HTML æ ‡ç­¾ä¸Šæ·»åŠ  `v-hasPermi` æŒ‡ä»¤ï¼š
```html
<!-- ä¿®æ”¹å‰ -->
<el-button type="danger" @click="handleDelete">删除</el-button>
<!-- ä¿®æ”¹åŽ -->
<el-button type="danger" @click="handleDelete" v-hasPermi="['module:entity:remove']">删除</el-button>
```
### 2. PIMTable ç»„件内操作按钮
在表格操作列的删除操作配置对象中添加 `hasPermi` å±žæ€§ï¼š
```javascript
// ä¿®æ”¹å‰
{ name: "删除", type: "text", clickFun: (row) => handleDelete(row) }
// ä¿®æ”¹åŽ
{
  name: "删除",
  type: "text",
  clickFun: (row) => handleDelete(row),
  hasPermi: ['module:entity:remove']
}
```
### 3. åŸºç¡€ç»„件支持
- **PIMTable.vue**(`src/components/PIMTable/PIMTable.vue`):操作按钮增加 `v-hasPermi="o.hasPermi"` æ”¯æŒ
- **hasPermi.js**(`src/directive/permission/hasPermi.js`):移除未配置权限时的异常抛出,改为静默跳过,使 `hasPermi` å˜ä¸ºå¯é€‰å±žæ€§
## æƒé™å‘½åè§„范
格式:`module:entity:action`
- `module` â€” æ¨¡å—目录名(驼峰格式保持一致)
- `entity` â€” å®žä½“/页面名(去掉 `.vue` åŽç¼€å’Œ `components`/`Detail` ç›®å½•层级)
- `action` â€” æ“ä½œç±»åž‹ï¼Œåˆ é™¤ç»Ÿä¸€ä½¿ç”¨ `remove`
## æƒé™æ¸…单(按模块)
### åŸºç¡€æ•°æ®ï¼ˆbasicData)
| æƒé™æ ‡è¯† | å¯¹åº”页面 |
|---|---|
| `basicData:customerFile:remove` | å®¢æˆ·æ¡£æ¡ˆ |
| `basicData:customerFileOpenSea:remove` | å…¬æµ·å®¢æˆ·æ¡£æ¡ˆ |
| `basicData:parameterMaintenance:remove` | å‚数维护 |
| `basicData:product:remove` | äº§å“ç®¡ç† |
| `basicData:supplierManage:remove` | ä¾›åº”商管理(含黑名单、附件弹窗) |
### ååŒåŠžå…¬ï¼ˆcollaborativeApproval)
| æƒé™æ ‡è¯† | å¯¹åº”页面 |
|---|---|
| `collaborativeApproval:approvalManagement:remove` | å®¡æ‰¹ç®¡ç† |
| `collaborativeApproval:approvalProcess:remove` | å®¡æ‰¹æµç¨‹ |
| `collaborativeApproval:attendanceManagement:remove` | è€ƒå‹¤ç®¡ç† |
| `collaborativeApproval:knowledgeBase:remove` | çŸ¥è¯†åº“ |
| `collaborativeApproval:meetDraft:remove` | ä¼šè®®è‰ç¨¿ |
| `collaborativeApproval:meetSetting:remove` | ä¼šè®®è®¾ç½® |
| `collaborativeApproval:noticeManagement:remove` | é€šçŸ¥å…¬å‘Šç®¡ç† |
| `collaborativeApproval:notificationManagement:remove` | æ¶ˆæ¯é€šçŸ¥ç®¡ç† |
| `collaborativeApproval:officeSupplies:remove` | åŠžå…¬ç”¨å“ |
| `collaborativeApproval:purchaseApproval:remove` | é‡‡è´­å®¡æ‰¹ |
| `collaborativeApproval:rpaManagement:remove` | RPA ç®¡ç† |
### å®¢æœç®¡ç†ï¼ˆcustomerService)
| æƒé™æ ‡è¯† | å¯¹åº”页面 |
|---|---|
| `customerService:expiryAfterSales:remove` | åˆ°æœŸå”®åŽ |
| `customerService:feedbackRegistration:remove` | åé¦ˆç™»è®° |
### èƒ½æºç®¡ç†ï¼ˆenergyManagement)
| æƒé™æ ‡è¯† | å¯¹åº”页面 |
|---|---|
| `energyManagement:dynamicEnergySaving:remove` | åŠ¨æ€èŠ‚èƒ½ |
| `energyManagement:energyArea:remove` | èƒ½æºåŒºåŸŸ |
| `energyManagement:energyPeriodTime:remove` | èƒ½æºæ—¶æ®µ |
| `energyManagement:energyPower:remove` | èƒ½æºç”µåŠ› |
| `energyManagement:meterCollection:remove` | ä»ªè¡¨é‡‡é›† |
| `energyManagement:waterManagement:remove` | ç”¨æ°´ç®¡ç†ï¼ˆå«æ°´è´¹è´¦å•) |
### è®¾å¤‡ç®¡ç†ï¼ˆequipmentManagement)
| æƒé™æ ‡è¯† | å¯¹åº”页面 |
|---|---|
| `equipmentManagement:brand:remove` | å“ç‰Œç®¡ç† |
| `equipmentManagement:calibration:remove` | è®¡é‡æ ¡å‡† |
| `equipmentManagement:inspectionManagement:remove` | å·¡æ£€ç®¡ç† |
| `equipmentManagement:ledger:remove` | è®¾å¤‡å°è´¦ |
| `equipmentManagement:measurementEquipment:remove` | è®¡é‡å™¨å…·ï¼ˆå«é™„件弹窗) |
| `equipmentManagement:repair:remove` | è®¾å¤‡ç»´ä¿® |
| `equipmentManagement:spareParts:remove` | å¤‡å“å¤‡ä»¶ |
| `equipmentManagement:upkeep:remove` | è®¾å¤‡ä¿å…» |
### æ¡£æ¡ˆç®¡ç†ï¼ˆfileManagement)
| æƒé™æ ‡è¯† | å¯¹åº”页面 |
|---|---|
| `fileManagement:bookshelf:remove` | ä¹¦æž¶ç®¡ç† |
| `fileManagement:borrow:remove` | å€Ÿé˜…管理 |
| `fileManagement:document:remove` | æ–‡æ¡£ç®¡ç†ï¼ˆå«é™„件管理) |
| `fileManagement:return:remove` | å½’还管理 |
### è´¢åŠ¡ç®¡ç†ï¼ˆfinancialManagement)
| æƒé™æ ‡è¯† | å¯¹åº”页面 |
|---|---|
| `financialManagement:fixedAssets:remove` | å›ºå®šèµ„产 |
| `financialManagement:intangibleAssets:remove` | æ— å½¢èµ„产 |
| `financialManagement:generalLedger:remove` | æ€»è´¦ |
| `financialManagement:voucher:remove` | å‡­è¯ç®¡ç† |
| `financialManagement:inputInvoice:remove` | è¿›é¡¹å‘票 |
| `financialManagement:outputInvoice:remove` | é”€é¡¹å‘票 |
| `financialManagement:invoiceApply:remove` | å¼€ç¥¨ç”³è¯· |
| `financialManagement:receipt:remove` | æ”¶æ¬¾å• |
| `financialManagement:paymentApply:remove` | ä»˜æ¬¾ç”³è¯· |
| `financialManagement:payableReconciliation:remove` | åº”付对账 |
| `financialManagement:receivableReconciliation:remove` | åº”收对账 |
| `financialManagement:payable:remove` | åº”付账款 |
### åº“存管理(inventoryManagement)
| æƒé™æ ‡è¯† | å¯¹åº”页面 |
|---|---|
| `inventoryManagement:inventoryManagement:remove` | åº“存总览 |
| `inventoryManagement:dispatchLog:remove` | å‘货记录 |
| `inventoryManagement:receiptManagement:remove` | æ”¶è´§ç®¡ç† |
| `inventoryManagement:stockWarning:remove` | åº“存预警 |
| `inventoryManagement:transportTaskManagement:remove` | è¿è¾“任务管理 |
| `inventoryManagement:vehicleManagement:remove` | è½¦è¾†ç®¡ç† |
| `inventoryManagement:vehicleFuelManagement:remove` | è½¦è¾†ç‡ƒæ²¹ç®¡ç† |
### å·¥å•管理(lavorissue)
| æƒé™æ ‡è¯† | å¯¹åº”页面 |
|---|---|
| `lavorissue:ledger:remove` | å·¥å•台账(含附件弹窗) |
### åŠžå…¬æµç¨‹è‡ªåŠ¨åŒ–ï¼ˆofficeProcessAutomation)
| æƒé™æ ‡è¯† | å¯¹åº”页面 |
|---|---|
| `officeProcessAutomation:enterpriseNews:remove` | ä¼ä¸šæ–°é—» |
| `officeProcessAutomation:approveList:remove` | å®¡æ‰¹åˆ—表 |
| `officeProcessAutomation:approveTemplate:remove` | å®¡æ‰¹æ¨¡æ¿ |
| `officeProcessAutomation:reimburseManage:remove` | æŠ¥é”€ç®¡ç†ï¼ˆå·®æ—…报销、费用报销) |
| `officeProcessAutomation:staffContract:remove` | å‘˜å·¥åˆåŒ |
| `officeProcessAutomation:staffArchive:remove` | å‘˜å·¥æ¡£æ¡ˆ |
### äººäº‹ç®¡ç†ï¼ˆpersonnelManagement)
| æƒé™æ ‡è¯† | å¯¹åº”页面 |
|---|---|
| `personnelManagement:attendanceCheckin:remove` | è€ƒå‹¤æ‰“卡规则 |
| `personnelManagement:monthlyStatistics:remove` | æœˆåº¦ç»Ÿè®¡ |
| `personnelManagement:payrollManagement:remove` | è–ªé…¬ç®¡ç† |
| `personnelManagement:scheduling:remove` | æŽ’班管理 |
| `personnelManagement:selfService:remove` | è‡ªåŠ©æœåŠ¡ |
| `personnelManagement:socialSecuritySet:remove` | ç¤¾ä¿è®¾ç½® |
### é‡‡è´­ç®¡ç†ï¼ˆprocurementManagement)
| æƒé™æ ‡è¯† | å¯¹åº”页面 |
|---|---|
| `procurementManagement:advancedPriceManagement:remove` | é«˜çº§ä»·æ ¼ç®¡ç† |
| `procurementManagement:arrivalManagement:remove` | åˆ°è´§ç®¡ç† |
| `procurementManagement:priceManagement:remove` | ä»·æ ¼ç®¡ç† |
| `procurementManagement:procurementLedger:remove` | é‡‡è´­å°è´¦ |
| `procurementManagement:procurementPlan:remove` | é‡‡è´­è®¡åˆ’ |
| `procurementManagement:purchaseOrder:remove` | é‡‡è´­è®¢å• |
| `procurementManagement:purchaseReturnOrder:remove` | é‡‡è´­é€€è´§å• |
| `procurementManagement:qualityInspection:remove` | è´¨é‡æ£€éªŒ |
| `procurementManagement:returnManagement:remove` | é€€è´§ç®¡ç† |
### äº§å“ç®¡ç†ï¼ˆproductManagement)
| æƒé™æ ‡è¯† | å¯¹åº”页面 |
|---|---|
| `productManagement:productIdentifier:remove` | äº§å“æ ‡è¯† |
### ç”Ÿäº§ç®¡ç†ï¼ˆproductionManagement)
| æƒé™æ ‡è¯† | å¯¹åº”页面      |
|---|-----------|
| `product:bom:remove` | äº§å“ç»“构(BOM) |
| `productionManagement:processRoute:remove` | å·¥è‰ºè·¯çº¿åˆ—表    |
| `productionManagement:productionProcess:remove` | å·¥åºç®¡ç†      |
| `productionManagement:productionReporting:remove` | æŠ¥å·¥å°è´¦      |
### ç”Ÿäº§è®¡åˆ’(productionPlan)
| æƒé™æ ‡è¯† | å¯¹åº”页面  |
|---|-------|
| `productionPlan:productionPlan:remove` | ä¸»ç”Ÿäº§è®¡åˆ’ |
### é¡¹ç›®ç®¡ç†ï¼ˆprojectManagement)
| æƒé™æ ‡è¯† | å¯¹åº”页面 |
|---|---|
| `projectManagement:Management:remove` | é¡¹ç›®ç®¡ç† |
| `projectManagement:projectType:remove` | é¡¹ç›®ç±»åž‹ |
### è´¨é‡ç®¡ç†ï¼ˆqualityManagement)
| æƒé™æ ‡è¯† | å¯¹åº”页面 |
|---|---|
| `qualityManagement:finalInspection:remove` | æˆå“æ£€éªŒ |
| `qualityManagement:metricBinding:remove` | æŒ‡æ ‡ç»‘定 |
| `qualityManagement:metricMaintenance:remove` | æŒ‡æ ‡ç»´æŠ¤ |
| `qualityManagement:nonconformingManagement:remove` | ä¸åˆæ ¼å“ç®¡ç† |
| `qualityManagement:processInspection:remove` | è¿‡ç¨‹æ£€éªŒ |
| `qualityManagement:rawMaterialInspection:remove` | åŽŸææ–™æ£€éªŒ |
### å®‰å…¨ç”Ÿäº§ï¼ˆsafeProduction)
| æƒé™æ ‡è¯† | å¯¹åº”页面 |
|---|---|
| `safeProduction:accidentReportingRecord:remove` | äº‹æ•…报告记录 |
| `safeProduction:dangerInvestigation:remove` | é𐿂£æŽ’查 |
| `safeProduction:emergencyPlanReview:remove` | åº”急预案评审 |
| `safeProduction:hazardSourceLedger:remove` | å±é™©æºå°è´¦ |
| `safeProduction:hazardousMaterialsControl:remove` | å±é™©å“ç®¡æŽ§ |
| `safeProduction:safeQualifications:remove` | å®‰å…¨èµ„è´¨ |
| `safeProduction:safeWorkApproval:remove` | å®‰å…¨ä½œä¸šå®¡æ‰¹ |
| `safeProduction:safetyTrainingAssessment:remove` | å®‰å…¨åŸ¹è®­è€ƒæ ¸ |
### é”€å”®ç®¡ç†ï¼ˆsalesManagement)
| æƒé™æ ‡è¯† | å¯¹åº”页面 |
|---|---|
| `salesManagement:deliveryLedger:remove` | å‘货台账 |
| `salesManagement:paymentShipping:remove` | ä»˜æ¬¾å‘è´§ |
| `salesManagement:returnOrder:remove` | é€€è´§å• |
| `salesManagement:salesLedger:remove` | é”€å”®å°è´¦ |
| `salesManagement:salesQuotation:remove` | é”€å”®æŠ¥ä»· |
| `salesManagement:salespersonManagement:remove` | é”€å”®å‘˜ç®¡ç† |
| `salesManagement:strategyControl:remove` | ç­–略控制 |
## ç»Ÿè®¡æ±‡æ€»
| é¡¹ç›® | æ•°é‡ |
|---|---|
| æ–°å¢žæƒé™æ ‡è¯† | 104 |
| ä¿®æ”¹é¡µé¢æ–‡ä»¶ | 145 |
| æ¶‰åŠä¸šåŠ¡æ¨¡å— | 20 |
## æƒé™ç”Ÿæ•ˆæœºåˆ¶
1. æƒé™é€šè¿‡ `v-hasPermi` æŒ‡ä»¤æŽ§åˆ¶ï¼ŒæŒ‡ä»¤ä»Žå½“前登录用户的 `permissions` åˆ—表中查找匹配项
2. ç®¡ç†å‘˜æ‹¥æœ‰é€šé…æƒé™ `*:*:*`,不受任何权限限制
3. æ™®é€šç”¨æˆ·éœ€åœ¨åŽå°ä¸ºå…¶è§’色分配对应模块的 `remove` æƒé™åŽï¼Œæ‰èƒ½çœ‹åˆ°å¹¶ä½¿ç”¨åˆ é™¤æŒ‰é’®
4. æœªé…ç½®æƒé™æ•°ç»„时(`hasPermi` ä¸º `undefined`),按钮正常显示(向后兼容)