|
|
@@ -45,7 +45,8 @@
|
|
|
<el-dialog v-model="dialogVisible" :title="dialogTitle" width="640px" destroy-on-close @closed="resetForm">
|
|
|
<el-form ref="formRef" :model="form" :rules="rules" label-width="130px">
|
|
|
<el-row :gutter="12">
|
|
|
- <el-col :span="12">
|
|
|
+ <!-- 工厂已降级为系统后台归属字段:前台隐藏输入控件,domain 由 openCreate 补默认 / submit 兜底维护。 -->
|
|
|
+ <el-col :span="12" v-if="false">
|
|
|
<el-form-item label="工厂" prop="factoryRefId">
|
|
|
<el-select v-model="form.factoryRefId" filterable style="width: 100%">
|
|
|
<el-option
|
|
|
@@ -102,7 +103,7 @@ import { computed, onMounted, reactive, ref, watch } from 'vue';
|
|
|
import { useRoute } from 'vue-router';
|
|
|
import { ElMessage, ElMessageBox, type FormInstance, type FormRules } from 'element-plus';
|
|
|
import AidopDemoShell from '../../components/AidopDemoShell.vue';
|
|
|
-import { useS0MfgOrgScope } from '../composables/useS0MfgOrgScope';
|
|
|
+import { useS0MfgOrgScope, getDefaultS0OrgScope } from '../composables/useS0MfgOrgScope';
|
|
|
import { s0MfgPreprocessElementParamsApi } from '../api/s0ManufacturingApi';
|
|
|
|
|
|
const route = useRoute();
|
|
|
@@ -126,6 +127,14 @@ const query = reactive({
|
|
|
pageSize: 20,
|
|
|
});
|
|
|
|
|
|
+// 列表按工厂域(domain)查询:查询区工厂隐藏,按默认组织自动确定 domain 范围
|
|
|
+// (与新增/编辑归属同口径,复用 getDefaultS0OrgScope)。
|
|
|
+function applyDefaultQueryScope() {
|
|
|
+ const d = getDefaultS0OrgScope(companyOptions.value, factoryOptions.value);
|
|
|
+ query.companyRefId = d.companyRefId;
|
|
|
+ query.factoryRefId = d.factoryRefId;
|
|
|
+}
|
|
|
+
|
|
|
const loading = ref(false);
|
|
|
const rows = ref<Row[]>([]);
|
|
|
const total = ref(0);
|
|
|
@@ -163,7 +172,7 @@ watch(
|
|
|
);
|
|
|
|
|
|
const rules: FormRules = {
|
|
|
- factoryRefId: [{ required: true, message: '请选择工厂', trigger: 'change' }],
|
|
|
+ // 工厂已前台隐藏并由默认组织自动补齐,移除 factoryRefId 必填校验;保留业务字段必填。
|
|
|
deviceNumber: [{ required: true, message: '请填写要素编码', trigger: 'blur' }],
|
|
|
messageCode: [{ required: true, message: '请填写参数编码', trigger: 'blur' }],
|
|
|
};
|
|
|
@@ -195,9 +204,9 @@ async function loadList() {
|
|
|
|
|
|
function resetQuery() {
|
|
|
query.keyword = '';
|
|
|
- query.companyRefId = undefined;
|
|
|
- query.factoryRefId = undefined;
|
|
|
query.page = 1;
|
|
|
+ // 重置后恢复默认工厂/域,避免清空导致空查询
|
|
|
+ applyDefaultQueryScope();
|
|
|
void loadList();
|
|
|
}
|
|
|
|
|
|
@@ -221,6 +230,9 @@ function resetForm() {
|
|
|
|
|
|
function openCreate() {
|
|
|
resetForm();
|
|
|
+ // 新增:自动补默认工厂(使 resolveDomain 派生 domain=S0-F001),用户无需选择工厂。
|
|
|
+ const __scope = getDefaultS0OrgScope(companyOptions.value, factoryOptions.value);
|
|
|
+ Object.assign(form, { factoryRefId: __scope.factoryRefId });
|
|
|
dialogTitle.value = '新增前处理要素参数';
|
|
|
dialogVisible.value = true;
|
|
|
}
|
|
|
@@ -250,7 +262,11 @@ async function submitForm() {
|
|
|
await formRef.value?.validate();
|
|
|
saving.value = true;
|
|
|
try {
|
|
|
- const domain = resolveDomain(form.factoryRefId);
|
|
|
+ // 工厂控件前台隐藏:优先按 form.factoryRefId 派生 domain;未解析出时兜底为默认组织的 domainCode(=S0-F001)。
|
|
|
+ let domain = resolveDomain(form.factoryRefId);
|
|
|
+ if (!domain) {
|
|
|
+ domain = getDefaultS0OrgScope(companyOptions.value, factoryOptions.value).domainCode ?? '';
|
|
|
+ }
|
|
|
if (!domain) throw new Error('domain is required');
|
|
|
const payload = {
|
|
|
domain,
|
|
|
@@ -291,6 +307,8 @@ function onDelete(row: Row) {
|
|
|
|
|
|
onMounted(async () => {
|
|
|
await loadOrgs();
|
|
|
+ // 查询区工厂隐藏,按默认组织自动确定 domain 范围
|
|
|
+ applyDefaultQueryScope();
|
|
|
await loadList();
|
|
|
});
|
|
|
</script>
|