From c24509087b1193c18ee4c87487b0fc4bf8ee0918 Mon Sep 17 00:00:00 2001 From: Ben Lin <maobin001@msn.com> Date: 星期一, 22 七月 2024 18:40:26 +0800 Subject: [PATCH] 工单更新 --- src/views/tigerprojects/system/lowcode/high/index.vue | 490 +++++++++++++++-------------------------------------- 1 files changed, 141 insertions(+), 349 deletions(-) diff --git a/src/views/tigerprojects/system/lowcode/high/index.vue b/src/views/tigerprojects/system/lowcode/high/index.vue index d804b58..c8e89c7 100644 --- a/src/views/tigerprojects/system/lowcode/high/index.vue +++ b/src/views/tigerprojects/system/lowcode/high/index.vue @@ -1,4 +1,12 @@ <!-- + * @Description: 浣庝唬鐮侀珮绾у憟鐜伴〉闈� + * @Author: Ben Lin + * @version: + * @Date: 2024-06-18 15:09:48 + * @LastEditors: Ben Lin + * @LastEditTime: 2024-07-22 16:02:35 +--> +<!-- * _oo0oo_ * o8888888o * 88" . "88 @@ -33,14 +41,6 @@ * 鍒汉绗戞垜蹇掔柉鐧紝鎴戠瑧鑷繁鍛藉お璐憋紱 * 涓嶈婊¤婕備寒濡癸紝鍝釜褰掑緱绋嬪簭鍛橈紵 --> -<!-- - * @Description: 浣庝唬鐮侀珮绾у憟鐜伴〉闈� - * @Author: Ben Lin - * @version: - * @Date: 2024-05-30 13:28:20 - * @LastEditors: Ben Lin - * @LastEditTime: 2024-06-14 09:19:23 ---> <template> <PageWrapper class="high-form" @@ -48,40 +48,14 @@ :content="titleInfo['pageContent']" @back="goBack" > - <a-card - :title="item.title" - :bordered="false" - v-for="(item, index) in baseCards" - :key="item.name" - > - <BasicForm @register="useFormData[item.name][0]" /> - </a-card> - <a-card :title="titleInfo['baseTableTitle']" :bordered="false" class="!mt-5"> - <div> - <BasicTable @register="registerTable" v-if="isMounted"> - <template #toolbar> - <a-button type="primary" @click="handleCreate" preIcon="add_02|svg"> 鏂板 </a-button> - </template> - <template #action="{ record }"> - <TableAction :actions="createActions(record)" /> - </template> - <template #[item]="{ field }" v-for="item in colSlots" :key="item"> - <!-- <template #form-BAS_REASON3aadd="{ field }"> --> - <a-button - v-if="field" - class="mt-1 ml-1" - size="small" - @click="handleSelectItem(item)" - preIcon="search|svg" - /> - <GeneralModal - @register="registerItemAdd" - @success="(d, u) => handleItemSuccess(d, u, item)" - /> - </template> - </BasicTable> - </div> - </a-card> + <Suspense> + <baseForm :entityName="entityName" /> + </Suspense> + <!-- <a-card :title="titleInfo['baseTableTitle']" :bordered="false" class="!mt-5"> --> + <Suspense> + <dtl :entityName="entityName" @search="dtlFormSearch" /> + </Suspense> + <!-- </a-card> --> <a-card :title="item.title" :bordered="false" @@ -96,64 +70,50 @@ <a-button class="mr-4" type="info" @click="cancel"> 鍙栨秷 </a-button> <a-button type="primary" @click="submitAll"> 鎻愪氦 </a-button> </template> - <normalDrawer @register="registerDrawer" @success="handleSuccess" /> - <CustModal - @register="registerCust" - @success="custSuccess" - :type="cType" - :detailSlots="dtlSlots" - > - <!-- 鐢ㄦ彃妲借嚜瀹氫箟澶氳〃鍗� --> - <template #[item.name] v-for="item in dtlSlots" :key="item.name"> - <BasicForm @register="useFormData[item.name][0]" v-if="useFormData[item.name]"> - <!-- 鐢ㄦ彃妲借嚜瀹氫箟寮瑰嚭閫夋嫨妗� --> - <template #[name]="{ field }" v-for="name in item.slots" :key="name"> - <a-button - class="mt-1 ml-1" - size="small" - @click="handleCustClick(field)" - :preIcon="item.preIcons[name]" - /> - <GeneralModal - @register="useModalData[name][0]" - @success="(d, u) => handleEntSuccess(d, u, item.name)" - /> - </template> - </BasicForm> - <!-- 鑷畾涔夊唴瀹� --> - </template> - </CustModal> + <Suspense> + <CustModal + @register="registerCust" + @success="custSuccess" + :type="cType" + :detailSlots="dtlSlots" + :entityName="entityName" + > + <!-- 鐢ㄦ彃妲借嚜瀹氫箟澶氳〃鍗� --> + <template #[item.name] v-for="item in dtlSlots" :key="item.name"> + <BasicForm @register="useFormData[item.name][0]" v-if="useFormData[item.name]"> + <!-- 鐢ㄦ彃妲借嚜瀹氫箟寮瑰嚭閫夋嫨妗� --> + <template #[name]="{ field }" v-for="name in item.slots" :key="name"> + <a-button + class="mt-1 ml-1" + size="small" + @click="handleCustClick(field)" + :preIcon="item.preIcons[name]" + /> + <GeneralModal + @register="useModalData[name][0]" + @success="(d, u) => handleEntSuccess(d, u, item.name)" + /> + </template> + </BasicForm> + <!-- 鑷畾涔夊唴瀹� --> + </template> + </CustModal> + </Suspense> </PageWrapper> </template> <script lang="ts" setup> - import { h, onMounted, ref, unref } from 'vue'; - import { Tag, Tooltip, Card } from 'ant-design-vue'; - import { BasicTable, useTable, TableAction } from '/@/components/Table'; - import { useDrawer } from '/@/components/Drawer'; + import { Ref, h, nextTick, onMounted, provide, reactive, ref, unref } from 'vue'; + import { Card } from 'ant-design-vue'; import { PageWrapper } from '/@/components/Page'; - import normalDrawer from '../normalDrawer.vue'; + import dtl from './dtl.vue'; + import baseForm from './baseForm.vue'; import GeneralModal from '/@/views/components/GeneralModal.vue'; - import { - AddListEntity, - DeleteEntity, - DeleteWhere, - SaveEntity, - getEntity, - } from '/@/api/tigerapi/system'; + import { AddAfterDelete, SaveEntity } from '/@/api/tigerapi/system'; import { useGlobSetting } from '/@/hooks/setting'; import { useRoute, useRouter } from 'vue-router'; import CustModal from '/@/views/components/CustModal.vue'; import { BasicForm, useForm } from '/@/components/Form/index'; - import { - OpenSelectItem, - custOnChange, - getFormSchema, - OpenCustModal, - GetBasicColumnAndInit, - getHomeUrl, - getTitle, - getOthersValues, - } from '../data'; + import { custOnChange, OpenCustModal } from '../data'; import { useModal } from '/@/components/Modal'; import { useLocale } from '/@/locales/useLocale'; import { useGo } from '/@/hooks/web/usePage'; @@ -161,6 +121,10 @@ import { useTabs } from '/@/hooks/web/useTabs'; import { buildUUID } from '/@/utils/uuid'; import { isNullOrEmpty, isNullOrUnDef } from '/@/utils/is'; + import { useI18n } from '/@/hooks/web/useI18n'; + import { isFunction } from 'xe-utils'; + + const { t } = useI18n(); const ACard = Card; const { getLocale } = useLocale(); @@ -174,230 +138,59 @@ return tabStore.getTabList.find((item) => item.fullPath === route.fullPath)!; } const currentTab = getCurrentTab(); - const objParams = ref(JSON.parse(decodeURI(route.params?.id as string))); - const titleInfo = getTitle(objParams.value.Name); - const entityName = ref(objParams.value.Name); + const routeParams = ref(JSON.parse(decodeURI(route.params?.id as string))); + // 浠巗essionStorage涓鍙栧弬鏁板苟杞崲鍥炲璞� + const savedParams = sessionStorage.getItem(`${routeParams.value.sName}_params`); + const objParams = savedParams ? ref(JSON.parse(decodeURI(savedParams))) : ref({}); + const entityName = ref(routeParams.value.Name); + const titleInfo = ref({}); //getTitle(objParams.value.Name); const isAllUpdate = ref(objParams.value.CODE != '0'); const globSetting = useGlobSetting(); const formSchemas = ref({}); //寮瑰嚭妗嗘垨楂樼骇椤甸潰澶氳〃鍗曠粨鏋� const useModalData = ref({}); //琛ㄥ崟涓彃妲芥覆鏌撴寜閽墦寮�妯℃�佹useModal鏂规硶 const useFormData = ref({}); - const colSlots = ref<any>(objParams.value.colSlots); //鎸夐挳鎻掓Ы - const crudColSlots = ref<any>(objParams.value.crudColSlots); + const useTableData = ref({}); const cType = ref(''); const dtlSlots = ref([] as any[]); const selectVals = ref({}); const baseCards = ref([] as any[]); const otherCards = ref([] as any[]); const isMounted = ref(false); - const custImport = ref(null); - const others = ref(getOthersValues(entityName.value, objParams.value.CODE, objParams.value.ID)); - //鑾峰彇琛ㄦ牸鍒椾俊鎭苟鍒濆鍖栦竴浜涙暟鎹紝濡傦細formSchemas(寮瑰嚭妗嗘垨楂樼骇椤甸潰澶氳〃鍗曠粨鏋�), useFormData(琛ㄥ崟涓彃妲芥覆鏌撴寜閽墦寮�妯℃�佹useModal鏂规硶)...绛� - const _columns = GetBasicColumnAndInit( - entityName.value, - formSchemas, - useFormData, - baseCards, - otherCards, - useForm, - ); - const data = ref([]); + const custImport = ref<any[]>([]); + const keyFieldValues = ref<any>(null); + const data = ref<any>({}); + const useTables = ref<any>({}); + for (const i in objParams.value['drawers']) { + data.value[objParams.value['drawers'][i]['name']] = ref<Recordable[]>([]); + } + provide<Ref<any>>('objParams', objParams); + provide<Ref<any>>('data', data); + provide<Ref<any>>('keyFieldValues', keyFieldValues); + provide<Ref<{}>>('useFormData', useFormData); + provide<Ref<any>>('baseCards', baseCards); + provide<Ref<any>>('useTables', useTables); + const [registerCust, { openModal: openCustomModal, closeModal }] = useModal(); - const [registerItemAdd, { openModal: openItemModal }] = useModal(); - const [registerDrawer, { openDrawer }] = useDrawer(); const { setTitle } = useTabs(); - const [registerTable, { getForm, reload, setProps }] = useTable({ - title: '鍒楄〃淇℃伅', - dataSource: data, - columns: _columns, - formConfig: { - labelWidth: 140, - schemas: getFormSchema(`${entityName.value}_Search`), - }, - useSearchForm: true, - showTableSetting: true, - bordered: true, - canResize: true, - showIndexColumn: false, - actionColumn: { - width: 130, - title: '鎿嶄綔', - dataIndex: 'action', - slots: { customRender: 'action' }, - fixed: undefined, - }, //鑷畾涔夋搷浣滃垪 - }); setTitle(objParams.value.Title); //璁剧疆鏍囩椤垫爣棰� - /** - * @description: 鐢熸垚鍒楄〃涓搷浣滈」鐨勬寜閽� - * @param {*} record - * @return {*} - */ - function createActions(record) { - // return GetActionsData( - // { - // record, - // isUpdate: true, - // ifSave: true, - // entityName: entityName.value, - // formJson: getFormSchema(`${entityName.value}_Crud`), - // cType, - // dtlSlots, - // useModalData, - // useFormData, - // crudColSlots, - // data, - // }, - // openDrawer, - // reload, - // openCustomModal, - // useForm, - // useModal, - // go, - // setProps, - // ); - const params = { - record, - isUpdate: true, - ifSave: true, - entityName: entityName.value, - formJson: getFormSchema(`${entityName.value}_Crud`), - cType, - dtlSlots, - useModalData, - useFormData, - crudColSlots, - data, - }; - const actionItem = [ - { - icon: 'clarity:note-edit-line', - onClick: editRecord.bind(null, openDrawer, params), - }, - { - icon: 'ant-design:delete-outlined', - color: 'error', - popConfirm: { - title: '鏄惁纭鍒犻櫎?', - placement: 'left', - confirm: deleteRecord.bind(null, reload, params), - }, - }, - ]; - if (isNullOrUnDef(custImport.value)) { - return actionItem; - } - const [{ ActionItem }] = custImport.value.default(); - return ActionItem( - params, - actionItem, - openDrawer, - reload, - openCustomModal, - useForm, - useModal, - go, - setProps, - ); - } - - /** - * @description: 鍏敤缂栬緫鏂规硶 - * @param {Fn} fn - * @param {*} params - * @return {*} - */ - function editRecord(fn: Fn, params: {}) { - fn(true, params); - } - - /** - * @description: 鍏敤鍒犻櫎鏂规硶 - * @param {Fn} fn - * @param {*} params - * @return {*} - */ - function deleteRecord(fn: Fn, params: {}) { - console.log(params['record']); - //鍒犻櫎 - DeleteEntity(params['record'], params['entityName']).then((action) => { - if (action.IsSuccessed) { - fn(); - } - }); - } - - function handleCreate() { - validate().then((res) => { - const Keys = Object.getOwnPropertyNames(useFormData.value); - let i; - for (i = 0; i < Keys.length; i++) { - others.value[objParams.value.pCode] = objParams.value.IsID - ? res[Keys[i]]['ID'] - : res[Keys[i]][objParams.value.pCode]; - } - openDrawer(true, { - isUpdate: false, - ifSave: true, - entityName: entityName.value, - formJson: getFormSchema(`${entityName.value}_Crud`), - crudColSlots, - others: others.value, - }); - }); - } - - /** - * @description: 鏂板缂栬緫杩斿洖鎴愬姛鏂规硶 - * @param {*} d - * @param {*} u - * @return {*} - */ - function handleSuccess(d, u) { - if (!isNullOrUnDef(custImport.value)) { - const [{ EditOperation }] = custImport.value.default(); - /* 鑷畾涔夌紪杈戞柟娉曪紝鏍规嵁瀹炰綋鍚嶅幓璋冪敤 */ - EditOperation(entityName.value, data, d, u); - setProps({ - dataSource: [], - }); - setProps({ - dataSource: data, - }); - reload(); - } - } - function goBack() { - // 鏈緥鐨勬晥鏋滄椂鐐瑰嚮杩斿洖濮嬬粓璺宠浆鍒拌处鍙峰垪琛ㄩ〉锛屽疄闄呭簲鐢ㄦ椂鍙繑鍥炰笂涓�椤� - go(getHomeUrl(entityName.value)); + if (!isNullOrUnDef(custImport.value)) { + const [{ GetHomeUrl }] = custImport.value['default'](); + // 鏈緥鐨勬晥鏋滄椂鐐瑰嚮杩斿洖濮嬬粓璺宠浆鍒拌处鍙峰垪琛ㄩ〉锛屽疄闄呭簲鐢ㄦ椂鍙繑鍥炰笂涓�椤� + go(GetHomeUrl(entityName.value)); + } } onMounted(async () => { isMounted.value = false; + await nextTick(); /* 鍔ㄦ�乮mport瀹炰綋鍚�.ts鐨勮嚜瀹氫箟鏂规硶 */ try { - custImport.value = await import(/* @vite-ignore */ `../entityts/${entityName.value}`); + custImport.value = await import(`../entityts/${entityName.value}.ts`); + const [{ GetTitle }] = custImport.value['default'](); + titleInfo.value = GetTitle(); } catch (e) {} - useFormData.value[baseCards.value[0]['name']][1].resetFields(); - Promise.all([ - getEntity({ - sqlcmd: ` ID = '${objParams.value.ID}'`, - entityName: baseCards.value[0]['entityName'], - }), - getEntity({ - sqlcmd: ` ${objParams.value.pCode} = '${others.value[objParams.value.pCode]}'`, - entityName: entityName.value, - }), - ]).then((res) => { - if (!isNullOrEmpty(res[0].Data.Items)) { - useFormData.value[baseCards.value[0]['name']][1].setFieldsValue(res[0].Data.Items[0]); - } - if (!isNullOrEmpty(res[1].Data.Items)) { - data.value = res[1].Data.Items; - } - }); isMounted.value = true; }); @@ -405,42 +198,51 @@ * @description: 寮傛鍏ㄩ儴鎻愪氦鏂规硶 * @return {*} */ - function submitAll() { + async function submitAll() { try { - validate().then((res) => { - const Keys = Object.getOwnPropertyNames(useFormData.value); - let i; - let p = [] as Promise<any>[]; - for (i = 0; i < Keys.length; i++) { - p.push(SaveEntity(res[Keys[i]], unref(isAllUpdate), baseCards.value[i]['entityName'])); - } - Promise.all(p).then((action) => { - DeleteWhere( - ` ${objParams.value.pCode} = '${others.value[objParams.value.pCode]}'`, - entityName.value, - ).then((res) => { - if (res.IsSuccessed) { - data.value.forEach((item) => { - item.ID = buildUUID(); - }); - AddListEntity(data.value, entityName.value).then((action) => { - if (action.IsSuccessed) { - cancel(); - } - }); + const validates = await validate(); + const Keys = Object.getOwnPropertyNames(useFormData.value); + let i; + let p = [] as Promise<any>[]; + for (i = 0; i < Keys.length; i++) { + p.push( + SaveEntity( + validates[Keys[i]], + unref(isAllUpdate), + baseCards.value[i]['entityName'], + `${objParams.value['IsExist']}='${validates[Keys[i]][objParams.value['IsExist']]}'`, + true, + ), + ); + } + await Promise.all(p); + if ( + !custImport.value['default']()[0].SubmitAll && + !isFunction(custImport.value['default']()[0].SubmitAll) + ) { + /* 榛樿鎻愪氦 */ + objParams.value['drawers'].forEach((d) => { + let where = `${d['code']} = '${keyFieldValues.value[d['code']]}'`; + /* type: all-琛ㄧず闇�瑕乧ode鐨勬墍鏈夌殑鍊� */ + if (d['type'] == 'all' && data.value[d['keyName']].length > 0) { + where = `${d['code']} in (${data.value[d['keyName']].map((value) => `'${value[d['code']]}'`).join(',')})`; + } + /* 濡傛灉楂樼骇琛ㄥ崟涓叧鑱旂殑鏄疘D(IsID == true)锛屽垯涓嶇敤鍒濆鍖朓D */ + if (!objParams.value['IsID']) { + data.value[d['name']].map((item) => { + item.ID = buildUUID(); + }); + } + AddAfterDelete(d['name'], data.value[d['name']], where).then((action) => { + if (action.IsSuccessed) { + cancel(); } }); }); - }); - // values.ID = params.RULE_ID; - // const action = await SaveRule({ ...values, ...testValues }); - // if (action.IsSuccessed) { - // await DeleteRuleDtl(params.RULE_ID); - // const dtlAction = await SaveRuleDtl(data.value); - // if (dtlAction.IsSuccessed) { - // cancel(); - // } - // } + } else { + /* 濡傛灉鑷畾涔夋彁浜ゆ柟娉曞瓨鍦ㄥ氨鐢ㄨ嚜瀹氫箟鎻愪氦 */ + custImport.value['default']()[0].SubmitAll(data, keyFieldValues, cancel); + } } catch (error) {} } async function cancel() { @@ -464,34 +266,22 @@ } /** - * @description: 寮瑰嚭閫夋嫨妗嗛�夋嫨鎴愬姛鍚庝簨浠� + * @description: 琛ㄦ牸鏌ヨ鍥炶皟锛屾牴鎹搴斿瓙缁勪欢涓〃鏍肩殑鏌ヨ鎸夐挳鎻愪氦浜嬩欢杞叆鍔ㄦ�佽皟鐢ㄧ殑瀹炰綋鍚嶆柟娉曞幓鎵ц瀵瑰簲鐨勬煡璇㈤�昏緫锛岃繑鍥炲悗鍒锋柊鏁版嵁 * @param {*} d - * @param {*} u - * @param {*} item * @return {*} */ - function handleItemSuccess(d, u, item) { - /* 鍔ㄦ�乮mport瀹炰綋鍚�.ts鐨勮嚜瀹氫箟鏂规硶 */ + function dtlFormSearch(d) { try { - import( - /* @vite-ignore */ `../entityts/${getForm().getFieldsValue()[`${item.replace(/form-/, '').replace(/add/, '')}PSelect_0`]}` - ).then((m) => { - const [{ GetSelectSuccess }] = m.default(); - getForm().setFieldsValue(GetSelectSuccess(d, u)); + var values = useTables.value[d.type][1].getForm().getFieldsValue(); + let data = custImport.value['default']()[0].FormSearch({ ...d, ...{ values: values } }); + useTables.value[d.type][1].setProps({ + dataSource: [], }); + useTables.value[d.type][1].setProps({ + dataSource: data, + }); + useTables.value[d.type][1].reload(); } catch (e) {} - } - - /** - * @description: 寮瑰嚭閫夋嫨妗� - * @param {*} item - * @return {*} - */ - function handleSelectItem(item) { - OpenSelectItem( - openItemModal, - getForm().getFieldsValue()[`${item.replace(/form-/, '').replace(/add/, '')}PSelect_0`], - ); } /** @@ -518,7 +308,7 @@ * @return {*} */ function custSuccess(d) { - reload(); + useTableData.value['table'][1].reload(); } /** @@ -531,12 +321,14 @@ function handleEntSuccess(d, u, item) { /* 鍔ㄦ�乮mport瀹炰綋鍚�.ts鐨勮嚜瀹氫箟鏂规硶 */ try { - import(/* @vite-ignore */ `../entityts/${cType.value}`).then((m) => { + import(`../entityts/${cType.value}.ts`).then((m) => { const [{ GetSelectSuccess }] = m.default(); var values = GetSelectSuccess(d, u); selectVals.value = values; //淇濆瓨寮瑰嚭妗嗛�夋嫨鐨勭粨鏋� let _val = {}; - _val[d.returnFieldName] = values[d.returnFieldName]; + d.returnFieldName.map((x) => { + _val[x] = values[x]; + }); useFormData.value[item][1].setFieldsValue(_val); }); } catch (e) {} -- Gitblit v1.9.3