Compare commits

..

No commits in common. "494999eb111a1018ef44433e2ad17269ef5d3f7d" and "ca5d96bd86fbccec920f182928f5ef902fa62620" have entirely different histories.

6 changed files with 7 additions and 32 deletions

View File

@ -1,7 +1,3 @@
## 3.1.2026072315
- fix: 问题修复
- 工艺路线表单残留问题根治:xtSelect外部清空值时同步清空显示文字(残留主因);画布/右侧新增弹框加key每次打开强制重建实例;route_form编辑时sort不再被count+1覆盖;无routeId不再全量拉辅料 [caoqianming]
## 3.1.2026072314
- fix: 问题修复

View File

@ -87,10 +87,9 @@
</div>
</div>
<!-- 复用现有单步表单新增/编辑一条 Routekey 随每次打开递增强制重建实例杜绝上次内容残留 -->
<!-- 复用现有单步表单新增/编辑一条 Route -->
<route-form
v-if="dialogVisible"
:key="dialogSeq"
ref="routeForm"
:count="count"
:routepack="routepack"
@ -142,7 +141,6 @@ export default {
edges: [],
count: 0,
dialogVisible: false,
dialogSeq: 0,
//
matType: "30",
matKeyword: "",
@ -481,7 +479,6 @@ export default {
/** 打开单步表单prefill 为 null 表示纯新增 */
openForm(mode, prefill) {
this.dialogSeq += 1;
this.dialogVisible = true;
this.$nextTick(() => {
const inst = this.$refs.routeForm.open(mode);

View File

@ -123,18 +123,8 @@ onMounted(() => {
const init = () => {
if (props.label) {
selectLabel.value = props.label;
return;
}
// (/)
const emptyVal =
props.modelValue == null ||
props.modelValue === "" ||
(Array.isArray(props.modelValue) && props.modelValue.length === 0);
if (emptyVal) {
selectLabel.value = "";
return;
}
if (props.multiple) {
} else {
if (props.multiple) {
if (isFixOptions.value) {
selectLabel.value = props.options
.filter((item) =>
@ -159,6 +149,7 @@ const init = () => {
selectLabel.value = props.obj[props.labelField];
}
}
}
}
const isFixOptions = ref(false);

View File

@ -6,7 +6,7 @@ const DEFAULT_CONFIG = {
DASHBOARD_URL: "/dashboard",
//版本号
APP_VER: "3.1.2026072315",
APP_VER: "3.1.2026072314",
//内核版本号
CORE_VER: "1.6.9",

View File

@ -397,11 +397,6 @@ export default {
},
getroutemats(){
let that = this;
// routeId(线)
if (!that.routeId) {
that.routemats = [];
return;
}
that.$API.mtm.routemat.list.req({ route: that.routeId,page: 0}).then((res) => {
that.routemats = res;
});
@ -505,8 +500,7 @@ export default {
that.resetForm();
that.visible = true;
that.$nextTick(() => {
// setData sort
if(that.count && mode === "add"){
if(that.count){
that.form.sort = that.count+1;
}
that.$refs.dialogForm && that.$refs.dialogForm.clearValidate();

View File

@ -184,7 +184,6 @@
</el-container>
<save-dialog
v-if="dialog.save"
:key="dialogSeq"
ref="saveDialog"
:count = "count"
:routepack="routepack"
@ -218,7 +217,6 @@ export default {
dialog: {
save: false,
},
dialogSeq: 0,
fileList:[],
form: {
name: "",
@ -343,14 +341,13 @@ export default {
table_add() {
let that = this;
that.count = this.$refs.tables.tableData.length;
this.dialogSeq += 1;
console.log("count",that.count);
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("add");
});
},
table_edit(row) {
this.dialogSeq += 1;
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("edit").setData(row);