Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/api/wms/supplierinvoiceInvoiced/index.ts

@@ -23,8 +23,8 @@ export interface SupplierinvoiceInvoicedVO {
   siteId: string
 }
 
-// 查询待开票列表
+// 查询待开票列表--日程
-export const getSupplierinvoiceInvoicedPage = async (params) => {
+export const getSupplierinvoiceInvoicedPageSchedule = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
@@ -34,6 +34,18 @@ export const getSupplierinvoiceInvoicedPage = async (params) => {
   }
 }
 
+// 查询待开票列表--离散
+export const getSupplierinvoiceInvoicedPageDiscrete = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/supplierinvoice-invoiced/seniorDiscrete', data })
+  } else {
+    return await request.get({ url: `/wms/supplierinvoice-invoiced/pageDiscrete`, params })
+  }
+}
+
+
 // 查询待开票详情
 export const getSupplierinvoiceInvoiced = async (id: number) => {
   return await request.get({ url: `/wms/supplierinvoice-invoiced/get?id=` + id })

src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue → src/views/wms/supplierManage/supplierinvoiceInvoicedDiscrete/index.vue

@@ -92,7 +92,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: SupplierinvoiceInvoicedApi.getSupplierinvoiceInvoicedPage // 分页接口
+  getListApi: SupplierinvoiceInvoicedApi.getSupplierinvoiceInvoicedPageDiscrete // 分页接口
 })
 
 // 获得表格的各种操作

src/views/wms/supplierManage/supplierinvoiceInvoicedSchedule/index.vue

@@ -0,0 +1,314 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="SupplierinvoiceInvoiced.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="SupplierinvoiceInvoiced.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table v-clientTable
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, t('ts.代码'), row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="SupplierinvoiceInvoicedRules"
+    :formAllSchemas="SupplierinvoiceInvoiced.allSchemas"
+    :apiUpdate="SupplierinvoiceInvoicedApi.updateSupplierinvoiceInvoiced"
+    :apiCreate="SupplierinvoiceInvoicedApi.createSupplierinvoiceInvoiced"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="SupplierinvoiceInvoiced.allSchemas" />
+
+  <!-- 导入 -->
+  <!-- <ImportForm ref="importFormRef" url="/wms/supplierinvoice-invoiced/import" :importTemplateData="importTemplateData" @success="importSuccess" /> -->
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { SupplierinvoiceInvoiced,SupplierinvoiceInvoicedRules } from './supplierinvoiceInvoiced.data'
+import * as SupplierinvoiceInvoicedApi from '@/api/wms/supplierinvoiceInvoiced'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
+defineOptions({ name: 'SupplierinvoiceInvoiced' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(SupplierinvoiceInvoiced.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: SupplierinvoiceInvoicedApi.getSupplierinvoiceInvoicedPageSchedule // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+  // 根据状态返回该按钮是否显示
+  const isShowMainButton = (row, val) => {
+    if (val.indexOf(row.status) > -1) {
+      return false
+    } else {
+      return true
+    }
+  }
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:supplierinvoice-invoiced:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:supplierinvoice-invoiced:import'}), // 导入
+  defaultButtons.defaultExportBtn(null), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) =>{
+  return [
+    // defaultButtons.mainListEditBtn({hasPermi:'wms:supplierinvoice-invoiced:update'}), // 编辑
+    // defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierinvoice-invoiced:delete'}), // 删除
+    // defaultButtons.mainListEditBtn({hasPermi:'wms:supplierinvoice-invoiced:update'}),
+    {
+      label: t('ts.审核通过'),
+      name: 'agree',
+      hide: isShowMainButton(row, ['1']),
+      type: 'primary',
+      color: '',
+      link: true, // 文本展现按钮
+      hasPermi: 'wms:supplierinvoice-invoiced:agree'
+    },
+    {
+      label: t('ts.作废'),
+      name: 'refuse',
+      hide: isShowMainButton(row, ['1']),
+      type: 'danger',
+      color: '',
+      link: true, // 文本展现按钮
+      hasPermi: 'wms:supplierinvoice-invoiced:refuse'
+    }
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if(val == 'agree'){//审核通过
+    handleAgree(row.id)
+  } else if(val == 'refuse'){//作废
+    handleRefuse(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =SupplierinvoiceInvoiced.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error(t('ts.失效时间要大于生效时间'))
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await SupplierinvoiceInvoicedApi.createSupplierinvoiceInvoiced(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await SupplierinvoiceInvoicedApi.updateSupplierinvoiceInvoiced(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'qadSupplierinvoiceInvoiced')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await SupplierinvoiceInvoicedApi.deleteSupplierinvoiceInvoiced(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id : number) => {
+  try {
+    // 审批通过的二次确认
+    await message.confirm(t('ts.是否审批通过所选中数据？'))
+    tableObject.loading = true
+    // 发起审批通过
+    await SupplierinvoiceInvoicedApi.agreeSupplierinvoiceInvoiced(id)
+    message.success(t('ts.审批通过成功!'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch { }finally{
+    tableObject.loading = false
+  }
+}
+
+
+/** 审批通过按钮操作 */
+const handleRefuse = async (id : number) => {
+  try {
+    // 审批通过的二次确认
+    await message.confirm(t('ts.是否审批拒绝所选中数据？'))
+    tableObject.loading = true
+    // 发起审批通过
+    await SupplierinvoiceInvoicedApi.refuseSupplierinvoiceInvoiced(id)
+    message.success(t('ts.审批成功!'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch { }finally{
+    tableObject.loading = false
+  }
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    loadStart()
+    const excelTitle = ref(route.meta.title)
+    const data = await SupplierinvoiceInvoicedApi.exportSupplierinvoiceInvoiced(tableObject.params)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+  } catch {
+  } finally {
+    loadDone()
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  // importTemplateData.templateUrl = await SupplierinvoiceInvoicedApi.importTemplate()
+})
+
+</script>

src/views/wms/supplierManage/supplierinvoiceInvoicedSchedule/supplierinvoiceInvoiced.data.ts

@@ -0,0 +1,284 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+// 表单校验
+export const SupplierinvoiceInvoicedRules = reactive({
+  supplierCode: [required],
+  poNumber: [required],
+  currency: [required],
+  concurrencyStamp: [required],
+})
+
+export const SupplierinvoiceInvoiced = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '待开票单据号',
+    field: 'recvBillNum',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '发货单号',
+    field: 'asnBillNum',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '供应商送货日期',
+    field: 'supplierDeliveryTime',
+    sort: 'custom',
+    formatter: dateFormatter2,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '收货日期',
+    field: 'prhRcpDate',
+    sort: 'custom',
+    isSearch: true,
+    formatter: dateFormatter2,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '项目编码',
+    field: 'projectCode',
+    sort: 'custom',
+    isTable:false,
+    isTableForm:false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据类型',
+    field: 'billType',
+    dictType: DICT_TYPE.BILL_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    form: {
+      component: 'SelectV2'
+    },
+    table: {
+      width: 150
+    },
+  },
+
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.SUPPLIERINVOICE_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    isForm:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+
+  // {
+  //   label: '发票申请状态',
+  //   field: 'requestStatus',
+  //   dictType: DICT_TYPE.INVOICE_REQUEST_STATUS,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   isForm:false,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isSearch: false,
+  //   form: {
+  //     value: '1',
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   }
+  // },
+
+
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '采购价格',
+    field: 'purchasePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '票据总数',
+    field: 'invoicableQuantity',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '实际开票数量',
+    field: 'issuedInvoicableQuantity',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '可开票数量',
+    field: 'invoiceAvailableQuantity',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '零件号',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string', 
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '货币',
+    field: 'currency',
+    sort: 'custom',
+    dictType: DICT_TYPE.CURRENCY,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      type:'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 200,
+      fixed: 'right'
+    }
+  }
+]))