From b6163e1bed94b4d02d1b6f01fdc2eb3f15ca22e3 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期一, 07 十月 2024 15:47:46 +0800
Subject: [PATCH] 保存默认工艺路线，工单批次优化
---
src/views/tigerprojects/system/lowcode/high/dtl.vue | 91 +++++++++++++++++++++++++++++----------------
1 files changed, 59 insertions(+), 32 deletions(-)
diff --git a/src/views/tigerprojects/system/lowcode/high/dtl.vue b/src/views/tigerprojects/system/lowcode/high/dtl.vue
index 27ee060..4dd220c 100644
--- a/src/views/tigerprojects/system/lowcode/high/dtl.vue
+++ b/src/views/tigerprojects/system/lowcode/high/dtl.vue
@@ -8,12 +8,12 @@
>
<BasicTable @register="useTables[item.name]">
<template #toolbar>
- <a-button type="primary" @click="handleCreate(index, item.name)" preIcon="add_02|svg">
+ <a-button type="primary" @click="handleCreate(index, item)" preIcon="add_02|svg">
鏂板
</a-button>
</template>
<template #action="{ record }">
- <TableAction :actions="createActions(record, index, item.name)" />
+ <TableAction :actions="createActions(record, index, item)" />
</template>
<template #[item]="{ field }" v-for="item in colSlots" :key="item">
<a-button
@@ -42,7 +42,7 @@
import { useForm } from '/@/components/Form/index';
import GeneralModal from '/@/views/components/GeneralModal.vue';
import normalDrawer from '../normalDrawer.vue';
- import { isNullOrEmpty, isNullOrUnDef } from '/@/utils/is';
+ import { isFunction, isNullOrEmpty, isNullOrUnDef } from '/@/utils/is';
import { useModal } from '/@/components/Modal';
import { useGo } from '/@/hooks/web/usePage';
import { DeleteEntity, getEntity } from '/@/api/tigerapi/system';
@@ -81,6 +81,7 @@
GetTitle(type: string | undefined) {},
GetUseTables(data: Ref<Recordable[]>, ...args) {},
GetUseDrawers() {},
+ CustInitData(data: Ref<any[]>, keyFieldValues: Ref<{}>, type: string) {},
} as EntityCustFunctionType,
]);
/* 鍔ㄦ�乮mport瀹炰綋鍚�.ts鐨勮嚜瀹氫箟鏂规硶 */
@@ -96,6 +97,7 @@
GetTitle,
GetUseTables,
GetUseDrawers,
+ CustInitData,
},
] = isNullOrUnDef(custImport.value['default'])
? EntityCustFunction.value
@@ -124,19 +126,34 @@
/**
* @description: 鎸傝浇缁勪欢瀹屾垚鏃�
* @return {*}
- */
+ */
onMounted(async () => {
for (const i in drawers.value) {
let sqlcmd = ' 1 =1 ';
if (!isNullOrEmpty(keyFieldValues.value[drawers.value[i].code])) {
sqlcmd += ` And ${drawers.value[i].code} = '${keyFieldValues.value[drawers.value[i].code]}'`;
}
+ /* type: all-琛ㄧず闇�瑕乧ode鐨勬墍鏈夌殑鍊� */
+ if (drawers.value[i]['type'] == 'all') {
+ if (data.value[drawers.value[i]['keyName']].length > 0) {
+ sqlcmd += ` And ${drawers.value[i]['code']} in (${data.value[drawers.value[i]['keyName']].map((value) => `'${value[drawers.value[i]['code']]}'`).join(',')})`;
+ } else {
+ sqlcmd = ' 1!=1 '; //鏂板鐨勬椂鍊欎笉鏌ユ暟鎹紝鏌ヤ篃娌℃湁
+ }
+ }
const list = await getEntity({
sqlcmd: sqlcmd,
- entityName: drawers.value[i].name,
+ entityName: isNullOrEmpty(drawers.value[i].dataType)
+ ? drawers.value[i].name
+ : drawers.value[i].dataType,
+ order: drawers.value[i].order,
});
if (!isNullOrEmpty(list.Data) && !isNullOrEmpty(list.Data.Items)) {
data.value[drawers.value[i].name] = list.Data.Items;
+ // 鑷畾涔夊垵濮嬪寲鏁版嵁
+ if (CustInitData && isFunction(CustInitData)) {
+ CustInitData(data, keyFieldValues, drawers.value[i].name);
+ }
useTables[drawers.value[i].name][1].setProps({
dataSource: [],
});
@@ -156,22 +173,25 @@
function createActions(record, index, item) {
const params = {
record,
- isUpdate: true,
- ifSave: true,
- entityName: props.entityName,
- formJson: GetCrudForm(item, data), //getFormSchema(`${entityName.value}_Crud`),
- cType,
+ isUpdate: true, //鏄洿鏂拌繕鏄柊澧�
+ ifSave: objParams.value['ifSave'], //鏄惁鐩存帴淇濆瓨琛ㄥ崟鍒版暟鎹簱锛宖alse鐨勮瘽瑕佹渶鍚庝竴璧锋彁浜�
+ entityName: props.entityName, //瀹炰綋鍚嶇О
+ formJson: [], //getFormSchema(`${entityName.value}_Crud`), //琛ㄥ崟缁撴瀯
+ cType, //绫诲瀷锛屼互姝ゆ潵纭畾鏄摢绉嶆柟娉曟垨鑰呯粨鏋勶紝鏍规嵁瀹為檯鎯呭喌鑰屽畾
dtlSlots,
useModalData,
useFormData,
- crudColSlots: props.crudColSlots,
+ crudColSlots: isNullOrUnDef(objParams.value['crudColSlots'])
+ ? []
+ : objParams.value['crudColSlots'][item['name']], //鎻掓Ы鍒楄〃
data,
- name: item, //drawers鍒楄〃閲岄潰鐨刵ame锛岃〃绀烘槸鍝竴涓疄浣擄紝涔熷氨鏄珮绾ц〃鍗曚腑琛ㄦ牸鐨勫悕瀛�
+ name: item.name, //drawers鍒楄〃閲岄潰鐨刵ame锛岃〃绀烘槸鍝竴涓疄浣擄紝涔熷氨鏄珮绾ц〃鍗曚腑琛ㄦ牸鐨勫悕瀛�
+ keyName: item.keyName, //瀹為檯鐢ㄦ潵纭畾鍔ㄦ�佸紩鍏ュ疄浣�.ts鐨勫疄浣撳悕绉�
};
const actionItem = [
{
icon: 'clarity:note-edit-line',
- onClick: editRecord.bind(null, useDrawers[index][item][1].openDrawer, params),
+ onClick: editRecord.bind(null, useDrawers[index][item.name][1].openDrawer, params),
},
{
icon: 'ant-design:delete-outlined',
@@ -179,7 +199,7 @@
popConfirm: {
title: '鏄惁纭鍒犻櫎?',
placement: 'left',
- confirm: deleteRecord.bind(null, useTables[item][1].reload, params),
+ confirm: deleteRecord.bind(null, useTables[item.name][1].reload, params),
},
},
];
@@ -189,13 +209,12 @@
return nActionItem(
params,
actionItem,
- useDrawers[index][item][1].openDrawer,
- useTables[item][1].reload,
+ useDrawers[index][item.name][1].openDrawer,
+ useTables,
null,
useForm,
useModal,
go,
- useTables[item][1].setProps,
);
}
@@ -244,26 +263,34 @@
* @param {*} index
* @param {*} item
* @return {*}
- */
+ */
function handleCreate(index, item) {
validate().then((res) => {
const Keys = Object.getOwnPropertyNames(useFormData.value);
- let i;
- for (i = 0; i < Keys.length; i++) {
- keyFieldValues.value[objParams.value['pCode']] = objParams.value['IsID']
- ? res[Keys[i]]['ID']
- : res[Keys[i]][objParams.value['pCode']] == '0' ||
- isNullOrUnDef(res[Keys[i]][objParams.value['pCode']])
- ? res[Keys[i]][objParams.value['mCode']]
- : res[Keys[i]][objParams.value['pCode']];
+ for (const i in Keys) {
+ const _Keys = Object.getOwnPropertyNames(res[Keys[i]]);
+ for (const j in _Keys) {
+ if (_Keys[j] == item['code']) {
+ keyFieldValues.value[item['code']] = objParams.value['IsID']
+ ? res[Keys[i]]['ID']
+ : res[Keys[i]][item['code']];
+ } else if (_Keys[j] != 'ID') {
+ keyFieldValues.value[_Keys[j]] = res[Keys[i]][_Keys[j]];
+ }
+ }
}
- useDrawers[index][item][1].openDrawer(true, {
+ useDrawers[index][item['name']][1].openDrawer(true, {
isUpdate: false,
- ifSave: true,
- entityName: props.entityName,
- formJson: GetCrudForm(item, data), //鑾峰彇澧炲垹鏀硅〃鍗曞瓧娈�
- crudColSlots: props.crudColSlots,
+ ifSave: objParams.value['ifSave'],
+ entityName: item['name'], //props.entityName,
+ // formJson: GetCrudForm(item, data), //鑾峰彇澧炲垹鏀硅〃鍗曞瓧娈�
+ crudColSlots: isNullOrUnDef(objParams.value['crudColSlots'])
+ ? []
+ : objParams.value['crudColSlots'][item['name']],
keyFieldValues: keyFieldValues.value,
+ data,
+ name: item['name'], //drawers鍒楄〃閲岄潰鐨刵ame锛岃〃绀烘槸鍝竴涓疄浣擄紝涔熷氨鏄珮绾ц〃鍗曚腑琛ㄦ牸鐨勫悕瀛�
+ keyName: item['keyName'],
});
});
}
@@ -274,7 +301,7 @@
* @param {*} u
* @param {*} item 椤甸潰涓婂惊鐜娊灞夊垪琛ㄤ紶鍏ョ殑瀹炰綋鍚嶅瓧锛屼綔涓哄悇琛ㄦ牸鐩稿叧鏂规硶鐨刱ey锛屼粠鑰岃皟鐢ㄥ悇琛ㄦ牸鐩稿叧鐨勬柟娉曪紝濡傦細useTables[item][1].setProps
* @return {*}
- */
+ */
function handleSuccess(d, u, item) {
if (!isNullOrUnDef(custImport.value)) {
/* 鑷畾涔夌紪杈戞柟娉曪紝鏍规嵁瀹炰綋鍚嶅幓璋冪敤 */
--
Gitblit v1.9.3