Browse Source

Merge remote-tracking branch 'origin/master'

master
zhaoxuebing 12 months ago
parent
commit
3ea4af82bb
  1. 2
      src/views/infra/apiAccessLog/index.vue
  2. 2
      src/views/infra/apiErrorLog/index.vue
  3. 2
      src/views/infra/config/index.vue
  4. 2
      src/views/infra/job/index.vue
  5. 2
      src/views/infra/job/logger/index.vue
  6. 2
      src/views/system/dict/data/index.vue
  7. 2
      src/views/system/dict/index.vue
  8. 2
      src/views/system/errorCode/index.vue
  9. 2
      src/views/system/loginlog/index.vue
  10. 2
      src/views/system/operatelog/index.vue
  11. 2
      src/views/system/post/index.vue
  12. 2
      src/views/system/role/index.vue
  13. 2
      src/views/system/sensitiveWord/index.vue
  14. 2
      src/views/system/serialNumber/index.vue
  15. 2
      src/views/system/sms/log/index.vue
  16. 2
      src/views/system/sms/template/index.vue
  17. 2
      src/views/system/tenant/index.vue
  18. 2
      src/views/system/user/UserImportForm.vue
  19. 2
      src/views/system/user/index.vue
  20. 4
      src/views/wms/basicDataManage/labelManage/barbasic/index.vue
  21. 2
      src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue
  22. 2
      src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
  23. 2
      src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
  24. 2
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
  25. 2
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
  26. 2
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
  27. 2
      src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
  28. 2
      src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
  29. 4
      src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
  30. 20
      src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
  31. 4
      src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
  32. 2
      src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
  33. 4
      src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
  34. 2
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
  35. 189
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
  36. 13
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
  37. 71
      src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue

2
src/views/infra/apiAccessLog/index.vue

@ -153,7 +153,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await ApiAccessLogApi.exportApiAccessLog(queryParams) const data = await ApiAccessLogApi.exportApiAccessLog(queryParams)
download.excel(data, 'API 访问日志.xls') download.excel(data, 'API 访问日志.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

2
src/views/infra/apiErrorLog/index.vue

@ -235,7 +235,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await ApiErrorLogApi.exportApiErrorLog(queryParams) const data = await ApiErrorLogApi.exportApiErrorLog(queryParams)
download.excel(data, '异常日志.xls') download.excel(data, '异常日志.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

2
src/views/infra/config/index.vue

@ -155,7 +155,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await ConfigApi.exportConfig(queryParams) const data = await ConfigApi.exportConfig(queryParams)
download.excel(data, '参数配置.xls') download.excel(data, '参数配置.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

2
src/views/infra/job/index.vue

@ -155,7 +155,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await JobApi.exportJob(queryParams) const data = await JobApi.exportJob(queryParams)
download.excel(data, '定时任务.xls') download.excel(data, '定时任务.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

2
src/views/infra/job/logger/index.vue

@ -182,7 +182,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await JobLogApi.exportJobLog(queryParams) const data = await JobLogApi.exportJobLog(queryParams)
download.excel(data, '定时任务执行日志.xls') download.excel(data, '定时任务执行日志.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

2
src/views/system/dict/data/index.vue

@ -194,7 +194,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await DictDataApi.exportDictData(queryParams) const data = await DictDataApi.exportDictData(queryParams)
download.excel(data, '字典数据.xls') download.excel(data, '字典数据.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

2
src/views/system/dict/index.vue

@ -161,7 +161,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await DictTypeApi.exportDictType(queryParams) const data = await DictTypeApi.exportDictType(queryParams)
download.excel(data, '字典类型.xls') download.excel(data, '字典类型.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

2
src/views/system/errorCode/index.vue

@ -157,7 +157,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await ErrorCodeApi.excelErrorCode(queryParams) const data = await ErrorCodeApi.excelErrorCode(queryParams)
download.excel(data, '错误码.xls') download.excel(data, '错误码.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

2
src/views/system/loginlog/index.vue

@ -126,7 +126,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await LoginLogApi.exportLoginLog(queryParams) const data = await LoginLogApi.exportLoginLog(queryParams)
download.excel(data, '登录日志.xls') download.excel(data, '登录日志.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

2
src/views/system/operatelog/index.vue

@ -145,7 +145,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await OperateLogApi.exportOperateLog(queryParams) const data = await OperateLogApi.exportOperateLog(queryParams)
download.excel(data, '操作日志.xls') download.excel(data, '操作日志.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

2
src/views/system/post/index.vue

@ -143,7 +143,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await PostApi.exportPost(queryParams) const data = await PostApi.exportPost(queryParams)
download.excel(data, '岗位列表.xls') download.excel(data, '岗位列表.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

2
src/views/system/role/index.vue

@ -250,7 +250,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await RoleApi.exportRole(queryParams) const data = await RoleApi.exportRole(queryParams)
download.excel(data, '角色列表.xls') download.excel(data, '角色列表.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

2
src/views/system/sensitiveWord/index.vue

@ -175,7 +175,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await SensitiveWordApi.exportSensitiveWord(queryParams) const data = await SensitiveWordApi.exportSensitiveWord(queryParams)
download.excel(data, '敏感词.xls') download.excel(data, '敏感词.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

2
src/views/system/serialNumber/index.vue

@ -168,7 +168,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await SerialNumberApi.exportSerialNumber(queryParams) const data = await SerialNumberApi.exportSerialNumber(queryParams)
download.excel(data, '流水号规则.xls') download.excel(data, '流水号规则.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

2
src/views/system/sms/log/index.vue

@ -171,7 +171,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await SmsLogApi.exportSmsLog(queryParams) const data = await SmsLogApi.exportSmsLog(queryParams)
download.excel(data, '短信日志.xls') download.excel(data, '短信日志.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

2
src/views/system/sms/template/index.vue

@ -197,7 +197,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await SmsTemplateApi.exportSmsTemplate(queryParams) const data = await SmsTemplateApi.exportSmsTemplate(queryParams)
download.excel(data, '短信模板.xls') download.excel(data, '短信模板.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

2
src/views/system/tenant/index.vue

@ -177,7 +177,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await TenantApi.exportTenant(queryParams) const data = await TenantApi.exportTenant(queryParams)
download.excel(data, '租户列表.xls') download.excel(data, '租户列表.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

2
src/views/system/user/UserImportForm.vue

@ -130,6 +130,6 @@ const importTemplate = async () => {
console.log(await UserApi.importUserTemplate()); console.log(await UserApi.importUserTemplate());
const res = await UserApi.importUserTemplate() const res = await UserApi.importUserTemplate()
download.excel(res, '用户导入模版.xls') download.excel(res, '用户导入模版.xlsx')
} }
</script> </script>

2
src/views/system/user/index.vue

@ -195,7 +195,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await UserApi.exportUser(queryParams) const data = await UserApi.exportUser(queryParams)
download.excel(data, '用户数据.xls') download.excel(data, '用户数据.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

4
src/views/wms/basicDataManage/labelManage/barbasic/index.vue

@ -191,7 +191,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await BarbasicApi.exportBarbasic(setSearchParams) const data = await BarbasicApi.exportBarbasic(setSearchParams)
download.excel(data, '条码实体基类.xls') download.excel(data, '条码实体基类.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false
@ -206,7 +206,7 @@ const handleImport = () => {
// //
const importTemplateData = reactive({ const importTemplateData = reactive({
templateUrl: '', templateUrl: '',
templateTitle: '条码实体基类导入模版.xls' templateTitle: '条码实体基类导入模版.xlsx'
}) })
// //
const importSuccess = () => { const importSuccess = () => {

2
src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue

@ -219,7 +219,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await InspectJobMainApi.exportInspectJobMain(setSearchParams) const data = await InspectJobMainApi.exportInspectJobMain(setSearchParams)
download.excel(data, '检验任务主.xls') download.excel(data, '检验任务主.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

2
src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue

@ -144,7 +144,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await InspectRecordMainApi.exportInspectRecordMain(setSearchParams) const data = await InspectRecordMainApi.exportInspectRecordMain(setSearchParams)
download.excel(data, '检验记录主.xls') download.excel(data, '检验记录主.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

2
src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue

@ -307,7 +307,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await InspectRequestMainApi.exportInspectRequestMain(setSearchParams) const data = await InspectRequestMainApi.exportInspectRequestMain(setSearchParams)
download.excel(data, '检验申请主.xls') download.excel(data, '检验申请主.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

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

@ -350,7 +350,7 @@ const handleImport = () => {
// //
const importTemplateData = reactive({ const importTemplateData = reactive({
templateUrl: '', templateUrl: '',
templateTitle: '采购收货申请主导入模版.xls' templateTitle: '采购收货申请主导入模版.xlsx'
}) })
// //

2
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue

@ -219,7 +219,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await PurchasereturnJobMainApi.exportPurchasereturnJobMain(setSearchParams) const data = await PurchasereturnJobMainApi.exportPurchasereturnJobMain(setSearchParams)
download.excel(data, '采购退货任务主.xls') download.excel(data, '采购退货任务主.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

2
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue

@ -142,7 +142,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(setSearchParams) const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(setSearchParams)
download.excel(data, '采购退货记录主.xls') download.excel(data, '采购退货记录主.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

2
src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue

@ -219,7 +219,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await PutawayJobMainApi.exportPutawayJobMain(setSearchParams) const data = await PutawayJobMainApi.exportPutawayJobMain(setSearchParams)
download.excel(data, '上架任务主.xls') download.excel(data, '上架任务主.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

2
src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue

@ -142,7 +142,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await PutawayRecordMainApi.exportPutawayRecordMain(setSearchParams) const data = await PutawayRecordMainApi.exportPutawayRecordMain(setSearchParams)
download.excel(data, '上架记录主.xls') download.excel(data, '上架记录主.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

4
src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue

@ -312,7 +312,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await PutawayRequestMainApi.exportPutawayRequestMain(setSearchParams) const data = await PutawayRequestMainApi.exportPutawayRequestMain(setSearchParams)
download.excel(data, '上架申请主.xls') download.excel(data, '上架申请主.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false
@ -365,7 +365,7 @@ const handleImport = () => {
// //
const importTemplateData = reactive({ const importTemplateData = reactive({
templateUrl: '', templateUrl: '',
templateTitle: '上架申请主导入模版.xls' templateTitle: '上架申请主导入模版.xlsx'
}) })
// //

20
src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts

@ -37,26 +37,6 @@ const userDept = userStore.userSelfInfo.dept
* @returns {Array} * @returns {Array}
*/ */
export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '到货检验记录单号',
field: 'inspectRecordNumber',
sort: 'custom',
table: {
width: 150
},
isSearch: true,
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择到货检验记录单号', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '到货检验信息', // 查询弹窗标题
searchAllSchemas: InspectRequestMain.allSchemas, // 查询弹窗所需类
searchPage: InspectRequestMainApi.getInspectRequestMainPage // 查询弹窗所需分页方法
}
}
},
{ {
label: '从仓库代码', label: '从仓库代码',
field: 'fromWarehouseCode', field: 'fromWarehouseCode',

4
src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue

@ -245,7 +245,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await DemandforecastingMainApi.exportDemandforecastingMain(setSearchParams) const data = await DemandforecastingMainApi.exportDemandforecastingMain(setSearchParams)
download.excel(data, '要货预测主.xls') download.excel(data, '要货预测主.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false
@ -298,7 +298,7 @@ const handleImport = () => {
// //
const importTemplateData = reactive({ const importTemplateData = reactive({
templateUrl: '', templateUrl: '',
templateTitle: '要货预测主导入模版.xls' templateTitle: '要货预测主导入模版.xlsx'
}) })
// //

2
src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue

@ -273,7 +273,7 @@
// //
exportLoading.value = true exportLoading.value = true
const data = await PurchaseMainApi.exportPurchaseMain(setSearchParams) const data = await PurchaseMainApi.exportPurchaseMain(setSearchParams)
download.excel(data, '采购订单主.xls') download.excel(data, '采购订单主.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

4
src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue

@ -323,7 +323,7 @@
// //
exportLoading.value = true exportLoading.value = true
const data = await PurchasePlanMainApi.exportPurchasePlanMain(setSearchParams) const data = await PurchasePlanMainApi.exportPurchasePlanMain(setSearchParams)
download.excel(data, '要货计划主.xls') download.excel(data, '要货计划主.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false
@ -409,7 +409,7 @@
// //
const importTemplateData = reactive({ const importTemplateData = reactive({
templateUrl: '', templateUrl: '',
templateTitle: '要货计划主导入模版.xls' templateTitle: '要货计划主导入模版.xlsx'
}) })
// //

2
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue

@ -144,7 +144,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await SupplierdeliverRecordMainApi.exportSupplierdeliverRecordMain(setSearchParams) const data = await SupplierdeliverRecordMainApi.exportSupplierdeliverRecordMain(setSearchParams)
download.excel(data, '供应商发货记录主.xls') download.excel(data, '供应商发货记录主.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

189
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts

@ -391,57 +391,136 @@ export const SupplierdeliverRecordMainRules = reactive({
* @returns {Array} * @returns {Array}
*/ */
export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
// {
// label: '从包装号',
// field: 'fromPackingNumber',
// sort: 'custom',
// table: {
// width: 150
// },
// },
// {
// label: '到包装号',
// field: 'toPackingNumber',
// sort: 'custom',
// table: {
// width: 150
// },
// },
// {
// label: '从批次',
// field: 'fromBatch',
// sort: 'custom',
// table: {
// width: 150
// },
// },
// {
// label: '到批次',
// field: 'toBatch',
// sort: 'custom',
// table: {
// width: 150
// },
// },
// {
// label: '替代批次',
// field: 'altBatch',
// sort: 'custom',
// table: {
// width: 150
// },
// },
// {
// label: '从器具号',
// field: 'fromContainerNumber',
// sort: 'custom',
// table: {
// width: 150
// },
// },
// {
// label: '到器具号',
// field: 'toContainerNumber',
// sort: 'custom',
// table: {
// width: 150
// },
// },
{
label: '订单号',
field: 'poNumber',
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '从包装号', label: '订单行',
field: 'fromPackingNumber', field: 'poLine',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{ {
label: '到包装号', label: '物品代码',
field: 'toPackingNumber', field: 'itemCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{ {
label: '从批次', label: '数量',
field: 'fromBatch', field: 'qty',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
form: {
component: 'InputNumber',
}
}, },
{ {
label: '到批次', label: '标包数量',
field: 'toBatch', field: 'stdPackQty',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
form: {
component: 'InputNumber',
}
}, },
{ {
label: '替代批次', label: '标包单位',
field: 'altBatch', field: 'stdPackUnit',
dictType: DICT_TYPE.PACK_UNIT,
dictClass: 'string',
isTable: true,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{ {
label: '从器具号', label: '供应商计量数量',
field: 'fromContainerNumber', field: 'supplierQty',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
form: {
component: 'InputNumber',
}
}, },
{ {
label: '到器具号', label: '供应商计量单位',
field: 'toContainerNumber', field: 'supplierUom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -507,66 +586,7 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
} }
}, },
}, },
{
label: '订单号',
field: 'poNumber',
sort: 'custom',
table: {
width: 150
},
},
{
label: '订单行',
field: 'poLine',
sort: 'custom',
table: {
width: 150
},
},
{
label: '标包数量',
field: 'stdPackQty',
sort: 'custom',
table: {
width: 150
},
form: {
component: 'InputNumber',
}
},
{
label: '标包单位',
field: 'stdPackUnit',
dictType: DICT_TYPE.PACK_UNIT,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
},
{
label: '供应商计量数量',
field: 'supplierQty',
sort: 'custom',
table: {
width: 150
},
form: {
component: 'InputNumber',
}
},
{
label: '供应商计量单位',
field: 'supplierUom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '从库位代码', label: '从库位代码',
field: 'fromLocationCode', field: 'fromLocationCode',
@ -631,14 +651,7 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
width: 150 width: 150
}, },
}, },
{
label: '物品代码',
field: 'itemCode',
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '物品名称', label: '物品名称',
field: 'itemName', field: 'itemName',
@ -671,17 +684,7 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
width: 150 width: 150
}, },
}, },
{
label: '数量',
field: 'qty',
sort: 'custom',
table: {
width: 150
},
form: {
component: 'InputNumber',
}
},
{ {
label: '计量单位', label: '计量单位',
field: 'uom', field: 'uom',

13
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@ -109,9 +109,14 @@
if(formField=='ppNumber'){ if(formField=='ppNumber'){
// getBomDisassemble // getBomDisassemble
PurchasePlanDetailApi.getPurchasePlanDetailList({ number: val[0]['number']}).then(res => { if (res) tableData.value = res; tableData.value.forEach(item=>{ item.batch = item.toBatch PurchasePlanDetailApi.getPurchasePlanDetailList({
number: val[0]['number']}).then(res => {
if (res) tableData.value = res;
tableData.value.forEach(item=>{
item.batch = item.toBatch
item.qty = 1 item.qty = 1
}) }).catch(err => { console.log(err) }) })
}).catch(err => { console.log(err) })
} }
formRef.setValues(setV) formRef.setValues(setV)
} }
@ -341,7 +346,7 @@
// //
exportLoading.value = true exportLoading.value = true
const data = await SupplierdeliverRequestMainApi.exportSupplierdeliverRequestMain(setSearchParams) const data = await SupplierdeliverRequestMainApi.exportSupplierdeliverRequestMain(setSearchParams)
download.excel(data, '供应商发货申请主.xls') download.excel(data, '供应商发货申请主.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false
@ -520,7 +525,7 @@
// //
const importTemplateData = reactive({ const importTemplateData = reactive({
templateUrl: '', templateUrl: '',
templateTitle: '供应商发货申请主导入模版.xls' templateTitle: '供应商发货申请主导入模版.xlsx'
}) })
// //

71
src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue

@ -7,19 +7,13 @@
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
<TableHead <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
:HeadButttondata="HeadButttondata" @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
@button-base-click="buttonBaseClick" :allSchemas="PurchaseclaimRequestMain.allSchemas" />
:routeName="routeName"
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="PurchaseclaimRequestMain.allSchemas"
/>
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<Table :columns="tableColumns" :data="tableObject.tableList" <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
:loading="tableObject.loading" :pagination="{
total: tableObject.total total: tableObject.total
}" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage" }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"> v-model:sort="tableObject.sort">
@ -35,36 +29,22 @@
</ContentWrap> </ContentWrap>
<!-- 表单弹窗添加/修改 --> <!-- 表单弹窗添加/修改 -->
<BasicForm <BasicForm ref="formRef" @success="getList" :rules="PurchaseclaimRequestMainRules"
ref="formRef" :formAllSchemas="PurchaseclaimRequestMain.allSchemas" :tableAllSchemas="PurchaseclaimRequestDetail.allSchemas"
@success="getList" :tableFormRules="PurchaseclaimRequestDetailRules" :tableData="tableData"
:rules="PurchaseclaimRequestMainRules"
:formAllSchemas="PurchaseclaimRequestMain.allSchemas"
:tableAllSchemas="PurchaseclaimRequestDetail.allSchemas"
:tableFormRules="PurchaseclaimRequestDetailRules"
:tableData="tableData"
:apiUpdate="PurchaseclaimRequestMainApi.updatePurchaseclaimRequestMain" :apiUpdate="PurchaseclaimRequestMainApi.updatePurchaseclaimRequestMain"
:apiCreate="PurchaseclaimRequestMainApi.createPurchaseclaimRequestMain" :apiCreate="PurchaseclaimRequestMainApi.createPurchaseclaimRequestMain" :isBusiness="true"
:isBusiness="true" @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess"
@handleAddTable="handleAddTable" @submitForm="submitForm" />
@handleDeleteTable="handleDeleteTable"
@searchTableSuccess="searchTableSuccess"
@submitForm="submitForm"
/>
<!-- 详情 --> <!-- 详情 -->
<Detail <Detail ref="detailRef" :isBasic="false" :allSchemas="PurchaseclaimRequestMain.allSchemas"
ref="detailRef" :detailAllSchemas="PurchaseclaimRequestDetail.allSchemas" :detailAllSchemasRules="PurchaseclaimRequestDetailRules"
:isBasic="false"
:allSchemas="PurchaseclaimRequestMain.allSchemas"
:detailAllSchemas="PurchaseclaimRequestDetail.allSchemas"
:detailAllSchemasRules="PurchaseclaimRequestDetailRules"
:apiCreate="PurchaseclaimRequestDetailApi.createPurchaseclaimRequestDetail" :apiCreate="PurchaseclaimRequestDetailApi.createPurchaseclaimRequestDetail"
:apiUpdate="PurchaseclaimRequestDetailApi.updatePurchaseclaimRequestDetail" :apiUpdate="PurchaseclaimRequestDetailApi.updatePurchaseclaimRequestDetail"
:apiPage="PurchaseclaimRequestDetailApi.getPurchaseclaimRequestDetailPage" :apiPage="PurchaseclaimRequestDetailApi.getPurchaseclaimRequestDetailPage"
:apiDelete="PurchaseclaimRequestDetailApi.deletePurchaseclaimRequestDetail" :apiDelete="PurchaseclaimRequestDetailApi.deletePurchaseclaimRequestDetail"
@searchTableSuccessDetail="searchTableSuccessDetail" @searchTableSuccessDetail="searchTableSuccessDetail" />
/>
<!-- 导入 --> <!-- 导入 -->
<ImportForm ref="importFormRef" url="/wms/purchaseclaim-request-main/import" :importTemplateData="importTemplateData" <ImportForm ref="importFormRef" url="/wms/purchaseclaim-request-main/import" :importTemplateData="importTemplateData"
@ -99,8 +79,10 @@ const updataTableColumns = (val) => {
// //
const searchTableSuccess = (formField, searchField, val, formRef, type, row) => { const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
nextTick(() => { nextTick(() => {
if (type == 'tableForm') { if (type == 'tableForm') {
// //
row[formField] = val[0][searchField] row[formField] = val[0][searchField]
row['poLine'] = val[0]['poLine'] row['poLine'] = val[0]['poLine']
@ -117,6 +99,25 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
// //
const setV = {} const setV = {}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
if(formField=='asnNumber'){
// getBomDisassemble
PurchasePlanDetailApi.getPurchasePlanDetailList({
number: val[0]['asnNumber']}).then(res => {
if (res) tableData.value = res;
tableData.value.forEach(item=>{
item.batch = item.toBatch
item.qty = 1
})
}).catch(err => {
console.log(err)
})
}
setV['ppNumber'] = val[0]['ppNumber'] setV['ppNumber'] = val[0]['ppNumber']
setV['supplierCode'] = val[0]['supplierCode'] setV['supplierCode'] = val[0]['supplierCode']
formRef.setValues(setV) formRef.setValues(setV)
@ -125,7 +126,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
} }
// //
const searchTableSuccessDetail = (formField, searchField, val, formRef) => { const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
console.log(456)
nextTick(() => { nextTick(() => {
const setV = {} const setV = {}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
setV['poLine'] = val[0]['poLine'] setV['poLine'] = val[0]['poLine']
@ -314,9 +317,7 @@ const submitForm = async (formType, data) => {
getList() getList()
} finally { } finally {
formRef.value.formLoading = false formRef.value.formLoading = false
} }
} }
/** 导入 */ /** 导入 */

Loading…
Cancel
Save