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

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>-->
        <!--        <el-input-->
        <!--            v-model="searchForm.supplier"-->
        <!--            style="width: 240px"-->
        <!--            placeholder="请输入供应商搜索"-->
        <!--            @change="handleQuery"-->
        <!--            clearable-->
        <!--            :prefix-icon="Search"-->
        <!--        />-->
        <span class="search_title">批号：</span>
        <el-input
            v-model="searchForm.batchNo"
            style="width: 200px"
            placeholder="请输入"
            @change="handleQuery"
            clearable
            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">
@@ -63,7 +86,7 @@
</template>

<script setup>
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";
@@ -76,10 +99,13 @@
  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,
@@ -89,6 +115,8 @@
  },
});
const {searchForm, rules} = toRefs(data);

const hasRawCancel = computed(() => checkPermi(["raw_cancel"]));
const tableColumn = ref([
  {
    label: "检测日期",
@@ -122,9 +150,9 @@
    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;
@@ -154,8 +182,15 @@
    label: "操作",
    align: "center",
    fixed: "right",
    width: 280,
        width: 320,
    operation: [
          {
            name: "详情",
            type: "text",
            clickFun: (row) => {
              openForm("view", row);
            },
          },
      {
        name: "编辑",
        type: "text",
@@ -164,12 +199,7 @@
        },
        disabled: (row) => {
          // 已提交则禁用
          if (row.inspectState == 1) return true;
          // 如果检验员有值，只有当前登录用户能编辑
          if (row.checkUserName) {
            return row.checkUserName !== userStore.nickName;
          }
          return false;
          if (row.inspectState == 1&&!hasRawCancel.value) return true;
        }
      },
      {
@@ -188,27 +218,23 @@
        disabled: (row) => {
          // 已提交则禁用
          if (row.inspectState == 1) return true;
          // 如果检验员有值，只有当前登录用户能提交
          if (row.checkUserName) {
            return row.checkUserName !== userStore.nickName;
          }
          return false;
        }
      },
      {
        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",
      //   clickFun: (row) => {
      //     if (!row.checkUserName) {
      //       open(row)
      //     } else {
      //       proxy.$modal.msgError("检验员已存在");
      //     }
      //   },
      //   disabled: (row) => {
      //     return row.inspectState === 1 || row.checkUserName || row.checkUserName !== '';
      //   }
      // },
      {
        name: "下载",
        type: "text",
@@ -386,4 +412,8 @@
});
</script>

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