生产报表联调，并优化页面

huminmin

2 天以前 5f18876241777adb7cacce4bc8316779cb16c237

 src/views/qualityManagement/rawMaterial/index.vue

@@ -2,15 +2,38 @@
  <div class="app-container">
    <div class="search_form">
      <div>
        <span class="search_title">供应商：</span>
        <span class="search_title">批号：</span>
        <el-input
            v-model="searchForm.supplier"
            style="width: 240px"
            placeholder="请输入供应商搜索"
            v-model="searchForm.batchNo"
            style="width: 200px"
            placeholder="请输入"
            @change="handleQuery"
            clearable
            :prefix-icon="Search"
            prefix-icon="Search"
        />
        <span class="search_title">检验类型：</span>
        <el-select
            v-model="searchForm.checkType"
            style="width: 200px"
            placeholder="请选择"
            @change="handleQuery"
            clearable
        >
          <el-option label="入厂检" :value="0" />
          <el-option label="车间检" :value="1" />
          <el-option label="出厂检" :value="2" />
        </el-select>
        <span class="search_title">提交状态：</span>
        <el-select
            v-model="searchForm.inspectState"
            style="width: 200px"
            placeholder="请选择"
            @change="handleQuery"
            clearable
        >
          <el-option label="未提交" :value="0" />
          <el-option label="已提交" :value="1" />
        </el-select>
        <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"/>
@@ -22,7 +45,7 @@
      <div>
        <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" v-if="hasRawCancel">删除</el-button>
      </div>
    </div>
    <div class="table_list">
@@ -44,8 +67,8 @@
    <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-form-item label="检验员：" prop="checkUserName">
          <el-select v-model="form.checkUserName" placeholder="请选择" clearable>
            <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
                       :value="item.nickName"/>
          </el-select>
@@ -63,34 +86,37 @@
</template>

<script setup>
import {Search} from "@element-plus/icons-vue";
import {onMounted, ref, reactive, toRefs, getCurrentInstance, nextTick} from "vue";
import {onMounted, ref, reactive, toRefs, getCurrentInstance, nextTick, computed} from "vue";
import InspectionFormDia from "@/views/qualityManagement/rawMaterial/components/inspectionFormDia.vue";
import FormDia from "@/views/qualityManagement/rawMaterial/components/formDia.vue";
import {ElMessageBox} from "element-plus";
import {
  downloadQualityInspect,
  qualityInspectUpdate,
  submitQualityInspect
} from "@/api/qualityManagement/rawMaterialInspection.js";
import FilesDia from "@/views/qualityManagement/rawMaterial/components/filesDia.vue";
import dayjs from "dayjs";
import {userListNoPage} from "@/api/system/user.js";
import useUserStore from "@/store/modules/user";
import {deleteRawMaterial, findRawMaterialListPage} from "@/api/qualityManagement/rawMaterial.js";
import {
  deleteRawMaterial,
  findRawMaterialListPage,
  submitRawMaterial, updateCheckUserName,downloadRawMaterial
} from "@/api/qualityManagement/rawMaterial.js";
import { checkPermi } from "@/utils/permission.js";

const data = reactive({
  searchForm: {
    supplier: "",
    batchNo: "",
    checkType: undefined,
    inspectState: undefined,
    entryDate: undefined, // 录入日期
    entryDateStart: undefined,
    entryDateEnd: undefined,
  },
  rules: {
    checkName: [{required: true, message: "请选择", trigger: "change"}],
    checkUserName: [{required: true, message: "请选择", trigger: "change"}],
  },
});
const {searchForm, rules} = toRefs(data);

const hasRawCancel = computed(() => checkPermi(["raw_cancel"]));
const tableColumn = ref([
  {
    label: "检测日期",
@@ -99,7 +125,7 @@
  },
  {
    label: "检验员",
    prop: "checkName",
    prop: "checkUserName",
  },
  {
    label: "产品名称",
@@ -110,12 +136,8 @@
    prop: "model",
  },
  {
    label: "单位",
    prop: "unit",
  },
  {
    label: "数量",
    prop: "quantity",
    label: "批次号",
    prop: "batchNo",
    width: 120
  },
  {
@@ -128,12 +150,19 @@
    prop: "checkResult",
    dataType: "tag",
    formatType: (params) => {
      if (params === 1) {
      if (params === 0) {
        return "danger";
      } else if (params === 0) {
      } else if (params === 1) {
        return "success";
      } else {
        return null;
      }
    },
    formatData: (params) => {
      if (params === 0) {
        return "不合格";
      } else if (params === 1) {
        return "合格";
      }
    },
  },
@@ -153,23 +182,25 @@
    label: "操作",
    align: "center",
    fixed: "right",
    width: 280,
        width: 320,
    operation: [
          {
            name: "详情",
            type: "text",
            clickFun: (row) => {
              openForm("view", row);
            },
          },
      {
        name: "编辑",
        type: "text",
        clickFun: (row) => {
          openForm("edit", row);
        },
            disabled: (row) => {
               // 已提交则禁用
               if (row.inspectState == 1) return true;
               // 如果检验员有值，只有当前登录用户能编辑
               if (row.checkName) {
                  return row.checkName !== userStore.nickName;
               }
               return false;
            }
        disabled: (row) => {
          // 已提交则禁用
          if (row.inspectState == 1&&!hasRawCancel.value) return true;
        }
      },
      {
        name: "附件",
@@ -184,30 +215,26 @@
        clickFun: (row) => {
          submit(row.id);
        },
            disabled: (row) => {
               // 已提交则禁用
               if (row.inspectState == 1) return true;
               // 如果检验员有值，只有当前登录用户能提交
               if (row.checkName) {
                  return row.checkName !== userStore.nickName;
               }
               return false;
            }
        disabled: (row) => {
          // 已提交则禁用
          if (row.inspectState == 1) return true;
          return false;
        }
      },
      {
        name: "分配检验员",
        type: "text",
        clickFun: (row) => {
          if (!row.checkName) {
            open(row)
          } else {
            proxy.$modal.msgError("检验员已存在");
          }
        },
            disabled: (row) => {
               return row.inspectState == 1 || row.checkName;
            }
      },
      // {
      //   name: "分配检验员",
      //   type: "text",
      //   clickFun: (row) => {
      //     if (!row.checkUserName) {
      //       open(row)
      //     } else {
      //       proxy.$modal.msgError("检验员已存在");
      //     }
      //   },
      //   disabled: (row) => {
      //     return row.inspectState === 1 || row.checkUserName || row.checkUserName !== '';
      //   }
      // },
      {
        name: "下载",
        type: "text",
@@ -224,7 +251,7 @@
const userList = ref([]);
const dialogFormVisible = ref(false);
const form = ref({
  checkName: ""
  checkUserName: ""
});
const page = reactive({
  current: 1,
@@ -319,7 +346,7 @@
    type: "warning",
  })
      .then(() => {
        proxy.download("/quality/qualityInspect/export", {inspectType: 0}, "原材料检验.xlsx");
        proxy.download("/quality/rawMaterial/export", {}, "原料检.xlsx");
      })
      .catch(() => {
        proxy.$modal.msg("已取消");
@@ -328,7 +355,7 @@

// 提价
const submit = async (id) => {
  const res = await submitQualityInspect({id: id})
  const res = await submitRawMaterial(id)
  if (res.code === 200) {
    proxy.$modal.msgSuccess("提交成功");
    getList();
@@ -347,7 +374,7 @@
      ...form.value,
      id: currentRow.value.id
    }
    qualityInspectUpdate(data).then(res => {
    updateCheckUserName(data).then(res => {
      proxy.$modal.msgSuccess("提交成功");
      closeDia();
      getList();
@@ -363,7 +390,7 @@
}

const downLoadFile = (row) => {
  downloadQualityInspect({ id: row.id }).then((blobData) => {
  downloadRawMaterial({id: row.id}).then((blobData) => {
    const blob = new Blob([blobData], {
      type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
    })
@@ -371,7 +398,7 @@

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

@@ -385,4 +412,8 @@
});
</script>

<style scoped></style>
<style scoped>
.search_title {
  margin: 0 10px;
}
</style>