From 547c91649da47f4dd8c6706e632797dbd9d79d87 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期六, 07 十二月 2024 16:26:49 +0800
Subject: [PATCH] 工艺路线工序节点保存更新
---
src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts | 97 +++++----
src/views/tigerprojects/system/lowcode/data.ts | 2
src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts | 78 ++++---
src/views/tigerprojects/system/lowcode/composition/LeftTable.vue | 378 ++++++++++++++++++++-----------------
src/store/modules/websocket.ts | 14 +
src/views/tigerprojects/system/lowcode/composition/printTemplate1.vue | 4
6 files changed, 315 insertions(+), 258 deletions(-)
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 1302983..8cdfdc1 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -76,11 +76,25 @@
this.resetHeart();
console.log('蹇冭烦');
break;
+ case 'Content':
+ console.log('WebSocket娑堟伅: ', d)
+ // that.SetMessage(message)
+ break
case 'PrintJS':
const json = JSON.parse(d.Message)
this.SetPrintTag(json.Tag);
this.SetPrintJson(json.Message);
break;
+ case 'printer':
+ // let prints = []
+ // message.Message.map((item) => {
+ // prints.push({
+ // value: item,
+ // name: item
+ // })
+ // })
+ // useOperStore().setPrinters(prints)
+ break
default:
console.log('WebSocket娑堟伅: ', d.Message);
this.SetMessage(d.Message);
diff --git a/src/views/tigerprojects/system/lowcode/composition/LeftTable.vue b/src/views/tigerprojects/system/lowcode/composition/LeftTable.vue
index 9171c1d..cffa149 100644
--- a/src/views/tigerprojects/system/lowcode/composition/LeftTable.vue
+++ b/src/views/tigerprojects/system/lowcode/composition/LeftTable.vue
@@ -20,7 +20,7 @@
<div class="w-1/4 xl:w-1/5 py-4 pr-4 h-full">
<div class="p-5 h-full" style="background-color: white">
<span class="mb-5 p-5" style="color: #0780b9; font-size: 16px">璇锋壂鐮佹墦鍗板叆搴撳崟</span>
- <!-- <a-button type="primary" @click="ToPrint"> 鎵撳嵃 </a-button> -->
+ <a-button type="primary" @click="ToPrint"> 鎵撳嵃 </a-button>
<QrCode
:value="qrCodeUrl"
:height="198"
@@ -28,8 +28,8 @@
ref="qrDiyRef"
:logo="LogoImg"
/>
- <!-- <span class="mb-5 p-5" style="color: #0780b9">{{ qrCodeUrl }}</span> -->
</div>
+ <span class="mb-5 p-5" style="color: #0780b9">{{ tag }}</span>
</div>
</Suspense>
<Suspense>
@@ -104,6 +104,7 @@
const selectVals = ref({});
const isMounted = ref(false);
const qrCodeUrl = ref(`PrintJS_${buildUUID()}`);
+ const tag = ref('');
const _columns = ref<any[]>([]);
const _searchFormSchema = ref<any[]>([]);
const _crudFormSchema = ref<any[]>([]);
@@ -128,174 +129,210 @@
onMounted(async () => {
isMounted.value = false;
- // printData.value = [
- // {
- // id: '111',
- // Items: [
- // {
- // ID: 111,
- // ORDER_NO: 'YDSO241101002',
- // WORK_ORDER: 'YDMOB241104737',
- // ITEM_CODE: '20100705.0102.00',
- // ITEM_NAME:
- // 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� 缃戠嚎2m 閰嶅悎YD-DEMS-BD2RHT浣跨敤,閰嶅浜掓劅鍣ㄥ甫灏忔彃澶� 闆呰揪鐧借壊鍟ょ洅V3/B鐗圚C',
- // PLAN_QTY: 100,
- // SCAN_QTY: 50,
- // },
- // {
- // ID: 112,
- // ORDER_NO: 'YDSO241101002',
- // WORK_ORDER: 'YDMOB241104737',
- // ITEM_CODE: '20100705.0102.00',
- // ITEM_NAME:
- // 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� 缃戠嚎2m 閰嶅悎YD-DEMS-BD2RHT浣跨敤,閰嶅浜掓劅鍣ㄥ甫灏忔彃澶� 闆呰揪鐧借壊鍟ょ洅V3/B鐗圚C',
- // PLAN_QTY: 100,
- // SCAN_QTY: 50,
- // },
- // {
- // ID: 113,
- // ORDER_NO: 'YDSO241101002',
- // WORK_ORDER: 'YDMOB241104737',
- // ITEM_CODE: '20100705.0102.00',
- // ITEM_NAME:
- // 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� 缃戠嚎2m 閰嶅悎YD-DEMS-BD2RHT浣跨敤,閰嶅浜掓劅鍣ㄥ甫灏忔彃澶� 闆呰揪鐧借壊鍟ょ洅V3/B鐗圚C',
- // PLAN_QTY: 100,
- // SCAN_QTY: 50,
- // },
- // {
- // ID: 114,
- // ORDER_NO: 'YDSO241101002',
- // WORK_ORDER: 'YDMOB241104737',
- // ITEM_CODE: '20100705.0102.00',
- // ITEM_NAME:
- // 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� 缃戠嚎2m 閰嶅悎YD-DEMS-BD2RHT浣跨敤,閰嶅浜掓劅鍣ㄥ甫灏忔彃澶� 闆呰揪鐧借壊鍟ょ洅V3/B鐗圚C',
- // PLAN_QTY: 100,
- // SCAN_QTY: 50,
- // },
- // {
- // ID: 115,
- // ORDER_NO: 'YDSO241101002',
- // WORK_ORDER: 'YDMOB241104737',
- // ITEM_CODE: '20100705.0102.00',
- // ITEM_NAME:
- // 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� 缃戠嚎2m 閰嶅悎YD-DEMS-BD2RHT浣跨敤,閰嶅浜掓劅鍣ㄥ甫灏忔彃澶� 闆呰揪鐧借壊鍟ょ洅V3/B鐗圚C',
- // PLAN_QTY: 100,
- // SCAN_QTY: 50,
- // },
- // {
- // ID: 116,
- // ORDER_NO: 'YDSO241101002',
- // WORK_ORDER: 'YDMOB241104737',
- // ITEM_CODE: '20100705.0102.00',
- // ITEM_NAME:
- // 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� 缃戠嚎2m 閰嶅悎YD-DEMS-BD2RHT浣跨敤,閰嶅浜掓劅鍣ㄥ甫灏忔彃澶� 闆呰揪鐧借壊鍟ょ洅V3/B鐗圚C 閰嶅悎YD-DEMS-BD2RHT浣跨敤,閰嶅浜掓劅鍣ㄥ甫灏忔彃澶� 闆呰揪鐧借壊鍟ょ洅V3/B鐗圚C',
- // PLAN_QTY: 100,
- // SCAN_QTY: 50,
- // },
- // {
- // ID: 116,
- // ORDER_NO: 'YDSO241101002',
- // WORK_ORDER: 'YDMOB241104737',
- // ITEM_CODE: '20100705.0102.00',
- // ITEM_NAME:
- // 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� 缃戠嚎2m 閰嶅悎YD-DEMS-BD2RHT浣跨敤,閰嶅浜掓劅鍣ㄥ甫灏忔彃澶� 闆呰揪鐧借壊鍟ょ洅V3/B鐗圚C',
- // PLAN_QTY: 100,
- // SCAN_QTY: 50,
- // },
- // {
- // ID: 116,
- // ORDER_NO: 'YDSO241101002',
- // WORK_ORDER: 'YDMOB241104737',
- // ITEM_CODE: '20100705.0102.00',
- // ITEM_NAME:
- // 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� 缃戠嚎2m 閰嶅悎YD-DEMS-BD2RHT浣跨敤,閰嶅浜掓劅鍣ㄥ甫灏忔彃澶� 闆呰揪鐧借壊鍟ょ洅V3/B鐗圚C',
- // PLAN_QTY: 100,
- // SCAN_QTY: 50,
- // },
- // // {
- // // ID: 116,
- // // ORDER_NO: 'YDSO241101002',
- // // WORK_ORDER: 'YDMOB241104737',
- // // ITEM_CODE: '20100705.0102.00',
- // // ITEM_NAME:
- // // 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� 缃戠嚎2m 閰嶅悎YD-DEMS-BD2RHT浣跨敤,閰嶅浜掓劅鍣ㄥ甫灏忔彃澶� 闆呰揪鐧借壊鍟ょ洅V3/B鐗圚C',
- // // PLAN_QTY: 100,
- // // SCAN_QTY: 50,
- // // },
- // ],
- // },
- // {
- // id: '112',
- // Items: [
- // {
- // ID: 311,
- // ORDER_NO: 'YDSO241101002',
- // WORK_ORDER: 'YDMOB241104737',
- // ITEM_CODE: '20100705.0102.00',
- // ITEM_NAME:
- // 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� 缃戠嚎2m 閰嶅悎YD-DEMS-BD2RHT浣跨敤,閰嶅浜掓劅鍣ㄥ甫灏忔彃澶� 闆呰揪鐧借壊鍟ょ洅V3/B鐗圚C',
- // PLAN_QTY: 100,
- // SCAN_QTY: 50,
- // },
- // {
- // ID: 312,
- // ORDER_NO: 'YDSO241101002',
- // WORK_ORDER: 'YDMOB241104737',
- // ITEM_CODE: '20100705.0102.00',
- // ITEM_NAME:
- // 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� 缃戠嚎2m 閰嶅悎YD-DEMS-BD2RHT浣跨敤,閰嶅浜掓劅鍣ㄥ甫灏忔彃澶� 闆呰揪鐧借壊鍟ょ洅V3/B鐗圚C',
- // PLAN_QTY: 100,
- // SCAN_QTY: 50,
- // },
- // {
- // ID: 313,
- // ORDER_NO: 'YDSO241101002',
- // WORK_ORDER: 'YDMOB241104737',
- // ITEM_CODE: '20100705.0102.00',
- // ITEM_NAME:
- // 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� 缃戠嚎2m 閰嶅悎YD-DEMS-BD2RHT浣跨敤,閰嶅浜掓劅鍣ㄥ甫灏忔彃澶� 闆呰揪鐧借壊鍟ょ洅V3/B鐗圚C',
- // PLAN_QTY: 100,
- // SCAN_QTY: 50,
- // },
- // ],
- // },
- // {
- // id: '113',
- // Items: [
- // {
- // ID: 211,
- // ORDER_NO: 'YDSO241101002',
- // WORK_ORDER: 'YDMOB241104737',
- // ITEM_CODE: '20100705.0102.00',
- // ITEM_NAME:
- // 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� 缃戠嚎2m 閰嶅悎YD-DEMS-BD2RHT浣跨敤,閰嶅浜掓劅鍣ㄥ甫灏忔彃澶� 闆呰揪鐧借壊鍟ょ洅V3/B鐗圚C',
- // PLAN_QTY: 100,
- // SCAN_QTY: 50,
- // },
- // {
- // ID: 212,
- // ORDER_NO: 'YDSO241101002',
- // WORK_ORDER: 'YDMOB241104737',
- // ITEM_CODE: '20100705.0102.00',
- // ITEM_NAME:
- // 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� 缃戠嚎2m 閰嶅悎YD-DEMS-BD2RHT浣跨敤,閰嶅浜掓劅鍣ㄥ甫灏忔彃澶� 闆呰揪鐧借壊鍟ょ洅V3/B鐗圚C',
- // PLAN_QTY: 100,
- // SCAN_QTY: 50,
- // },
- // {
- // ID: 213,
- // ORDER_NO: 'YDSO241101002',
- // WORK_ORDER: 'YDMOB241104737',
- // ITEM_CODE: '20100705.0102.00',
- // ITEM_NAME:
- // 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� 缃戠嚎2m 閰嶅悎YD-DEMS-BD2RHT浣跨敤,閰嶅浜掓劅鍣ㄥ甫灏忔彃澶� 闆呰揪鐧借壊鍟ょ洅V3/B鐗圚C',
- // PLAN_QTY: 100,
- // SCAN_QTY: 50,
- // },
- // ],
- // },
- // ];
-
+ printData.value = [
+ {
+ id: '111',
+ Items: [
+ {
+ ID: 111,
+ SALES_ORDER: 'YDSO240400482',
+ ORDER_NO: 'YDRKD241000012',
+ WORK_ORDER: 'YDMOB241104737',
+ ITEM_CODE: '20100705.0102.00',
+ ITEM_NAME:
+ 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� ',
+ PLAN_QTY: 100,
+ SCAN_QTY: 50,
+ STATUS: 'Y'
+ },
+ {
+ ID: 112,
+ SALES_ORDER: 'YDSO240400483',
+ ORDER_NO: 'YDRKD241000013',
+ WORK_ORDER: 'YDMOB241104737',
+ ITEM_CODE: '20100705.0102.00',
+ ITEM_NAME:
+ 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� ',
+ PLAN_QTY: 100,
+ SCAN_QTY: 50,
+ STATUS: 'Y'
+ },
+ {
+ ID: 113,
+ SALES_ORDER: 'YDSO240400484',
+ ORDER_NO: 'YDRKD241000014',
+ WORK_ORDER: 'YDMOB241104737',
+ ITEM_CODE: '20100705.0102.00',
+ ITEM_NAME:
+ 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� ',
+ PLAN_QTY: 100,
+ SCAN_QTY: 50,
+ STATUS: 'Y'
+ },
+ {
+ ID: 114,
+ ORDER_NO: 'YDRKD241000015',
+ SALES_ORDER: 'YDSO240400485',
+ WORK_ORDER: 'YDMOB241104737',
+ ITEM_CODE: '20100705.0102.00',
+ ITEM_NAME:
+ 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� ',
+ PLAN_QTY: 100,
+ SCAN_QTY: 50,
+ STATUS: 'Y'
+ },
+ {
+ ID: 115,
+ ORDER_NO: 'YDRKD241000016',
+ SALES_ORDER: 'YDSO240400486',
+ WORK_ORDER: 'YDMOB241104737',
+ ITEM_CODE: '20100705.0102.00',
+ ITEM_NAME:
+ 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� ',
+ PLAN_QTY: 100,
+ SCAN_QTY: 50,
+ STATUS: 'Y'
+ },
+ {
+ ID: 116,
+ ORDER_NO: 'YDRKD241000017',
+ SALES_ORDER: 'YDSO240400487',
+ WORK_ORDER: 'YDMOB241104737',
+ ITEM_CODE: '20100705.0102.00',
+ ITEM_NAME:
+ 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� ',
+ PLAN_QTY: 100,
+ SCAN_QTY: 50,
+ STATUS: 'Y'
+ },
+ {
+ ID: 116,
+ ORDER_NO: 'YDRKD241000018',
+ SALES_ORDER: 'YDSO240400488',
+ WORK_ORDER: 'YDMOB241104737',
+ ITEM_CODE: '20100705.0102.00',
+ ITEM_NAME:
+ 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� ',
+ PLAN_QTY: 100,
+ SCAN_QTY: 50,
+ STATUS: 'Y'
+ },
+ {
+ ID: 116,
+ ORDER_NO: 'YDRKD241000019',
+ SALES_ORDER: 'YDSO240400489',
+ WORK_ORDER: 'YDMOB241104737',
+ ITEM_CODE: '20100705.0102.00',
+ ITEM_NAME:
+ 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� ',
+ PLAN_QTY: 100,
+ SCAN_QTY: 50,
+ STATUS: 'Y'
+ },
+ {
+ ID: 116,
+ ORDER_NO: 'YDRKD241000020',
+ SALES_ORDER: 'YDSO240400490',
+ WORK_ORDER: 'YDMOB241104737',
+ ITEM_CODE: '20100705.0102.00',
+ ITEM_NAME:
+ 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� ',
+ PLAN_QTY: 100,
+ SCAN_QTY: 50,
+ STATUS: 'Y'
+ },
+ {
+ ID: 116,
+ ORDER_NO: 'YDRKD241000021',
+ SALES_ORDER: 'YDSO240400491',
+ WORK_ORDER: 'YDMOB241104737',
+ ITEM_CODE: '20100705.0102.00',
+ ITEM_NAME:
+ 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� ',
+ PLAN_QTY: 100,
+ SCAN_QTY: 50,
+ STATUS: 'Y'
+ },
+ ],
+ },
+ // {
+ // id: '112',
+ // Items: [
+ // {
+ // ID: 311,
+ // ORDER_NO: 'YDSO241101002',
+ // WORK_ORDER: 'YDMOB241104737',
+ // ITEM_CODE: '20100705.0102.00',
+ // ITEM_NAME:
+ // 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� ',
+ // PLAN_QTY: 100,
+ // SCAN_QTY: 50,
+ // STATUS: 'Y'
+ // },
+ // {
+ // ID: 312,
+ // ORDER_NO: 'YDSO241101002',
+ // WORK_ORDER: 'YDMOB241104737',
+ // ITEM_CODE: '20100705.0102.00',
+ // ITEM_NAME:
+ // 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� ',
+ // PLAN_QTY: 100,
+ // SCAN_QTY: 50,
+ // STATUS: 'Y'
+ // },
+ // {
+ // ID: 313,
+ // ORDER_NO: 'YDSO241101002',
+ // WORK_ORDER: 'YDMOB241104737',
+ // ITEM_CODE: '20100705.0102.00',
+ // ITEM_NAME:
+ // 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� ',
+ // PLAN_QTY: 100,
+ // SCAN_QTY: 50,
+ // STATUS: 'Y'
+ // },
+ // ],
+ // },
+ // {
+ // id: '113',
+ // Items: [
+ // {
+ // ID: 211,
+ // ORDER_NO: 'YDSO241101002',
+ // WORK_ORDER: 'YDMOB241104737',
+ // ITEM_CODE: '20100705.0102.00',
+ // ITEM_NAME:
+ // 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� ',
+ // PLAN_QTY: 100,
+ // SCAN_QTY: 50,
+ // STATUS: 'Y'
+ // },
+ // {
+ // ID: 212,
+ // ORDER_NO: 'YDSO241101002',
+ // WORK_ORDER: 'YDMOB241104737',
+ // ITEM_CODE: '20100705.0102.00',
+ // ITEM_NAME:
+ // 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� ',
+ // PLAN_QTY: 100,
+ // SCAN_QTY: 50,
+ // STATUS: 'Y'
+ // },
+ // {
+ // ID: 213,
+ // ORDER_NO: 'YDSO241101002',
+ // WORK_ORDER: 'YDMOB241104737',
+ // ITEM_CODE: '20100705.0102.00',
+ // ITEM_NAME:
+ // 'YM-DEMS-BD11Q48 AC0-300V AC20mA 鐢佃兘1绾� ',
+ // PLAN_QTY: 100,
+ // SCAN_QTY: 50,
+ // STATUS: 'Y'
+ // },
+ // ],
+ // },
+ ];
+
/* 鍔ㄦ�乮mport瀹炰綋鍚�.ts鐨勮嚜瀹氫箟鏂规硶 */
try {
custImport.value = await import(`../entityts/${entityName.value}.ts`);
@@ -405,6 +442,7 @@
}
const unsubscribe = usewebSocket.$subscribe((mutation, state) => {
+ tag.value = `鏀跺埌鎵撳嵃璇锋眰锛�${state.printTag}`;
if (state.printTag == qrCodeUrl.value) {
// printJS(state.printJson);
printData.value = state.printJson as unknown as any[];
diff --git a/src/views/tigerprojects/system/lowcode/composition/printTemplate1.vue b/src/views/tigerprojects/system/lowcode/composition/printTemplate1.vue
index 466c78b..ab37505 100644
--- a/src/views/tigerprojects/system/lowcode/composition/printTemplate1.vue
+++ b/src/views/tigerprojects/system/lowcode/composition/printTemplate1.vue
@@ -40,8 +40,8 @@
<td class="instore_td">
<QrCode
:value="item.ORDER_NO"
- :width="80"
- :height="80"
+ :width="70"
+ :height="70"
:options="{ margin: 1 }"
ref="qrDiyRef"
/>
diff --git a/src/views/tigerprojects/system/lowcode/data.ts b/src/views/tigerprojects/system/lowcode/data.ts
index dca6657..217aaf5 100644
--- a/src/views/tigerprojects/system/lowcode/data.ts
+++ b/src/views/tigerprojects/system/lowcode/data.ts
@@ -428,7 +428,7 @@
const params = cloneDeep(curSearchInfo[0].searchInfo);
const Keys = Object.getOwnPropertyNames(params);
for (const k in Keys) {
- if (!isNullOrEmpty(params[Keys[k]].length) && isArray(params[Keys[k]])) {
+ if (!isNullOrEmpty(params[Keys[k]]?.length) && isArray(params[Keys[k]])) {
if (isTimeViaRegExp8601(params[Keys[k]][0])) {
params[Keys[k]][0] = dateUtil(params[Keys[k]][0])
params[Keys[k]][1] = dateUtil(params[Keys[k]][1])
diff --git a/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts b/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts
index 0a11ed7..0b61b80 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts
@@ -250,41 +250,37 @@
}
if (params['selectedNodes'][0].type == 'Node') {
resetFieldsNode();
- const values = {
- ID: res.Data.Items[0].ID,
- OPER_CODE: res.Data.Items[0].OPER_CODE,
- ROT_ID: res.Data.Items[0].ROT_ID,
- NODE_ID: res.Data.Items[0].NODE_ID,
- NODE_NAME: res.Data.Items[0].NODE_NAME,
- IS_ACTIVE: isNullOrEmpty(res.Data.Items[0].IS_ACTIVE)
- ? 'N'
- : res.Data.Items[0].IS_ACTIVE,
- IS_CALC_FPY: isNullOrEmpty(res.Data.Items[0].IS_CALC_FPY)
- ? 'N'
- : res.Data.Items[0].IS_CALC_FPY,
- CAN_SKIP: isNullOrEmpty(res.Data.Items[0].CAN_SKIP)
- ? 'N'
- : res.Data.Items[0].CAN_SKIP,
- IS_INPUT: isNullOrEmpty(res.Data.Items[0].IS_INPUT)
- ? 'N'
- : res.Data.Items[0].IS_INPUT,
- IS_OUTPUT: isNullOrEmpty(res.Data.Items[0].IS_OUTPUT)
- ? 'N'
- : res.Data.Items[0].IS_OUTPUT,
- ALLOW_DFT_IN: isNullOrEmpty(res.Data.Items[0].ALLOW_DFT_IN)
- ? 'N'
- : res.Data.Items[0].ALLOW_DFT_IN,
- IF_DFT_OFFLINE: isNullOrEmpty(res.Data.Items[0].IF_DFT_OFFLINE)
- ? 'N'
- : res.Data.Items[0].IF_DFT_OFFLINE,
- REMARK: res.Data.Items[0].REMARK,
- PROD_CODE: params['objParams'].value['CODE'],
- CUST_CODE: params['selectedNodes'][0].cust,
- };
- setFieldsValueNode(values);
+ if(isNullOrEmpty(res.Data.Items[0].IS_ACTIVE)){
+ res.Data.Items[0].IS_ACTIVE = 'N'
+ }
+ if(isNullOrEmpty(res.Data.Items[0].IS_CALC_FPY)){
+ res.Data.Items[0].IS_CALC_FPY = 'N'
+ }
+ if(isNullOrEmpty(res.Data.Items[0].CAN_SKIP)){
+ res.Data.Items[0].CAN_SKIP = 'N'
+ }
+ if(isNullOrEmpty(res.Data.Items[0].IS_INPUT)){
+ res.Data.Items[0].IS_INPUT = 'N'
+ }
+ if(isNullOrEmpty(res.Data.Items[0].IS_OUTPUT)){
+ res.Data.Items[0].IS_OUTPUT = 'N'
+ }
+ if(isNullOrEmpty(res.Data.Items[0].ALLOW_DFT_IN)){
+ res.Data.Items[0].ALLOW_DFT_IN = 'N'
+ }
+ if(isNullOrEmpty(res.Data.Items[0].IF_DFT_OFFLINE)){
+ res.Data.Items[0].IF_DFT_OFFLINE = 'N'
+ }
+ if(!isNullOrEmpty(params['objParams'].value['CODE'])){
+ res.Data.Items[0].PROD_CODE = params['objParams'].value['CODE']
+ }
+ if(!isNullOrEmpty(params['selectedNodes'][0].cust)){
+ res.Data.Items[0].CUST_CODE = params['selectedNodes'][0].cust
+ }
+ setFieldsValueNode(res.Data.Items[0]);
/* 榛樿淇濆瓨 */
- SaveEntity(values, true, 'MES_PROD_OPER');
+ SaveEntity(res.Data.Items[0], true, 'MES_PROD_OPER');
// result['Node'] = res.Data.Items;
result['name'] = 'Node';
@@ -527,13 +523,17 @@
* @return {*}
*/
GetUseTables: (data: Ref<{}>, ...args) => {
- // data.value['Table'] = [];
+ let sortData = isNullOrUnDef(data.value['BAS_PKG_DTL'])
+ ? data.value['BAS_PKG_DTL']
+ : data.value['BAS_PKG_DTL'].sort((a, b) => {
+ return a.PKG_LEVEL - b.PKG_LEVEL;
+ });
return {
BAS_PKG_DTL: useTable({
title: '鍒楄〃淇℃伅',
// api: getListByPage,
// searchInfo: { TABLE_NAME: 'V_BAS_PKG_DTL' },
- dataSource: data.value['BAS_PKG_DTL'],
+ dataSource: sortData,
columns: GetBaseColumns('BAS_PKG_DTL', args[0], data),
// maxHeight: 520,
// scroll: { y: window.screen.width == 1366? 400: 450 },
@@ -905,18 +905,21 @@
label: '鍒犻櫎',
handler: () => {
console.log('鐐瑰嚮浜嗗垹闄�', node);
- DeleteProdRoute({ rotId: node.id, rotCode: node.code, prodCode: args[1], custCode: node.cust }).then(
- (action) => {
- if (action.IsSuccessed) {
- emit('deletenode', node);
- } else {
- createErrorModal({
- title: t('sys.api.errorTip'),
- content: t(action.LocaleMsg),
- });
- }
- },
- );
+ DeleteProdRoute({
+ rotId: node.id,
+ rotCode: node.code,
+ prodCode: args[1],
+ custCode: node.cust,
+ }).then((action) => {
+ if (action.IsSuccessed) {
+ emit('deletenode', node);
+ } else {
+ createErrorModal({
+ title: t('sys.api.errorTip'),
+ content: t(action.LocaleMsg),
+ });
+ }
+ });
},
icon: 'bx:bxs-folder-open',
},
diff --git a/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts b/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts
index e62eaf2..5ae4fdb 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts
@@ -34,6 +34,7 @@
import { useProdRouteStore } from '/@/store/modules/prodRoute';
import { useWebSocketStore } from '/@/store/modules/websocket';
import { useGlobSetting } from '/@/hooks/setting';
+import { cloneDeep } from 'vue-json-pretty/types/utils';
const { t } = useI18n();
const { createErrorModal } = useMessage();
@@ -181,12 +182,17 @@
* @return {*}
*/
GetUseTables: (data: Ref<{}>, ...args) => {
+ let sortData = isNullOrUnDef(data.value['BAS_PKG_DTL'])
+ ? data.value['BAS_PKG_DTL']
+ : data.value['BAS_PKG_DTL'].sort((a, b) => {
+ return a.PKG_LEVEL - b.PKG_LEVEL;
+ });
return {
BAS_PKG_DTL: useTable({
title: '鍒楄〃淇℃伅',
// api: getListByPage,
// searchInfo: { TABLE_NAME: 'V_BAS_PKG_DTL' },
- dataSource: data.value['BAS_PKG_DTL'],
+ dataSource: sortData,
columns: GetBaseColumns('BAS_PKG_DTL', args[0], data),
// maxHeight: 520,
useSearchForm: false,
@@ -353,44 +359,40 @@
entityName: 'MES_WO_NODE',
order: '',
});
- const values = {
- ID: res.Data.Items[0].ID,
- OPER_CODE: res.Data.Items[0].OPER_CODE,
- ROT_ID: res.Data.Items[0].ROT_ID,
- NODE_ID: res.Data.Items[0].NODE_ID,
- NODE_NAME: res.Data.Items[0].NODE_NAME,
- IS_ACTIVE: isNullOrEmpty(res.Data.Items[0].IS_ACTIVE)
- ? 'N'
- : res.Data.Items[0].IS_ACTIVE,
- IS_CALC_FPY: isNullOrEmpty(res.Data.Items[0].IS_CALC_FPY)
- ? 'N'
- : res.Data.Items[0].IS_CALC_FPY,
- CAN_SKIP: isNullOrEmpty(res.Data.Items[0].CAN_SKIP)
- ? 'N'
- : res.Data.Items[0].CAN_SKIP,
- IS_INPUT:
- wonode.Data.Items[0].IS_FIRST_NODE == 'Y'
- ? 'Y'
- : isNullOrEmpty(res.Data.Items[0].IS_INPUT)
- ? 'N'
- : res.Data.Items[0].IS_INPUT,
- IS_OUTPUT: isNullOrEmpty(res.Data.Items[0].IS_OUTPUT)
- ? 'N'
- : res.Data.Items[0].IS_OUTPUT,
- ALLOW_DFT_IN: isNullOrEmpty(res.Data.Items[0].ALLOW_DFT_IN)
- ? 'N'
- : res.Data.Items[0].ALLOW_DFT_IN,
- IF_DFT_OFFLINE: isNullOrEmpty(res.Data.Items[0].IF_DFT_OFFLINE)
- ? 'N'
- : res.Data.Items[0].IF_DFT_OFFLINE,
- REMARK: res.Data.Items[0].REMARK,
- WORK_ORDER: params['objParams'].value['CODE'],
- CUST_CODE: params['selectedNodes'][0].cust,
- PROD_CODE: params['selectedNodes'][0].prod,
- };
- setFieldsValueNode(values);
+
+ if(isNullOrEmpty(res.Data.Items[0].IS_ACTIVE)){
+ res.Data.Items[0].IS_ACTIVE = 'N'
+ }
+ if(isNullOrEmpty(res.Data.Items[0].IS_CALC_FPY)){
+ res.Data.Items[0].IS_CALC_FPY = 'N'
+ }
+ if(isNullOrEmpty(res.Data.Items[0].CAN_SKIP)){
+ res.Data.Items[0].CAN_SKIP = 'N'
+ }
+ if(isNullOrEmpty(res.Data.Items[0].IS_INPUT)){
+ res.Data.Items[0].IS_INPUT = 'N'
+ }
+ if(isNullOrEmpty(res.Data.Items[0].IS_OUTPUT)){
+ res.Data.Items[0].IS_OUTPUT = 'N'
+ }
+ if(isNullOrEmpty(res.Data.Items[0].ALLOW_DFT_IN)){
+ res.Data.Items[0].ALLOW_DFT_IN = 'N'
+ }
+ if(isNullOrEmpty(res.Data.Items[0].IF_DFT_OFFLINE)){
+ res.Data.Items[0].IF_DFT_OFFLINE = 'N'
+ }
+ if(!isNullOrEmpty(params['objParams'].value['CODE'])){
+ res.Data.Items[0].WORK_ORDER = params['objParams'].value['CODE']
+ }
+ if(!isNullOrEmpty(params['selectedNodes'][0].prod)){
+ res.Data.Items[0].PROD_CODE = params['selectedNodes'][0].prod
+ }
+ if(!isNullOrEmpty(params['selectedNodes'][0].cust)){
+ res.Data.Items[0].CUST_CODE = params['selectedNodes'][0].cust
+ }
+ setFieldsValueNode(res.Data.Items[0]);
/* 榛樿淇濆瓨 */
- SaveEntity(values, true, 'MES_WO_OPER');
+ SaveEntity(res.Data.Items[0], true, 'MES_WO_OPER');
result['name'] = 'Node';
result['isShow'] = {
--
Gitblit v1.9.3