From cc5f8607d1f80fdb5d31b29d87b25d708505b03a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 19 九月 2026 21:06:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_君歌化工new' into dev_天津_君歌化工new
---
src/views/qualityManagement/rawMaterialInspection/index.vue | 296 +++++++++++++++-------------------------------------------
1 files changed, 78 insertions(+), 218 deletions(-)
diff --git a/src/views/qualityManagement/rawMaterialInspection/index.vue b/src/views/qualityManagement/rawMaterialInspection/index.vue
index ae221cd..80c788b 100644
--- a/src/views/qualityManagement/rawMaterialInspection/index.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/index.vue
@@ -1,37 +1,45 @@
<template>
<div class="app-container">
<div class="search_form mb20">
- <div>
- <span class="search_title">渚涘簲鍟嗭細</span>
- <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" />
-<!-- <span style="margin-left: 10px"-->
-<!-- class="search_title">閲囪喘璁㈠崟鍙凤細</span>-->
-<!-- <el-input v-model="searchForm.purchaseContractNo"-->
-<!-- style="width: 240px"-->
-<!-- placeholder="璇疯緭鍏ラ噰璐鍗曞彿鎼滅储"-->
-<!-- @change="handleQuery"-->
-<!-- clearable-->
-<!-- :prefix-icon="Search" />-->
- <el-button type="primary"
- @click="handleQuery"
- style="margin-left: 10px">鎼滅储
- </el-button>
- </div>
- <div>
+ <el-form ref="searchFormRef"
+ :model="searchForm"
+ class="demo-form-inline">
+ <el-row :gutter="32">
+ <el-col :span="6">
+ <el-form-item label="鐗╂枡鍚嶇О"
+ prop="productName">
+ <el-input v-model="searchForm.productName"
+ style="width: 300px"
+ placeholder="璇疯緭鍏ョ墿鏂欏悕绉版悳绱�"
+ clearable />
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="妫�楠屾棩鏈�"
+ prop="entryDate">
+ <el-date-picker v-model="searchForm.entryDate"
+ style="width: 360px"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ type="daterange"
+ start-placeholder="璧锋鏃ユ湡"
+ end-placeholder="璧锋鏃ユ湡"
+ range-separator="-"
+ clearable
+ @change="changeDaterange" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item>
+ <el-button type="primary"
+ @click="getList">
+ 鎼滅储
+ </el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <div class="actions">
<el-button type="primary"
@click="openForm('add')">鏂板</el-button>
<el-button @click="handleOut">瀵煎嚭</el-button>
@@ -51,46 +59,14 @@
@pagination="pagination"
: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%"
- @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"
- :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 @click="closeDia">鍙栨秷</el-button>
- </div>
- </template>
- </el-dialog>
</div>
</template>
<script setup>
- import { Search } from "@element-plus/icons-vue";
import {
onMounted,
ref,
@@ -99,120 +75,76 @@
getCurrentInstance,
nextTick,
} from "vue";
- import InspectionFormDia from "@/views/qualityManagement/rawMaterialInspection/components/inspectionFormDia.vue";
import FormDia from "@/views/qualityManagement/rawMaterialInspection/components/formDia.vue";
import { ElMessageBox } from "element-plus";
import {
downloadQualityInspect,
qualityInspectDel,
qualityInspectListPage,
- qualityInspectUpdate,
submitQualityInspect,
} from "@/api/qualityManagement/rawMaterialInspection.js";
import FilesDia from "@/views/qualityManagement/rawMaterialInspection/components/filesDia.vue";
import dayjs from "dayjs";
- import { userListNoPage } from "@/api/system/user.js";
- import useUserStore from "@/store/modules/user";
const data = reactive({
searchForm: {
- supplier: "",
- entryDate: undefined, // 褰曞叆鏃ユ湡
- purchaseContractNo: "",
+ productName: "",
+ entryDate: undefined, // 妫�楠屾棩鏈�
entryDateStart: undefined,
entryDateEnd: undefined,
},
- rules: {
- checkName: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- },
});
- const { searchForm, rules } = toRefs(data);
+ const { searchForm } = toRefs(data);
const tableColumn = ref([
{
- label: "妫�娴嬫棩鏈�",
+ label: "妫�楠屾棩鏈�",
prop: "checkTime",
width: 120,
},
- // {
- // label: "閲囪喘璁㈠崟鍙�",
- // prop: "purchaseContractNo",
- // width: 120,
- // },
{
- label: "渚涘簲鍟�",
- prop: "supplier",
- width: 230,
+ label: "椤圭洰",
+ prop: "projectName",
+ minWidth: 160,
},
{
- label: "妫�楠屽憳",
- prop: "checkName",
- },
- {
- label: "浜у搧鍚嶇О",
+ label: "鐗╂枡鍚嶇О",
prop: "productName",
+ minWidth: 200,
},
{
- label: "瑙勬牸鍨嬪彿",
- prop: "model",
+ label: "妫�楠屼緷鎹�",
+ prop: "acceptanceBasis",
+ minWidth: 160,
},
{
- label: "鍗曚綅",
- prop: "unit",
- },
- {
- label: "鎬绘暟閲�",
+ label: "鏁伴噺",
prop: "quantity",
width: 100,
},
{
- label: "鍚堟牸鏁伴噺",
- prop: "qualifiedQuantity",
+ label: "鎶芥鏁伴噺",
+ prop: "samplingCount",
width: 100,
},
{
- label: "涓嶅悎鏍兼暟閲�",
- prop: "unqualifiedQuantity",
- width: 100,
- },
- {
- label: "鍚堟牸鐜�",
- prop: "passRate",
+ label: "鍒ゅ畾",
+ prop: "verdict",
width: 100,
dataType: "tag",
formatType: params => {
- if (!params) return "";
- const rate = parseFloat(params);
- if (rate < 90) {
- return "danger";
- } else if (rate === 100) {
+ if (params == "鍚堟牸") {
return "success";
- } else {
- return "warning";
- }
- },
- },
- {
- label: "妫�娴嬪崟浣�",
- prop: "checkCompany",
- width: 120,
- },
- {
- label: "妫�娴嬬粨鏋�",
- prop: "checkResult",
- dataType: "tag",
- formatType: params => {
- if (params === "涓嶅悎鏍�") {
+ } else if (params == "涓嶅悎鏍�") {
return "danger";
- } else if (params === "鍚堟牸") {
- return "success";
} else {
- return "danger";
+ return "info";
}
},
},
{
label: "鎻愪氦鐘舵��",
prop: "inspectState",
+ width: 100,
formatData: params => {
if (params) {
return "宸叉彁浜�";
@@ -226,22 +158,13 @@
label: "鎿嶄綔",
align: "center",
fixed: "right",
- width: 280,
+ width: 260,
operation: [
{
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;
},
},
{
@@ -264,59 +187,29 @@
clickFun: row => {
submit(row.id);
},
- disabled: row => {
- // 宸叉彁浜ゅ垯绂佺敤
- if (row.inspectState == 1) return true;
- // 濡傛灉妫�楠屽憳鏈夊�硷紝鍙湁褰撳墠鐧诲綍鐢ㄦ埛鑳芥彁浜�
- if (row.checkName) {
- return row.checkName !== userStore.nickName;
- }
- 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 => {
- downLoadFile(row);
- },
- },
+ // {
+ // name: "涓嬭浇",
+ // type: "text",
+ // clickFun: row => {
+ // downLoadFile(row);
+ // },
+ // },
],
},
]);
const tableData = ref([]);
const selectedRows = ref([]);
const tableLoading = ref(false);
- const userList = ref([]);
- const dialogFormVisible = ref(false);
- const form = ref({
- checkName: "",
- });
const page = reactive({
current: 1,
size: 100,
total: 0,
});
- const currentRow = ref(null);
const formDia = ref();
const filesDia = ref();
- const inspectionFormDia = ref();
const { proxy } = getCurrentInstance();
- const userStore = useUserStore();
+
const changeDaterange = value => {
searchForm.value.entryDateStart = undefined;
searchForm.value.entryDateEnd = undefined;
@@ -344,18 +237,7 @@
qualityInspectListPage({ ...params, inspectType: 0 })
.then(res => {
tableLoading.value = false;
- tableData.value = res.data.records.map(item => {
- const quantity = parseFloat(item.quantity);
- const qualifiedQuantity = parseFloat(item.qualifiedQuantity);
- let passRate = null;
- if (!isNaN(quantity) && !isNaN(qualifiedQuantity) && quantity > 0) {
- passRate = ((qualifiedQuantity / quantity) * 100).toFixed(2) + "%";
- }
- return {
- ...item,
- passRate: passRate,
- };
- });
+ tableData.value = res.data.records;
page.total = res.data.total;
})
.catch(err => {
@@ -423,40 +305,13 @@
});
};
- // 鎻愪环
+ // 鎻愪氦
const submit = async id => {
const res = await submitQualityInspect({ id: id });
if (res.code === 200) {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
getList();
}
- };
-
- // 鍏抽棴寮规
- const closeDia = () => {
- proxy.resetForm("formRef");
- dialogFormVisible.value = false;
- };
-
- const submitForm = () => {
- if (currentRow.value) {
- const data = {
- ...form.value,
- id: currentRow.value.id,
- };
- qualityInspectUpdate(data).then(res => {
- proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
- closeDia();
- getList();
- });
- }
- };
-
- const open = async row => {
- let userLists = await userListNoPage();
- userList.value = userLists.data;
- currentRow.value = row;
- dialogFormVisible.value = true;
};
const downLoadFile = row => {
@@ -476,10 +331,15 @@
window.URL.revokeObjectURL(downloadUrl);
});
};
-
onMounted(() => {
getList();
});
</script>
-<style scoped></style>
+<style scoped lang="scss">
+ .actions {
+ display: flex;
+ justify-content: flex-end;
+ margin-bottom: 10px;
+ }
+</style>
--
Gitblit v1.9.3