From 6809fa6209c3a9e546e6d2e010dcf97ce20e8f8a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 19 九月 2026 23:42:21 +0800
Subject: [PATCH] fix: 登录日志的访问日期只保留时分秒
---
src/views/qualityManagement/processInspection/components/formDia.vue | 244 +++++++++++++++++++++++++++++++-----------------
1 files changed, 159 insertions(+), 85 deletions(-)
diff --git a/src/views/qualityManagement/processInspection/components/formDia.vue b/src/views/qualityManagement/processInspection/components/formDia.vue
index 8e6466a..db5a44f 100644
--- a/src/views/qualityManagement/processInspection/components/formDia.vue
+++ b/src/views/qualityManagement/processInspection/components/formDia.vue
@@ -2,19 +2,14 @@
<div>
<el-dialog
v-model="dialogFormVisible"
- :title="operationType === 'add' ? '鏂板鍘熸潗鏂欐楠�' : '缂栬緫鍘熸潗鏂欐楠�'"
+ :title="operationType === 'add' ? '鏂板杩囩▼妫�楠�' : operationType === 'view' ? '鏌ョ湅杩囩▼妫�楠�' : '缂栬緫杩囩▼妫�楠�'"
width="70%"
@close="closeDia"
>
- <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
+ <el-form :model="form" label-position="top" :rules="rules" ref="formRef">
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="宸ュ簭锛�" prop="process">
- <el-input v-model="form.process" placeholder="璇疯緭鍏�" clearable/>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="浜у搧鍚嶇О锛�" prop="productId">
+ <el-form-item label="鍚嶇О锛�" prop="productId">
<el-tree-select
v-model="form.productId"
placeholder="璇烽�夋嫨"
@@ -23,54 +18,64 @@
@change="getModels"
:data="productOptions"
:render-after-expand="false"
+ :disabled="isViewMode || operationType === 'edit'"
style="width: 100%"
/>
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="model">
- <el-input v-model="form.model" placeholder="璇疯緭鍏�" clearable/>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="鍗曚綅锛�" prop="unit">
- <el-input v-model="form.unit" placeholder="璇疯緭鍏�" clearable/>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鏁伴噺锛�" prop="quantity">
- <el-input v-model="form.quantity" placeholder="璇疯緭鍏�" clearable/>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="妫�娴嬪崟浣嶏細" prop="checkCompany">
- <el-input v-model="form.checkCompany" placeholder="璇疯緭鍏�" clearable/>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="妫�娴嬬粨鏋滐細" prop="checkResult">
- <el-select v-model="form.checkResult">
- <el-option label="鍚堟牸" value="鍚堟牸" />
- <el-option label="涓嶅悎鏍�" value="涓嶅悎鏍�" />
+ <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="productModelId">
+ <el-select v-model="form.productModelId" placeholder="璇烽�夋嫨" clearable :disabled="isViewMode || operationType === 'edit'"
+ filterable readonly @change="handleChangeModel" style="width: 100%">
+ <el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="妫�楠屽憳锛�" prop="checkName">
- <el-input v-model="form.checkName" placeholder="璇疯緭鍏�" clearable/>
-
+ <el-form-item label="鏉愯川锛�" prop="material">
+ <el-input v-model="form.material" placeholder="璇疯緭鍏�" clearable :disabled="isViewMode"/>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="妫�娴嬫棩鏈燂細" prop="checkTime">
+ <el-form-item label="楠屾敹渚濇嵁锛�" prop="acceptanceBasis">
+ <el-input v-model="form.acceptanceBasis" placeholder="璇疯緭鍏�" clearable :disabled="isViewMode"/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="鏁伴噺锛�" prop="quantity">
+ <el-input v-model="form.quantity" placeholder="0.00" clearable :disabled="isViewMode"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎶芥鏁帮細" prop="samplingCount">
+ <el-input v-model="form.samplingCount" placeholder="0.00" clearable :disabled="isViewMode"/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="涓昏鎶�鏈弬鏁帮細" prop="mainTechnicalParams">
+ <el-input v-model="form.mainTechnicalParams" placeholder="璇疯緭鍏�" clearable :disabled="isViewMode"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="瀹為檯鎶�鏈弬鏁帮細" prop="actualTechnicalParams">
+ <el-input v-model="form.actualTechnicalParams" placeholder="璇疯緭鍏�" clearable :disabled="isViewMode"/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="璇存槑涔︼細" prop="specificationManual">
+ <el-input v-model="form.specificationManual" placeholder="璇疯緭鍏�" clearable :disabled="isViewMode"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="妫�楠屾棩鏈燂細" prop="checkTime">
<el-date-picker
v-model="form.checkTime"
type="date"
@@ -79,15 +84,46 @@
format="YYYY-MM-DD"
clearable
style="width: 100%"
+ :disabled="isViewMode"
/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="鍏ュ簱缂栧彿锛�" prop="warehouseCode">
+ <el-input v-model="form.warehouseCode" placeholder="璇疯緭鍏�" clearable :disabled="isViewMode"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎵�灞炶澶囧悕绉帮細" prop="equipmentName">
+ <el-input v-model="form.equipmentName" placeholder="璇疯緭鍏�" clearable :disabled="isViewMode"/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="椤圭洰鍚嶇О锛�" prop="projectName">
+ <el-input v-model="form.projectName" placeholder="璇疯緭鍏�" clearable :disabled="isViewMode"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍒ゅ畾锛�" prop="verdict">
+ <el-select v-model="form.verdict" placeholder="璇烽�夋嫨" clearable :disabled="isViewMode" style="width: 100%">
+ <el-option label="鍚堟牸" value="鍚堟牸" />
+ <el-option label="涓嶅悎鏍�" value="涓嶅悎鏍�" />
+ </el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<div class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭</el-button>
- <el-button @click="closeDia">鍙栨秷</el-button>
+ <template v-if="!isViewMode">
+ <el-button type="primary" @click="submitForm">纭</el-button>
+ <el-button @click="closeDia">鍙栨秷</el-button>
+ </template>
+ <el-button v-else @click="closeDia">鍏抽棴</el-button>
</div>
</template>
</el-dialog>
@@ -95,64 +131,99 @@
</template>
<script setup>
-import {ref} from "vue";
-import {getOptions} from "@/api/procurementManagement/procurementLedger.js";
-import {productTreeList} from "@/api/basicData/product.js";
+import {ref, reactive, toRefs, computed, getCurrentInstance, nextTick} from "vue";
+import {modelList, productTreeList} from "@/api/basicData/product.js";
import {qualityInspectAdd, qualityInspectUpdate} from "@/api/qualityManagement/rawMaterialInspection.js";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])
const dialogFormVisible = ref(false);
-const operationType = ref('')
+const operationType = ref("");
const data = reactive({
form: {
+ id: "",
checkTime: "",
- process: "",
- checkName: "",
- productName: "",
productId: "",
+ productModelId: "",
model: "",
- unit: "",
- quantity: "",
- checkCompany: "",
- checkResult: "",
+ productName: "",
+ material: "",
+ acceptanceBasis: "",
+ quantity: undefined,
+ samplingCount: undefined,
+ mainTechnicalParams: "",
+ actualTechnicalParams: "",
+ specificationManual: "",
+ warehouseCode: "",
+ equipmentName: "",
+ projectName: "",
+ verdict: "",
},
rules: {
- checkTime: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" },],
- process: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- checkName: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
- productId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- model: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
- unit: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
- quantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- checkCompany: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
- checkResult: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
+ productId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ productModelId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
},
});
const { form, rules } = toRefs(data);
-const supplierList = ref([]);
+// 宸叉彁浜ょ殑璁板綍鐐圭紪杈戞椂鎸夊彧璇诲鐞�
+const readOnlyEdit = ref(false);
+// 鏄惁涓哄彧璇绘ā寮忥紙鏌ョ湅 鎴� 宸叉彁浜よ褰曠偣缂栬緫锛�
+const isViewMode = computed(() => operationType.value === 'view' || readOnlyEdit.value);
const productOptions = ref([]);
+const modelOptions = ref([]);
+const currentProductId = ref(0);
// 鎵撳紑寮规
-const openDialog = (type, row) => {
+const openDialog = async (type, row) => {
+ readOnlyEdit.value = type === 'edit' && row?.inspectState == 1;
operationType.value = type;
- dialogFormVisible.value = true;
- getOptions().then((res) => {
- supplierList.value = res.data;
- });
- getProductOptions();
- if (operationType.value === 'edit') {
- form.value = {...row}
+ // 鍏堥噸缃〃鍗曪紝閬垮厤寮傛鍔犺浇澶辫触鏃舵畫鐣欎笂涓�娆′細璇濈殑鏁版嵁锛堝惈id锛�
+ form.value = { ...data.form };
+ if (operationType.value === 'edit' || operationType.value === 'view') {
+ form.value = { ...form.value, ...row };
}
-}
+ dialogFormVisible.value = true;
+ await nextTick();
+ proxy.$refs.formRef?.clearValidate();
+
+ await getProductOptions();
+ modelOptions.value = [];
+
+ if (operationType.value === 'edit' || operationType.value === 'view') {
+ currentProductId.value = row.productId || 0;
+ if (currentProductId.value) {
+ form.value.productName = findNodeById(productOptions.value, currentProductId.value);
+ modelList({ id: currentProductId.value }).then((res) => {
+ modelOptions.value = res || [];
+ });
+ }
+ }
+ nextTick(() => {
+ proxy.$refs.formRef?.clearValidate();
+ });
+};
const getProductOptions = () => {
- productTreeList().then((res) => {
+ return productTreeList().then((res) => {
productOptions.value = convertIdToValue(res);
});
};
const getModels = (value) => {
+ form.value.productModelId = undefined;
+ form.value.model = undefined;
+ modelOptions.value = [];
+ currentProductId.value = value
form.value.productName = findNodeById(productOptions.value, value);
+ if (value) {
+ modelList({ id: value }).then((res) => {
+ modelOptions.value = res || [];
+ })
+ }
};
+
+const handleChangeModel = (value) => {
+ form.value.model = modelOptions.value.find(item => item.id == value)?.model || '';
+}
+
const findNodeById = (nodes, productId) => {
for (let i = 0; i < nodes.length; i++) {
if (nodes[i].value === productId) {
@@ -177,7 +248,7 @@
if (children && children.length > 0) {
newItem.children = convertIdToValue(children);
}
-
+
return newItem;
});
}
@@ -185,27 +256,30 @@
const submitForm = () => {
proxy.$refs.formRef.validate(valid => {
if (valid) {
- form.value.inspectType = 1
+ const data = { ...form.value, inspectType: 1 };
if (operationType.value === "add") {
- qualityInspectAdd(form.value).then(res => {
+ delete data.id;
+ qualityInspectAdd(data).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
closeDia();
- })
+ });
} else {
- qualityInspectUpdate(form.value).then(res => {
+ qualityInspectUpdate(data).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
closeDia();
- })
+ });
}
}
- })
+ });
}
// 鍏抽棴寮规
const closeDia = () => {
proxy.resetForm("formRef");
+ modelOptions.value = [];
+ readOnlyEdit.value = false;
dialogFormVisible.value = false;
- emit('close')
-};
+ emit('close');
+}
defineExpose({
openDialog,
});
@@ -213,4 +287,4 @@
<style scoped>
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3