From 16257dd099d9811fb5caf78047ffc2425c401e0e Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期一, 05 八月 2024 03:11:20 +0800
Subject: [PATCH] 工单工艺路线更新
---
src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts | 4 ++--
src/views/tigerprojects/mes/eng/route/components/PostProps.vue | 1 -
src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts | 4 ++--
src/views/tigerprojects/system/lowcode/normal/mainTable.vue | 3 ++-
src/views/tigerprojects/mes/eng/route/components/FormProps.vue | 14 +++++++++++---
5 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/views/tigerprojects/mes/eng/route/components/FormProps.vue b/src/views/tigerprojects/mes/eng/route/components/FormProps.vue
index 681358d..56479c2 100644
--- a/src/views/tigerprojects/mes/eng/route/components/FormProps.vue
+++ b/src/views/tigerprojects/mes/eng/route/components/FormProps.vue
@@ -1,4 +1,12 @@
<!--
+ * @Description: file content
+ * @Author: Ben Lin
+ * @version:
+ * @Date: 2024-06-18 15:09:48
+ * @LastEditors: Ben Lin
+ * @LastEditTime: 2024-08-04 22:14:54
+-->
+<!--
* @Description: 鍙充晶灞炴�ч潰鏉挎帶浠� 琛ㄥ崟灞炴�ч潰鏉�
-->
<template>
@@ -28,7 +36,7 @@
v-model:value="mesRoute.ROT_TYPE"
style="width: 120px"
:options="options2"
- :readonly="true"
+ :disabled="true"
/>
</FormItem>
<FormItem label="宸ヨ壓璺嚎鐗堟湰" name="宸ヨ壓璺嚎鐗堟湰">
@@ -46,7 +54,7 @@
v-model:value="mesRoute.IS_ACTIVE"
style="width: 120px"
:options="options1"
- :readonly="true"
+ :disabled="true"
/>
</FormItem>
</Form>
@@ -58,7 +66,7 @@
import { ref } from 'vue';
import { GetEnum } from '/@/api/tigerapi/system';
- const { mesRoute } = useRouteDesignState();
+ const { routeConfig, mesRoute } = useRouteDesignState();
const options1 = ref<any>([
{
value: 'Y',
diff --git a/src/views/tigerprojects/mes/eng/route/components/PostProps.vue b/src/views/tigerprojects/mes/eng/route/components/PostProps.vue
index c766dae..b9c0b19 100644
--- a/src/views/tigerprojects/mes/eng/route/components/PostProps.vue
+++ b/src/views/tigerprojects/mes/eng/route/components/PostProps.vue
@@ -49,7 +49,6 @@
import { DeleteWhere, getListByPage } from '/@/api/tigerapi/system';
import { useRouteDesignState } from '../hooks/useRouteDesignState';
import { SaveRouteNodePost, SaveWoRouteNodePost } from '/@/api/tigerapi/mes/router';
- import { WORD_BREAK } from 'html2canvas/dist/types/css/property-descriptors/word-break';
const { t } = useI18n();
const { routeConfig, mesRoute } = useRouteDesignState();
diff --git a/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts b/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts
index a7b11ff..291fdfa 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts
@@ -4,7 +4,7 @@
* @version:
* @Date: 2024-06-19 20:34:27
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-08-04 15:42:50
+ * @LastEditTime: 2024-08-05 00:43:22
*/
import { Ref, h, ref, render, unref } from 'vue';
@@ -1367,7 +1367,7 @@
label: '妯℃澘缂栫爜',
component: 'Input',
show: true,
- required: true,
+ // required: true,
colProps: {
span: 22,
},
diff --git a/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts b/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts
index b729596..7bfc72b 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts
@@ -4,7 +4,7 @@
* @version:
* @Date: 2024-06-19 20:34:27
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-08-04 16:44:05
+ * @LastEditTime: 2024-08-05 00:43:08
*/
import { Ref, h, ref, render, unref } from 'vue';
@@ -1360,7 +1360,7 @@
label: '妯℃澘缂栫爜',
component: 'Input',
show: true,
- required: true,
+ // required: true,
colProps: {
span: 22,
},
diff --git a/src/views/tigerprojects/system/lowcode/normal/mainTable.vue b/src/views/tigerprojects/system/lowcode/normal/mainTable.vue
index 4f52623..1d23510 100644
--- a/src/views/tigerprojects/system/lowcode/normal/mainTable.vue
+++ b/src/views/tigerprojects/system/lowcode/normal/mainTable.vue
@@ -237,7 +237,7 @@
* @return {*}
*/
async function init(lf, rotId) {
- initRoute(lf, rotId, routeData, currlf);
+ initRoute(lf, rotId, routeData, currlf, null);
}
/**
@@ -261,6 +261,7 @@
currlf,
selectVals,
colSlots,
+ ifSave: true,
};
const actionItem = GenerateActionButton(params, buttons, openDrawer, reload);
--
Gitblit v1.9.3