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

spring

10 天以前 0c445ac6d2a20153e5eac390555ba88f950d76b0

 src/views/qualityManagement/rawMaterialInspection/index.vue

@@ -41,7 +41,7 @@
    <InspectionFormDia ref="inspectionFormDia" @close="handleQuery"></InspectionFormDia>
    <FormDia ref="formDia" @close="handleQuery"></FormDia>
    <files-dia ref="filesDia" @close="handleQuery"></files-dia>
    <el-dialog v-model="dialogFormVisible" title="编辑检验员" width="70%"
    <el-dialog v-model="dialogFormVisible" title="编辑检验员" width="30%"
               @close="closeDia">
      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
        <el-form-item label="检验员：" prop="checkName">
@@ -160,7 +160,7 @@
    label: "操作",
    align: "center",
    fixed: "right",
    width: 250,
    width: 280,
    operation: [
      {
        name: "编辑",
@@ -168,9 +168,9 @@
        clickFun: (row) => {
          openForm("edit", row);
        },
        disabled: (row) => {
          return row.inspectState;
        }
            disabled: (row) => {
               return row.inspectState == 1;
            }
      },
      {
        name: "附件",
@@ -185,6 +185,9 @@
        clickFun: (row) => {
          submit(row.id);
        },
            disabled: (row) => {
               return row.inspectState == 1;
            }
      },
      {
        name: "分配检验员",
@@ -196,9 +199,9 @@
            proxy.$modal.msgError("检验员已存在");
          }
        },
        disabled: (row) => {
          return row.inspectState;
        }
            disabled: (row) => {
               return row.inspectState == 1 || row.checkName;
            }
      },
      {
        name: "下载",
@@ -269,12 +272,6 @@
const openForm = (type, row) => {
  nextTick(() => {
    formDia.value?.openDialog(type, row)
  })
};
// 打开新增检验弹框
const openInspectionForm = (type, row) => {
  nextTick(() => {
    inspectionFormDia.value?.openDialog(type, row)
  })
};
// 打开附件弹框
@@ -368,7 +365,7 @@

    const link = document.createElement('a')
    link.href = downloadUrl
    link.download = '检验报告.docx'
    link.download = '原材料检验报告.docx'
    document.body.appendChild(link)
    link.click()