From 401b0049703ab77faa8c49e6eb3cf6ee25261d9b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 23 十二月 2025 17:18:00 +0800
Subject: [PATCH] 1.海川开心-质量管理规格型号和单位填写方式修改
---
src/views/qualityManagement/processInspection/components/formDia.vue | 29 ++++++++------
src/views/qualityManagement/finalInspection/components/formDia.vue | 27 ++++++++-----
src/views/qualityManagement/rawMaterialInspection/components/formDia.vue | 31 +++++++++------
3 files changed, 51 insertions(+), 36 deletions(-)
diff --git a/src/views/qualityManagement/finalInspection/components/formDia.vue b/src/views/qualityManagement/finalInspection/components/formDia.vue
index 7bcd81b..68b063f 100644
--- a/src/views/qualityManagement/finalInspection/components/formDia.vue
+++ b/src/views/qualityManagement/finalInspection/components/formDia.vue
@@ -24,9 +24,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="瑙勬牸鍨嬪彿锛�" prop="model">
- <el-select v-model="form.modelId" placeholder="璇烽�夋嫨" clearable @change="getProductModel">
- <el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id" />
- </el-select>
+ <el-input v-model="form.model" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
</el-col>
</el-row>
@@ -100,7 +98,9 @@
</template>
<script setup>
-import {ref} from "vue";
+import {ref, computed} from "vue";
+import dayjs from "dayjs";
+import useUserStore from "@/store/modules/user.js";
import {getOptions} from "@/api/procurementManagement/procurementLedger.js";
import {modelList, productTreeList} from "@/api/basicData/product.js";
import {qualityInspectAdd, qualityInspectUpdate} from "@/api/qualityManagement/rawMaterialInspection.js";
@@ -109,6 +109,9 @@
import {qualityInspectParamInfo} from "@/api/qualityManagement/qualityInspectParam.js";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])
+const userStore = useUserStore()
+const currentUserName = computed(() => userStore.nickName || userStore.name || "")
+const getToday = () => dayjs().format("YYYY-MM-DD")
const dialogFormVisible = ref(false);
const operationType = ref('')
@@ -166,12 +169,7 @@
]);
const tableData = ref([]);
const tableLoading = ref(false);
-const userList = ref([
- {nickName: '鍊欑洓鏉�'},
- {nickName: '鐒﹁緣'},
- {nickName: '寮犲煿'},
- {nickName: '鍐伒涔�'},
-]);
+const userList = ref([]);
const currentProductId = ref(0);
const modelOptions = ref([]);
@@ -183,7 +181,7 @@
supplierList.value = res.data;
});
let userLists = await userListNoPage();
- // userList.value = userLists.data;
+ userList.value = userLists.data;
form.value = {}
getProductOptions();
if (operationType.value === 'edit') {
@@ -201,6 +199,13 @@
}
getQualityInspectParamList(row.id)
}
+ // 榛樿妫�楠屽憳涓哄綋鍓嶇櫥褰曚汉锛屾娴嬫棩鏈熼粯璁や负褰撳ぉ锛堢┖鏃跺～鍏咃級
+ if (currentUserName.value && !form.value.checkName) {
+ form.value.checkName = currentUserName.value;
+ }
+ if (!form.value.checkTime) {
+ form.value.checkTime = getToday();
+ }
}
const getProductOptions = () => {
productTreeList({productName: '璐ㄩ噺'}).then((res) => {
diff --git a/src/views/qualityManagement/processInspection/components/formDia.vue b/src/views/qualityManagement/processInspection/components/formDia.vue
index df5d7cd..e7ba6d7 100644
--- a/src/views/qualityManagement/processInspection/components/formDia.vue
+++ b/src/views/qualityManagement/processInspection/components/formDia.vue
@@ -31,9 +31,7 @@
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="瑙勬牸鍨嬪彿锛�" prop="model">
- <el-select v-model="form.modelId" placeholder="璇烽�夋嫨" clearable @change="getProductModel">
- <el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id" />
- </el-select>
+ <el-input v-model="form.model" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -106,15 +104,20 @@
</template>
<script setup>
-import {ref} from "vue";
+import {ref, computed} from "vue";
import {getOptions} from "@/api/procurementManagement/procurementLedger.js";
import {modelList, productTreeList} from "@/api/basicData/product.js";
import {qualityInspectAdd, qualityInspectUpdate} from "@/api/qualityManagement/rawMaterialInspection.js";
import {qualityInspectDetailByProductId} from "@/api/qualityManagement/metricMaintenance.js";
import {userListNoPage} from "@/api/system/user.js";
import {qualityInspectParamInfo} from "@/api/qualityManagement/qualityInspectParam.js";
+import dayjs from "dayjs";
+import useUserStore from "@/store/modules/user.js";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])
+const userStore = useUserStore()
+const currentUserName = computed(() => userStore.nickName || userStore.name || "")
+const getToday = () => dayjs().format("YYYY-MM-DD")
const dialogFormVisible = ref(false);
const operationType = ref('')
@@ -143,12 +146,7 @@
checkResult: [{ required: true, message: "璇疯緭鍏�", trigger: "change" }],
},
});
-const userList = ref([
- {nickName: '鍊欑洓鏉�'},
- {nickName: '鐒﹁緣'},
- {nickName: '寮犲煿'},
- {nickName: '鍐伒涔�'},
-]);
+const userList = ref([]);
const { form, rules } = toRefs(data);
const supplierList = ref([]);
const productOptions = ref([]);
@@ -188,8 +186,8 @@
getOptions().then((res) => {
supplierList.value = res.data;
});
- // let userLists = await userListNoPage();
- // userList.value = userLists.data;
+ let userLists = await userListNoPage();
+ userList.value = userLists.data;
form.value = {}
getProductOptions();
if (operationType.value === 'edit') {
@@ -207,6 +205,13 @@
}
getQualityInspectParamList(row.id)
}
+ // 榛樿妫�楠屽憳涓哄綋鍓嶇櫥褰曚汉锛屾娴嬫棩鏈熼粯璁や负褰撳ぉ锛堢┖鏃跺～鍏咃級
+ if (currentUserName.value && !form.value.checkName) {
+ form.value.checkName = currentUserName.value;
+ }
+ if (!form.value.checkTime) {
+ form.value.checkTime = getToday();
+ }
}
const getProductOptions = () => {
productTreeList({productName: '璐ㄩ噺'}).then((res) => {
diff --git a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
index 6852629..d26eaf2 100644
--- a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
@@ -43,9 +43,7 @@
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="瑙勬牸鍨嬪彿锛�" prop="model">
- <el-select v-model="form.modelId" placeholder="璇烽�夋嫨" clearable @change="getProductModel">
- <el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id" />
- </el-select>
+ <el-input v-model="form.model" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -126,7 +124,7 @@
</template>
<script setup>
-import {ref} from "vue";
+import {ref, computed} from "vue";
import {getOptions} from "@/api/procurementManagement/procurementLedger.js";
import {modelList, productTreeList} from "@/api/basicData/product.js";
import {qualityInspectAdd, qualityInspectUpdate} from "@/api/qualityManagement/rawMaterialInspection.js";
@@ -134,15 +132,15 @@
import {qualityInspectParamDel, qualityInspectParamInfo} from "@/api/qualityManagement/qualityInspectParam.js";
import {qualityInspectDetailByProductId} from "@/api/qualityManagement/metricMaintenance.js";
import {userListNoPageByTenantId} from "@/api/system/user.js";
+import dayjs from "dayjs";
+import useUserStore from "@/store/modules/user.js";
const {proxy} = getCurrentInstance()
const emit = defineEmits(['close'])
-const userList = ref([
- {nickName: '鍊欑洓鏉�'},
- {nickName: '鐒﹁緣'},
- {nickName: '寮犲煿'},
- {nickName: '鍐伒涔�'},
-])
+const userList = ref([])
+const userStore = useUserStore()
+const currentUserName = computed(() => userStore.nickName || userStore.name || "")
+const getToday = () => dayjs().format("YYYY-MM-DD")
const dialogFormVisible = ref(false);
const operationType = ref('')
const data = reactive({
@@ -211,9 +209,9 @@
getOptions().then((res) => {
supplierList.value = res.data;
});
- // userListNoPageByTenantId().then((res) => {
- // userList.value = res.data;
- // });
+ userListNoPageByTenantId().then((res) => {
+ userList.value = res.data;
+ });
form.value = {}
getProductOptions();
if (operationType.value === 'edit' && row) {
@@ -231,6 +229,13 @@
}
getQualityInspectParamList(row.id)
}
+ // 榛樿妫�楠屽憳涓哄綋鍓嶇櫥褰曚汉锛屾娴嬫棩鏈熼粯璁や负褰撳ぉ锛堢┖鏃跺～鍏咃級
+ if (currentUserName.value && !form.value.checkName) {
+ form.value.checkName = currentUserName.value;
+ }
+ if (!form.value.checkTime) {
+ form.value.checkTime = getToday();
+ }
}
const getProductOptions = () => {
productTreeList({productName: '璐ㄩ噺'}).then((res) => {
--
Gitblit v1.9.3