@qqt-product/system 0.0.2 → 0.0.16

package/src/lib/components/QPurchaseNoticeList/src/QPurchaseNoticeEdit.vue

@@ -1,20 +1,35 @@
 <template>
   <div class="edit-page">
     <a-spin :spinning="customLoading">
-      <q-edit-page-layout ref="layoutRef" v-bind="options" @customSave="handleCustomSave" @customPublish="handleCustomPublish" @validate-success="handleValidateSuccess" @refresh="handleRefresh">
+      <q-edit-page-layout
+        ref="layoutRef"
+        v-bind="options"
+        @supplierListRowAdd="handleSupplierListRowAdd"
+        @customSave="handleCustomSave"
+        @customPublish="handleCustomPublish"
+        @validate-success="handleValidateSuccess"
+        @back="back"
+      >
       </q-edit-page-layout>
     </a-spin>
+    <q-field-select-modal ref="fieldSelectModal" @ok="ok"></q-field-select-modal>
   </div>
 </template>
 
 <script setup lang="ts">
 import { ref, reactive, inject } from 'vue'
 import type { ComponentPublicInstance } from 'vue'
-import { BUTTON_ADD_ONE_ROW, BUTTON_DELETE_ROW, BUTTON_SAVE, BUTTON_PUBLISH, BUTTON_UPLOAD } from '@qqt-product/ui'
+import qqtUtils from '@qqt-product/utils'
+import type { CreatePromise } from '@qqt-product/utils'
+import qqtApi from '@qqt-product/api'
+import { BUTTON_CUSTOM, BUTTON_DELETE_ROW, BUTTON_SAVE, BUTTON_CUSTOM_PRIMARY, BUTTON_UPLOAD } from '@qqt-product/ui'
 
 // ui组件库 types
 import type { GlobalPageLayoutTypes } from '@qqt-product/ui'
-import { usePromiseStepHook, useRefInstanceHook } from '@qqt-product/ui'
+import { usePromiseStepHook, useRefInstanceHook, message as Message } from '@qqt-product/ui'
+
+import useFieldSelectModal from './use-field-select-modal-hook'
+import { Modal } from 'ant-design-vue'
 
 const srmI18n = inject('Q_SRM_I18N', (i18nKey: string, defaultValue: string, account?: string | number): string => {
   if (i18nKey) {
@@ -25,7 +40,7 @@ const srmI18n = inject('Q_SRM_I18N', (i18nKey: string, defaultValue: string, acc
   }
   return defaultValue
 })
-
+const router = inject('Q_APPLICATION_ROUTER', { go: (num: number) => console.log('router go back: ' + num) })
 // 传参 props
 const props = defineProps<{
   currentRow: GlobalPageLayoutTypes.CurrentRow | null
@@ -41,10 +56,40 @@ const currentRow = props.currentRow
       busAccount: '',
       elsAccount: '',
     })
+const { createPromise, cloneDeep } = qqtUtils
+const qHttp: qqtApi.Request = qqtApi.useHttp()
+// const handleBeforePublish = (args: GlobalPageLayoutTypes.ExposeWithPageButtons) => {
+//   const fn: CreatePromise<GlobalPageLayoutTypes.ExposeWithPageButtons> = async (resolve) => {
+//     const pageData = args.pageData
+//     const cloneData = cloneDeep(pageData.value)
+//     if (!cloneData.id) {
+//       const res = await qHttp.post({ url: '/notice/purchaseNotice/add', data: pageData.value })
+//       if (res && res.success) {
+//         cloneData.id = res.result.id
+//         cloneData.noticeStatus = res.result.noticeStatus
+//         cloneData.publishUser = res.result.publishUser
+//         cloneData.noticeContent = res.result.noticeContent
+//         cloneData.noticeNumber = res.result.noticeNumber
+//         delete cloneData.busAccount
+//         delete cloneData.elsAccount
+//         delete cloneData.templateNumber
+//         delete cloneData.templateVersion
+//         delete cloneData.templateAccount
+//       }
+//     }
+//     let formatData = {
+//       ...cloneData,
+//     }
+//     resolve({ ...args, pageData: ref(formatData) })
+//   }
 
+//   return createPromise(fn) as Promise<GlobalPageLayoutTypes.ExposeWithPageButtons>
+// }
 // 编辑组件 ref
 const layoutRef = ref<ComponentPublicInstance | null>(null)
 
+const { fieldSelectModal, handleSupplierListRowAdd, ok } = useFieldSelectModal(layoutRef, srmI18n)
+
 // 配置
 const options = reactive<Partial<GlobalPageLayoutTypes.EditPageLayoutProps>>({
   /**
@@ -55,7 +100,7 @@ const options = reactive<Partial<GlobalPageLayoutTypes.EditPageLayoutProps>>({
   businessType: 'custom',
   // 布局模式
   pattern: 'vertical',
-  // 当前已选行数据a
+  // 当前已选行数据
   currentRow: currentRow as GlobalPageLayoutTypes.CurrentRow,
   refreshMethods(row?: GlobalPageLayoutTypes.CurrentRow) {
     if (options.currentRow) {
@@ -84,8 +129,10 @@ const options = reactive<Partial<GlobalPageLayoutTypes.EditPageLayoutProps>>({
         groupType: 'item',
         buttons: [
           {
-            ...BUTTON_ADD_ONE_ROW,
+            ...BUTTON_CUSTOM,
             title: srmI18n('i18n_title_add', '新增'),
+            emit: true,
+            emitKey: 'supplierListRowAdd',
           },
           BUTTON_DELETE_ROW,
         ],
@@ -100,17 +147,17 @@ const options = reactive<Partial<GlobalPageLayoutTypes.EditPageLayoutProps>>({
             args: {
               url: '/attachment/purchaseAttachment/upload', // 上传的路径
               // groupCode: 'purchaseBiddingHeadList', // 可不填 默认是 itemInfo
-              property: 'biddingDesc', // 行项目显示的名称字段编码
-              dictCode: 'srmFileType', // 文件类型数据字典编码
-              actionRoutePath: '/srm/notice/purchase/PurchaseNoticeList',
-              sourceNumber: 'noticeNumber', // 原v5 的获值写法 this.currentEditRow.projectNumber,
+              // property: 'biddingDesc', // 行项目显示的名称字段编码
+              // dictCode: 'srmFileType', // 文件类型数据字典编码
+              // actionRoutePath: '/srm/notice/purchase/PurchaseNoticeList',
+              // sourceNumber: 'noticeNumber', // 原v5 的获值写法 this.currentEditRow.projectNumber,
+              // },
+              // callback 函数若上传附件后无他业务操作可不加
+              // callback: (tableData, pageData, fileData) => {
+              //   fileData?.forEach((n) => {
+              //     tableData.push({ _row_id: uniqueId('_row_id_'), ...n })
+              //   })
             },
-            // callback 函数若上传附件后无他业务操作可不加
-            // callback: (tableData, pageData, fileData) => {
-            //   fileData?.forEach((n) => {
-            //     tableData.push({ _id: uniqueId('_id_'), ...n })
-            //   })
-            // },
           },
           BUTTON_DELETE_ROW,
         ],
@@ -135,7 +182,7 @@ const options = reactive<Partial<GlobalPageLayoutTypes.EditPageLayoutProps>>({
       {
         groupCode: 'baseForm',
         fieldType: 'select',
-        fieldLabel: srmI18n('i18n_field_msgCategory', '类型'),
+        fieldLabel: srmI18n('i18n_field_msgCategory', '消息类型'),
         fieldName: 'noticeType',
         placeholder: srmI18n('i18n_title_selectType', '请选择类型'),
         dictCode: 'srmNoticeType',
@@ -171,10 +218,11 @@ const options = reactive<Partial<GlobalPageLayoutTypes.EditPageLayoutProps>>({
         fieldType: 'switch',
         fieldLabel: srmI18n('i18n_title_isPlacedTop', '是否置顶'),
         fieldName: 'top',
+        defaultValue: '0',
       },
       {
         groupCode: 'baseForm',
-        fieldType: 'textArea',
+        fieldType: 'editor',
         fieldLabel: '',
         fieldName: 'noticeContent',
       },
@@ -200,45 +248,85 @@ const options = reactive<Partial<GlobalPageLayoutTypes.EditPageLayoutProps>>({
       },
     },
     {
-      ...BUTTON_PUBLISH,
+      ...BUTTON_CUSTOM_PRIMARY,
+      title: srmI18n('i18n_title_publish', '发布'),
       emit: true,
       emitKey: 'customPublish',
+      // handleBefore: handleBeforePublish,
       args: {
         url: '/notice/purchaseNotice/publish',
       },
     },
   ],
 })
-const pageButtons = options.pageButtons as GlobalPageLayoutTypes.PageButton[]
-const refreshMethods = options.refreshMethods
 
 const { pageData, layoutConfig, defaultValues } = useRefInstanceHook(layoutRef)
-const { stepTriggerValidate, composeSave, composePublish, customLoading } = usePromiseStepHook({ pageData, layoutConfig, defaultValues, pageButtons: ref(pageButtons), refreshMethods })
+const { stepTriggerValidate, composeSave, composePublish, customLoading } = usePromiseStepHook({ pageData, layoutConfig, defaultValues, options })
 
 // 自定义保存
 const handleCustomSave = () => {
   stepTriggerValidate()
 }
+// 执行自定义校验
+const customCheck: (pageData: GlobalPageLayoutTypes.RecordStringNumber) => boolean = (pageData) => {
+  if (pageData.effectiveTime && pageData.expiryTime) {
+    if (pageData.effectiveTime > pageData.expiryTime) {
+      Message.warning('公告发布生效时间必须小于失效时间')
+      return false
+    }
+  }
+
+  return true
+}
 // 自定义发布
 const handleCustomPublish = () => {
-  composePublish()
+  if (!customCheck(pageData.value)) {
+    return
+  }
+  stepTriggerValidate()
 }
 
 // 页面校验成功后执行下一步回调步骤
 const handleValidateSuccess = (button: GlobalPageLayoutTypes.PageButton) => {
-  console.log(button.key === BUTTON_PUBLISH.key)
+  console.log(button.key === BUTTON_CUSTOM_PRIMARY.key)
   if (button.key === BUTTON_SAVE.key) {
     composeSave()
-  } else if (button.key === BUTTON_PUBLISH.key) {
-    composePublish()
+  } else if (button.key === BUTTON_CUSTOM_PRIMARY.key) {
+    let purchaseNoticeSupplierList = pageData.value.purchaseNoticeSupplierList as []
+    if (pageData.value.noticeScope == '4') {
+      if (purchaseNoticeSupplierList && purchaseNoticeSupplierList.length) {
+        Message.warning(srmI18n('i18n_field_RIRdXWVKRdXABSuRdX_d20c2f0d', '指定供应商，请在供应商列表添加供应商'))
+        return false
+      }
+    } else {
+      if (purchaseNoticeSupplierList && purchaseNoticeSupplierList.length > 0) {
+        Message.warning(srmI18n('i18n_field_RxvLKuWRIRdXWWxTPiFRdXWVQG_962d5139', '公告范围是非“指定供应商”,不需要选择供应商，请删除'))
+        return false
+      }
+    }
+    Modal.confirm({
+      title: '发布',
+      content: '是否确认发布',
+      onOk() {
+        return new Promise((resolve, reject) => {
+          qHttp.post({ url: '/notice/purchaseNotice/publish', data: pageData.value }).then((res) => {
+            if (res.success) {
+              Message.success(res.message)
+              router.go(-1)
+              resolve(true)
+            } else {
+              Message.error(res.message)
+              reject(false)
+            }
+          })
+        })
+      },
+    })
   }
 }
 
-// 页面刷新
-const handleRefresh = () => {
-  console.log('refresh :>> ')
-  if (options.currentRow) {
-    options.currentRow._t = +new Date()
-  }
+// 发布成功后返回
+const back = () => {
+  router.go(-1)
 }
 </script>

package/src/lib/components/QPurchaseNoticeList/src/QPurchaseNoticeList.vue

@@ -1,163 +1,189 @@
-<template>
-  <q-list-layout ref="listLayoutRef" :pageData="pageData" :apiUrls="apiUrls" />
-</template>
-
-<script lang="ts">
-//JS
-import { defineComponent, reactive, toRefs, inject } from 'vue'
-//hook
-import { useConfigData } from './useConfigData'
-
-export default defineComponent({
-  name: 'QPurchaseNoticeList',
-  props: {
-    userInfo: {
-      type: Object,
-      defalut: () => {
-        return {}
-      },
-    },
-  },
-  setup(props, { emit }) {
-    const srmI18n = inject('Q_SRM_I18N', (i18nKey: string, defaultValue: string, account?: string | number): string => {
-      if (i18nKey) {
-        if (account) {
-          return account + defaultValue
-        }
-        return defaultValue
-      }
-      return defaultValue
-    })
-    const pageData = reactive({
-      statusConfig: {
-        show: false,
-      },
-      optColumn: {
-        attrs: {},
-        extend: {},
-        optColumnList: [
-          {
-            authorityCode: 'purchaseNotice#PurchaseNotice:view',
-            type: 'view',
-            title: srmI18n('i18n_title_see', '查看'),
-            click: ({ row }) => {
-              emit('detail', row)
-            },
-          },
-          {
-            authorityCode: 'purchaseNotice#PurchaseNotice:edit',
-            type: 'edit',
-            title: srmI18n('i18n_title_edit', '编辑'),
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            click: ({ row }: any) => {
-              emit('edit', row)
-            },
-            disabled: ({ row }) => row.noticeStatus == '1',
-          },
-          {
-            authorityCode: 'purchaseNotice#PurchaseNotice:topOpt',
-            type: 'topOpt',
-            title: srmI18n('i18n_title_TopCancel', '置顶/取消'),
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            click: ({ row }: any) => {
-              emit('topSet', row)
-            },
-            disabled: ({ row }) => row.noticeStatus == '2',
-          },
-          {
-            authorityCode: 'purchaseNotice#PurchaseNotice:cancel',
-            type: 'cancel',
-            title: srmI18n('i18n_title_void', '作废'),
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            click: ({ row }: any) => {
-              emit('cancel', row)
-            },
-            disabled: ({ row }) => row.noticeStatus == '2',
-          },
-          {
-            authorityCode: 'purchaseNotice#PurchaseNotice:delete',
-            type: 'delete',
-            title: srmI18n('i18n_title_delete', '删除'),
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            click: ({ row }: any) => {
-              emit('delete', row)
-            },
-            disabled: ({ row }) => row.noticeStatus == '1',
-          },
-        ],
-      },
-      buttonConfig: {
-        attrs: {},
-        extend: {},
-        buttons: [
-          {
-            authorityCode: 'purchaseNotice#PurchaseNotice:add',
-            label: srmI18n('i18n_title_add', '新增'),
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            click: ({ row }: any) => {
-              emit('create', row)
-            },
-          },
-          {
-            label: srmI18n('i18n_title_listCustom', '列自定义'),
-            icon: {
-              type: 'icon-Q-setting',
-            },
-            type: 'setting',
-          },
-          {
-            label: srmI18n('i18n_title_helpText', '帮助说明'),
-            icon: {
-              type: 'icon-Q-help-text',
-            },
-            type: 'help-text',
-          },
-          {
-            label: srmI18n('i18n_title_attachment', '说明附件'),
-            icon: {
-              type: 'icon-Q-attachment-text',
-            },
-            type: 'attachment-text',
-          },
-        ],
-      },
-      queryConfig: {
-        attrs: {},
-        extend: {},
-        form: [
-          {
-            type: 'input',
-            label: '标题',
-            fieldName: 'noticeTitle',
-            placeholder: '请输入标题',
-          },
-          {
-            type: 'select',
-            label: '状态',
-            fieldName: 'noticeStatus',
-            dictCode: 'srmNoticeStatus',
-            placeholder: '请选择状态',
-          },
-        ],
-        formState: {},
-      },
-      pagerConfig: {},
-    })
-    //data-hook
-    const { apiUrls } = useConfigData()
-    const { userInfo } = toRefs(props)
-    console.log('userInfos', userInfo)
-    //methods
-    // function allowDelete() {
-    //   console.log('userInfo.value?.userInfo?.elsAccount', userInfo.value?.userInfo?.elsAccount)
-    //   if (userInfo.value?.userInfo?.elsAccount != '100000') {
-    //     return true
-    //   } else {
-    //     return false
-    //   }
-    // }
-    return { apiUrls, pageData }
-  },
-})
-</script>
-<style scoped></style>
+<template>
+  <q-list-layout ref="listLayoutRef" :pageData="pageData" :apiUrls="apiUrls" />
+</template>
+
+<script lang="ts">
+import { ref, defineComponent, reactive, toRefs, inject } from 'vue'
+import qqtApi from '@qqt-product/api'
+import { message } from '@qqt-product/ui'
+import { useConfigData } from './useConfigData'
+
+export default defineComponent({
+  name: 'QPurchaseNoticeList',
+  props: {
+    userInfo: {
+      type: Object,
+      defalut: () => {
+        return {}
+      },
+    },
+  },
+  setup(props, { emit }) {
+    const listLayoutRef = ref()
+    const qHttp: qqtApi.Request = qqtApi.useHttp()
+    const srmI18n = inject('Q_SRM_I18N', (i18nKey: string, defaultValue: string, account?: string | number): string => {
+      if (i18nKey) {
+        if (account) {
+          return account + defaultValue
+        }
+        return defaultValue
+      }
+      return defaultValue
+    })
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const handleTopSet = async (row: any) => {
+      const params = {
+        id: row.id,
+      }
+      qHttp.get({ url: '/notice/purchaseNotice/topOpt', params: params }).then((res) => {
+        if (res && res.success) {
+          message.success(res.message)
+          listLayoutRef.value.fetchListData()
+        } else {
+          message.error(res.message)
+        }
+      })
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const handleCancel = async (row: any) => {
+      const params = {
+        id: row.id,
+      }
+      qHttp.get({ url: '/notice/purchaseNotice/cancel', params: params }).then((res) => {
+        if (res && res.success) {
+          message.success(res.message)
+          listLayoutRef.value.fetchListData()
+        } else {
+          message.success(res.message)
+          listLayoutRef.value.fetchListData()
+        }
+      })
+    }
+    const pageData = reactive({
+      statusConfig: {
+        show: false,
+      },
+      optionConfig: {
+        attrs: {},
+        extend: {},
+        options: [
+          {
+            authorityCode: 'purchaseNotice#PurchaseNotice:view',
+            type: 'view',
+            title: srmI18n('i18n_title_see', '查看'),
+            click: ({ row }) => {
+              emit('detail', row)
+            },
+          },
+          {
+            authorityCode: 'purchaseNotice#PurchaseNotice:edit',
+            type: 'edit',
+            title: srmI18n('i18n_title_edit', '编辑'),
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            click: ({ row }: any) => {
+              emit('edit', row)
+            },
+            disabled: ({ row }) => row.noticeStatus !== '1',
+          },
+          {
+            authorityCode: 'purchaseNotice#PurchaseNotice:topOpt',
+            type: 'topOpt',
+            title: srmI18n('i18n_title_TopCancel', '置顶/取消'),
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            click: ({ row }: any) => {
+              handleTopSet(row)
+            },
+            disabled: ({ row }) => row.noticeStatus !== '2',
+          },
+          {
+            authorityCode: 'purchaseNotice#PurchaseNotice:cancel',
+            type: 'cancel',
+            title: srmI18n('i18n_title_void', '作废'),
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            click: ({ row }: any) => {
+              handleCancel(row)
+            },
+            disabled: ({ row }) => row.noticeStatus !== '2',
+          },
+          {
+            type: 'delete',
+            title: srmI18n('i18n_title_delete', '删除'),
+            authorityCode: 'purchaseNotice#PurchaseNotice:delete',
+            args: {
+              url: '/notice/purchaseNotice/delete',
+            },
+            disabled: ({ row }) => row.noticeStatus !== '1',
+          },
+        ],
+      },
+      buttonConfig: {
+        attrs: {},
+        extend: {},
+        buttons: [
+          {
+            authorityCode: 'purchaseNotice#PurchaseNotice:add',
+            label: srmI18n('i18n_title_add', '新增'),
+            icon: {
+              type: 'icon-Q-add',
+            },
+            attrs: {
+              type: 'primary',
+            },
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            click: ({ row }: any) => {
+              emit('create', row)
+            },
+          },
+          {
+            label: srmI18n('i18n_title_listCustom', '列自定义'),
+            icon: {
+              type: 'icon-Q-setting',
+            },
+            type: 'setting',
+          },
+          {
+            label: srmI18n('i18n_title_helpText', '帮助说明'),
+            icon: {
+              type: 'icon-Q-help-text',
+            },
+            type: 'help-text',
+          },
+          {
+            label: srmI18n('i18n_title_attachment', '说明附件'),
+            icon: {
+              type: 'icon-Q-attachment-text',
+            },
+            type: 'attachment-text',
+          },
+        ],
+      },
+      queryConfig: {
+        attrs: {},
+        extend: {},
+        form: [
+          {
+            type: 'input',
+            label: '标题',
+            fieldName: 'noticeTitle',
+            placeholder: '请输入标题',
+          },
+          {
+            type: 'select',
+            label: '状态',
+            fieldName: 'noticeStatus',
+            dictCode: 'srmNoticeStatus',
+            placeholder: '请选择状态',
+          },
+        ],
+      },
+      pagerConfig: {},
+    })
+    //data-hook
+    const { apiUrls } = useConfigData()
+    const { userInfo } = toRefs(props)
+    console.log('userInfos', userInfo)
+    return { listLayoutRef, apiUrls, pageData, handleTopSet }
+  },
+})
+</script>
+<style scoped></style>