From 7bcfc0507043dc878c801a259aa7d058f4982551 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 09 一月 2025 00:42:21 +0800
Subject: [PATCH] 工单管理优化
---
.env.development | 2 +-
src/views/components/printTemplate.vue | 19 ++++++++++++++++---
src/views/tigerprojects/system/lowcode/data.ts | 2 +-
src/views/tigerprojects/system/lowcode/entityts/BIZ_MES_WO.ts | 10 +++++-----
src/views/tigerprojects/system/lowcode/entityts/BIZ_MES_WO_BATCH.ts | 2 +-
src/views/tigerprojects/system/lowcode/normal/mainTable.vue | 1 +
src/views/tigerprojects/system/lowcode/normal/index.vue | 8 ++++++--
src/views/demo/form/index.vue | 2 +-
8 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/.env.development b/.env.development
index a2ca32b..ca72491 100644
--- a/.env.development
+++ b/.env.development
@@ -16,7 +16,7 @@
VITE_GLOB_API_URL=http://localhost:9528/api
VITE_GLOB_SYS_API_URL=http://localhost:9528
VITE_GLOB_TSK_API_URL=http://localhost:9528/api
-VITE_GLOB_WS_URL=http://localhost:7519
+VITE_GLOB_WS_URL=ws://localhost:7519
# File upload address锛� optional
# 鐩存帴IIS鎴栬�呰皟璇曠敤
diff --git a/src/views/components/printTemplate.vue b/src/views/components/printTemplate.vue
index ebcb779..f41db22 100644
--- a/src/views/components/printTemplate.vue
+++ b/src/views/components/printTemplate.vue
@@ -47,7 +47,7 @@
<div style="width: 15%">浜у搧鎻忚堪:</div>
<div style="width: 85%">{{ items.ItemDesc }}</div>
</div>
- <div style="display: flex; flex-direction: row; height: 20px; margin: 15px 20px 2px;font-size: 12px;">
+ <div style="display: flex; flex-direction: row; height: 20px; margin: 25px 20px 2px;font-size: 12px;">
<div style="width: 15%">宸ヨ壓璺嚎:</div>
<div style="width: 85%">{{ items.RouteStr }}</div>
</div>
@@ -101,7 +101,7 @@
{{ }}
</td>
</tr>
- <tr v-if="index == Number(curPrintInfo?.length) - 1 && items.Items.length < 11" v-for="n in (11-items.Items.length)" :key="n">
+ <tr v-if="Number(curPrintInfo?.length) >1 && index == Number(curPrintInfo?.length) - 1 && items.Items.length < 11" v-for="n in (11-items.Items.length)" :key="n">
<td class="instore_td2"> </td>
<td class="instore_td2"> </td>
<td class="instore_td2"> </td>
@@ -113,7 +113,20 @@
<td class="instore_td2"> </td>
<td class="instore_td2"> </td>
</tr>
- <tr v-if="index == Number(curPrintInfo?.length) - 1 && items.Items.length <= 11">
+ <tr v-if="Number(curPrintInfo?.length) ==1 && index == Number(curPrintInfo?.length) - 1 && items.Items.length < 11" v-for="n in (9-items.Items.length)" :key="n">
+ <td class="instore_td2"> </td>
+ <td class="instore_td2"> </td>
+ <td class="instore_td2"> </td>
+ <td class="instore_td2"> </td>
+ <td class="instore_td2"> </td>
+ <td class="instore_td2"> </td>
+ <td class="instore_td2"> </td>
+ <td class="instore_td2"> </td>
+ <td class="instore_td2"> </td>
+ <td class="instore_td2"> </td>
+ </tr>
+ <!-- <tr v-if="index == Number(curPrintInfo?.length) - 1 && items.Items.length <= 11"> -->
+ <tr>
<td colspan="5" style="height:70px; font-size: 12px;vertical-align: top;">鐢熶骇璁㈠崟澶囨敞锛歿{ items.MoRemark }}</td>
<td colspan="5" style="height:70px; font-size: 12px;vertical-align: top;">閿�鍞鍗曞娉細{{ items.SoRemark }}</td>
</tr>
diff --git a/src/views/demo/form/index.vue b/src/views/demo/form/index.vue
index 9300af0..54da48c 100644
--- a/src/views/demo/form/index.vue
+++ b/src/views/demo/form/index.vue
@@ -430,7 +430,7 @@
colProps: {
span: 8,
},
- defaultValue: '0',
+ // defaultValue: '0',
},
{
field: 'field8',
diff --git a/src/views/tigerprojects/system/lowcode/data.ts b/src/views/tigerprojects/system/lowcode/data.ts
index 63fe938..7b6020a 100644
--- a/src/views/tigerprojects/system/lowcode/data.ts
+++ b/src/views/tigerprojects/system/lowcode/data.ts
@@ -441,7 +441,7 @@
params[Keys[k]][1] = dateUtil(params[Keys[k]][1]);
}
}
- if (isTimeViaRegExp8601(params[Keys[k]])) {
+ if (!isNullOrEmpty(params[Keys[k]]) && isTimeViaRegExp8601(params[Keys[k]])) {
params[Keys[k]] = dateUtil(params[Keys[k]]);
}
}
diff --git a/src/views/tigerprojects/system/lowcode/entityts/BIZ_MES_WO.ts b/src/views/tigerprojects/system/lowcode/entityts/BIZ_MES_WO.ts
index 15a035c..82744a1 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/BIZ_MES_WO.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/BIZ_MES_WO.ts
@@ -100,8 +100,8 @@
if (status == '寮傚父') {
color = 'red';
text = status;
- } else if (status == '淇敼') {
- color = 'yellow';
+ } else if (status == '鏇存柊') {
+ color = 'orange';
text = status;
} else {
text = status;
@@ -110,7 +110,7 @@
},
},
{
- title: '澶勭悊缁撴灉',
+ title: '澶勭悊鎻愮ず',
dataIndex: 'VALIDATION_RESULT',
ifShow: true,
width: 280,
@@ -120,8 +120,8 @@
var color = 'green';
if (status == '寮傚父') {
color = 'red';
- } else if (status == '淇敼') {
- color = 'yellow';
+ } else if (status == '鏇存柊') {
+ color = 'orange';
}
return h(Tooltip, { title: text }, () => h(Tag, { color: color }, () => text));
},
diff --git a/src/views/tigerprojects/system/lowcode/entityts/BIZ_MES_WO_BATCH.ts b/src/views/tigerprojects/system/lowcode/entityts/BIZ_MES_WO_BATCH.ts
index b9858c2..1bac099 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/BIZ_MES_WO_BATCH.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/BIZ_MES_WO_BATCH.ts
@@ -27,7 +27,7 @@
function _default() {
const ActionColumn: BasicColumn = {
- width: 160,
+ width: 180,
title: '鎿嶄綔',
dataIndex: 'action',
slots: { customRender: 'action' },
diff --git a/src/views/tigerprojects/system/lowcode/normal/index.vue b/src/views/tigerprojects/system/lowcode/normal/index.vue
index 7222220..8dfa369 100644
--- a/src/views/tigerprojects/system/lowcode/normal/index.vue
+++ b/src/views/tigerprojects/system/lowcode/normal/index.vue
@@ -38,8 +38,8 @@
const go = useGo();
const objParams = ref(JSON.parse(decodeURI(route.params?.id as string)));
// 浠巗essionStorage涓鍙栧弬鏁板苟杞崲鍥炲璞�
- const _savedParams =sessionStorage.getItem(`${objParams.value.sName}_params`)
- const savedParams = _savedParams ? ref(JSON.parse(decodeURI(_savedParams))) : ref({});
+ const _savedParams = sessionStorage.getItem(`${objParams.value.sName}_params`);
+ const savedParams = _savedParams ? ref(JSON.parse(decodeURI(_savedParams))) : ref({});
const entityName = ref(objParams.value.ID);
const _columns = ref<any[]>([]);
const _searchFormSchema = ref<any[]>([]);
@@ -119,6 +119,7 @@
searchForms[i].componentProps.params.name =
`${objParams.value.ID}+${searchForms[i].field}s`;
searchForms[i].componentProps.labelField = unref(getLocale) == 'zh_CN' ? 'Desc' : 'Name';
+ searchForms[i].defaultValue = null;
}
if (
!isNullOrEmpty(searchForms[i].componentProps) &&
@@ -127,6 +128,7 @@
) {
searchForms[i].componentProps.api = getEntity;
searchForms[i].componentProps.resultField = 'Data.Items';
+ searchForms[i].defaultValue = null;
}
onChangeConfig(searchForms[i]);
}
@@ -148,6 +150,7 @@
_cruds[i].componentProps.api = GetEnum;
_cruds[i].componentProps.params.name = `${objParams.value.ID}+${_cruds[i].field}s`;
_cruds[i].componentProps.labelField = unref(getLocale) == 'zh_CN' ? 'Desc' : 'Name';
+ _cruds[i].defaultValue = null;
}
if (
!isNullOrEmpty(_cruds[i].componentProps) &&
@@ -156,6 +159,7 @@
) {
_cruds[i].componentProps.api = getEntity;
_cruds[i].componentProps.resultField = 'Data.Items';
+ _cruds[i].defaultValue = null;
}
if (_cruds[i].component == 'Upload') {
_cruds[i].componentProps = {};
diff --git a/src/views/tigerprojects/system/lowcode/normal/mainTable.vue b/src/views/tigerprojects/system/lowcode/normal/mainTable.vue
index 508c9b1..290bd88 100644
--- a/src/views/tigerprojects/system/lowcode/normal/mainTable.vue
+++ b/src/views/tigerprojects/system/lowcode/normal/mainTable.vue
@@ -353,6 +353,7 @@
CurOrg: useUserStore().getUserInfo.orgCode,
}
: '',
+ NeedInclude: true,
},
beforeFetch: (t) => SearchInfoFn(t, route.name, AuthOption.value['BY_ORG'] == 'Y'),
afterFetch: afterFetch,
--
Gitblit v1.9.3