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) => { 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) => { 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) => {