Browse Source

盘点,采购收货

master
张立 1 year ago
parent
commit
29e53a8811
  1. 5
      src/api/wms/purchasereceiptRecordMain/index.ts
  2. 2
      src/components/TableForm/src/TableForm.vue
  3. 1
      src/utils/dict.ts
  4. 4
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
  5. 2
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue

5
src/api/wms/purchasereceiptRecordMain/index.ts

@ -66,8 +66,13 @@ export const deletePurchasereceiptRecordMain = async (id: number) => {
// 导出采购收货记录主 Excel // 导出采购收货记录主 Excel
export const exportPurchasereceiptRecordMain = async (params) => { export const exportPurchasereceiptRecordMain = async (params) => {
if (params.isSearch) {
const data = {...params}
return await request.downloadPost({ url: `/wms/purchasereceipt-record-main/export-excel-senior`, data })
} else {
return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel`, params }) return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel`, params })
} }
}
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {

2
src/components/TableForm/src/TableForm.vue

@ -112,7 +112,7 @@
:allow-create="headerItem?.tableForm.allowCreate" :allow-create="headerItem?.tableForm.allowCreate"
style="width: 100%" style="width: 100%"
:placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label" :placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label"
@change="formSelectChange(row[headerItem.field], $event)"> @change="formSelectChange(headerItem.field, $event)">
<el-option <el-option
v-for="op in initSelectOptions(headerItem)" v-for="op in initSelectOptions(headerItem)"
:label="op.label" :label="op.label"

1
src/utils/dict.ts

@ -222,6 +222,7 @@ export enum DICT_TYPE {
REQEUST_MODE = 'reqeust_mode', // 申请模式 REQEUST_MODE = 'reqeust_mode', // 申请模式
TIME_UNIT = 'time_unit', // 时间单位 TIME_UNIT = 'time_unit', // 时间单位
COUNT_TYPE = 'count_type', // 盘点类型 COUNT_TYPE = 'count_type', // 盘点类型
COUNT_SCOPE_TYPE = 'count_scope_type', // 盘点范围类型
BARCODE_PREFIX = 'barcode_prefix', // 条码前缀 BARCODE_PREFIX = 'barcode_prefix', // 条码前缀
SETTLEMENT_TYPE = 'settlement_type', // 结算类型 SETTLEMENT_TYPE = 'settlement_type', // 结算类型
FROZEN_REASON = 'frozen_reason', // 冻结原因 FROZEN_REASON = 'frozen_reason', // 冻结原因

4
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts

@ -219,7 +219,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
{ {
label: '承接人', label: '承接人',
field: 'acceptUserId', field: 'acceptUserName',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -247,7 +247,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
{ {
label: '完成人', label: '完成人',
field: 'completeUserId', field: 'completeUserName',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150

2
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue

@ -138,7 +138,7 @@ const handleExport = async () => {
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(setSearchParams) const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(tableObject.params)
download.excel(data, '采购收货记录主.xlsx') download.excel(data, '采购收货记录主.xlsx')
} catch { } catch {
} finally { } finally {

Loading…
Cancel
Save