添加不合格现象，检验记录不可编辑生产报工信息，生产报工记录加上生产时间字段

zhangwencui

5 天以前 77bb414c194741197a5c3718b71d7e5dffb4e6a7

 src/views/qualityManagement/rawMaterialInspection/index.vue

@@ -3,31 +3,37 @@
    <div class="search_form">
      <div>
        <span class="search_title">供应商：</span>
        <el-input
            v-model="searchForm.supplier"
        <el-input v-model="searchForm.supplier"
            style="width: 240px"
            placeholder="请输入供应商搜索"
            @change="handleQuery"
            clearable
            :prefix-icon="Search"
        />
        <span style="margin-left: 10px" class="search_title">检测日期：</span>
        <el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
                        placeholder="请选择" clearable @change="changeDaterange"/>
        <el-button type="primary" @click="handleQuery" style="margin-left: 10px"
        >搜索
        </el-button
        >
                  :prefix-icon="Search" />
        <span style="margin-left: 10px"
              class="search_title">检测日期：</span>
        <el-date-picker v-model="searchForm.entryDate"
                        value-format="YYYY-MM-DD"
                        format="YYYY-MM-DD"
                        type="daterange"
                        placeholder="请选择"
                        clearable
                        @change="changeDaterange" />
        <el-button type="primary"
                   @click="handleQuery"
                   style="margin-left: 10px">搜索
        </el-button>
      </div>
      <div>
        <el-button type="primary" @click="openForm('add')">新增</el-button>
        <el-button type="primary"
                   @click="openForm('add')">新增</el-button>
        <el-button @click="handleOut">导出</el-button>
        <el-button type="danger" plain @click="handleDelete">删除</el-button>
        <el-button type="danger"
                   plain
                   @click="handleDelete">删除</el-button>
      </div>
    </div>
    <div class="table_list">
      <PIMTable
          rowKey="id"
      <PIMTable rowKey="id"
          :column="tableColumn"
          :tableData="tableData"
          :page="page"
@@ -35,30 +41,43 @@
          @selection-change="handleSelectionChange"
          :tableLoading="tableLoading"
          @pagination="pagination"
          :total="page.total"
      ></PIMTable>
                :total="page.total"></PIMTable>
    </div>
    <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="30%"
    <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="30%"
               @close="closeDia">
      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
        <el-form-item label="检验员：" prop="checkName">
          <el-select v-model="form.checkName" placeholder="请选择" clearable>
            <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
      <el-form :model="form"
               label-width="140px"
               label-position="top"
               :rules="rules"
               ref="formRef">
        <el-form-item label="检验员："
                      prop="checkName">
          <el-select v-model="form.checkName"
                     placeholder="请选择"
                     clearable>
            <el-option v-for="item in userList"
                       :key="item.nickName"
                       :label="item.nickName"
                       :value="item.nickName"/>
          </el-select>
        </el-form-item>
      </el-form>
      <template #footer>
        <div class="dialog-footer">
          <el-button type="primary" @click="submitForm">确认</el-button>
          <el-button type="primary"
                     @click="submitForm">确认</el-button>
          <el-button @click="closeDia">取消</el-button>
        </div>
      </template>
    </el-dialog>

  </div>
</template>

@@ -71,8 +90,9 @@
import {
  downloadQualityInspect,
  qualityInspectDel,
  qualityInspectListPage, qualityInspectUpdate,
  submitQualityInspect
    qualityInspectListPage,
    qualityInspectUpdate,
    submitQualityInspect,
} from "@/api/qualityManagement/rawMaterialInspection.js";
import FilesDia from "@/views/qualityManagement/rawMaterialInspection/components/filesDia.vue";
import dayjs from "dayjs";
@@ -94,12 +114,12 @@
  {
    label: "检测日期",
    prop: "checkTime",
    width: 120
      width: 120,
  },
  {
    label: "供应商",
    prop: "supplier",
    width: 230
      width: 230,
  },
  {
    label: "检验员",
@@ -120,21 +140,21 @@
  {
    label: "数量",
    prop: "quantity",
    width: 120
      width: 120,
  },
  {
    label: "检测单位",
    prop: "checkCompany",
    width: 120
      width: 120,
  },
  {
    label: "检测结果",
    prop: "checkResult",
    dataType: "tag",
    formatType: (params) => {
      if (params === '不合格') {
      formatType: params => {
        if (params === "不合格") {
        return "danger";
      } else if (params === '合格') {
        } else if (params === "合格") {
        return "success";
      } else {
        return null;
@@ -142,9 +162,14 @@
    },
  },
  {
      label: "不合格现象",
      prop: "defectivePhenomena",
      width: 120,
    },
    {
    label: "提交状态",
    prop: "inspectState",
    formatData: (params) => {
      formatData: params => {
      if (params) {
        return "已提交";
      } else {
@@ -162,48 +187,48 @@
      {
        name: "编辑",
        type: "text",
        clickFun: (row) => {
          clickFun: row => {
          openForm("edit", row);
        },
            disabled: (row) => {
          disabled: row => {
               return row.inspectState == 1;
            }
          },
      },
      {
        name: "附件",
        type: "text",
        clickFun: (row) => {
          clickFun: row => {
          openFilesFormDia(row);
        },
      },
      {
        name: "提交",
        type: "text",
        clickFun: (row) => {
          clickFun: row => {
          submit(row.id);
        },
            disabled: (row) => {
          disabled: row => {
               return row.inspectState == 1;
            }
          },
      },
      {
        name: "分配检验员",
        type: "text",
        clickFun: (row) => {
          clickFun: row => {
          if (!row.checkName) {
            open(row)
              open(row);
          } else {
            proxy.$modal.msgError("检验员已存在");
          }
        },
            disabled: (row) => {
          disabled: row => {
               return row.inspectState == 1 || row.checkName;
            }
          },
      },
      {
        name: "下载",
        type: "text",
        clickFun: (row) => {
          clickFun: row => {
          downLoadFile(row);
        },
      },
@@ -216,19 +241,19 @@
const userList = ref([]);
const dialogFormVisible = ref(false);
const form = ref({
  checkName: ""
    checkName: "",
});
const page = reactive({
  current: 1,
  size: 100,
  total: 0
    total: 0,
});
const currentRow = ref(null)
const formDia = ref()
const filesDia = ref()
const inspectionFormDia = ref()
const {proxy} = getCurrentInstance()
const changeDaterange = (value) => {
  const currentRow = ref(null);
  const formDia = ref();
  const filesDia = ref();
  const inspectionFormDia = ref();
  const { proxy } = getCurrentInstance();
  const changeDaterange = value => {
  searchForm.value.entryDateStart = undefined;
  searchForm.value.entryDateEnd = undefined;
  if (value) {
@@ -243,7 +268,7 @@
  page.current = 1;
  getList();
};
const pagination = (obj) => {
  const pagination = obj => {
  page.current = obj.page;
  page.size = obj.limit;
  getList();
@@ -251,38 +276,40 @@
const getList = () => {
  tableLoading.value = true;
  const params = {...searchForm.value, ...page};
  params.entryDate = undefined
  qualityInspectListPage({...params, inspectType: 0}).then(res => {
    params.entryDate = undefined;
    qualityInspectListPage({ ...params, inspectType: 0 })
      .then(res => {
    tableLoading.value = false;
    tableData.value = res.data.records
        tableData.value = res.data.records;
    page.total = res.data.total;
  }).catch(err => {
    tableLoading.value = false;
  })
      .catch(err => {
        tableLoading.value = false;
      });
};
// 表格选择数据
const handleSelectionChange = (selection) => {
  const handleSelectionChange = selection => {
  selectedRows.value = selection;
};

// 打开弹框
const openForm = (type, row) => {
  nextTick(() => {
    formDia.value?.openDialog(type, row)
  })
      formDia.value?.openDialog(type, row);
    });
};
// 打开附件弹框
const openFilesFormDia = (type, row) => {
  nextTick(() => {
    filesDia.value?.openDialog(type, row)
  })
      filesDia.value?.openDialog(type, row);
    });
};

// 删除
const handleDelete = () => {
  let ids = [];
  if (selectedRows.value.length > 0) {
    ids = selectedRows.value.map((item) => item.id);
      ids = selectedRows.value.map(item => item.id);
  } else {
    proxy.$modal.msgWarning("请选择数据");
    return;
@@ -293,7 +320,7 @@
    type: "warning",
  })
      .then(() => {
        qualityInspectDel(ids).then((res) => {
        qualityInspectDel(ids).then(res => {
          proxy.$modal.msgSuccess("删除成功");
          getList();
        });
@@ -310,7 +337,11 @@
    type: "warning",
  })
      .then(() => {
        proxy.download("/quality/qualityInspect/export", {inspectType: 0}, "原材料检验.xlsx");
        proxy.download(
          "/quality/qualityInspect/export",
          { inspectType: 0 },
          "原材料检验.xlsx"
        );
      })
      .catch(() => {
        proxy.$modal.msg("已取消");
@@ -318,13 +349,13 @@
};

// 提价
const submit = async (id) => {
  const res = await submitQualityInspect({id: id})
  const submit = async id => {
    const res = await submitQualityInspect({ id: id });
  if (res.code === 200) {
    proxy.$modal.msgSuccess("提交成功");
    getList();
  }
}
  };

// 关闭弹框
const closeDia = () => {
@@ -336,39 +367,39 @@
  if (currentRow.value) {
    const data = {
      ...form.value,
      id: currentRow.value.id
    }
        id: currentRow.value.id,
      };
    qualityInspectUpdate(data).then(res => {
      proxy.$modal.msgSuccess("提交成功");
      closeDia();
      getList();
    })
      });
  }
};

const open = async (row) => {
  const open = async row => {
  let userLists = await userListNoPage();
  userList.value = userLists.data;
  currentRow.value = row
  dialogFormVisible.value = true
}
    currentRow.value = row;
    dialogFormVisible.value = true;
  };

const downLoadFile = (row) => {
  downloadQualityInspect({ id: row.id }).then((blobData) => {
  const downLoadFile = row => {
    downloadQualityInspect({ id: row.id }).then(blobData => {
    const blob = new Blob([blobData], {
      type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
    })
    const downloadUrl = window.URL.createObjectURL(blob)
        type: "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
      });
      const downloadUrl = window.URL.createObjectURL(blob);

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

    document.body.removeChild(link)
    window.URL.revokeObjectURL(downloadUrl)
  })
      document.body.removeChild(link);
      window.URL.revokeObjectURL(downloadUrl);
    });
};

onMounted(() => {