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. 289
      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
const data = await ApiAccessLogApi.exportApiAccessLog(queryParams)
download.excel(data, 'API 访问日志.xls')
download.excel(data, 'API 访问日志.xlsx')
} catch {
} finally {
exportLoading.value = false

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -312,7 +312,7 @@ const handleExport = async () => {
//
exportLoading.value = true
const data = await PutawayRequestMainApi.exportPutawayRequestMain(setSearchParams)
download.excel(data, '上架申请主.xls')
download.excel(data, '上架申请主.xlsx')
} catch {
} finally {
exportLoading.value = false
@ -365,7 +365,7 @@ const handleImport = () => {
//
const importTemplateData = reactive({
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}
*/
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: '从仓库代码',
field: 'fromWarehouseCode',

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

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

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

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

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

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

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

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

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

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

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

@ -109,9 +109,14 @@
if(formField=='ppNumber'){
// 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
}) }).catch(err => { console.log(err) })
})
}).catch(err => { console.log(err) })
}
formRef.setValues(setV)
}
@ -341,7 +346,7 @@
//
exportLoading.value = true
const data = await SupplierdeliverRequestMainApi.exportSupplierdeliverRequestMain(setSearchParams)
download.excel(data, '供应商发货申请主.xls')
download.excel(data, '供应商发货申请主.xlsx')
} catch {
} finally {
exportLoading.value = false
@ -520,7 +525,7 @@
//
const importTemplateData = reactive({
templateUrl: '',
templateTitle: '供应商发货申请主导入模版.xls'
templateTitle: '供应商发货申请主导入模版.xlsx'
})
//

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

@ -7,19 +7,13 @@
</ContentWrap>
<!-- 列表头部 -->
<TableHead
:HeadButttondata="HeadButttondata"
@button-base-click="buttonBaseClick"
:routeName="routeName"
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="PurchaseclaimRequestMain.allSchemas"
/>
<TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
@updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
:allSchemas="PurchaseclaimRequestMain.allSchemas" />
<!-- 列表 -->
<ContentWrap>
<Table :columns="tableColumns" :data="tableObject.tableList"
:loading="tableObject.loading" :pagination="{
<Table :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">
@ -35,36 +29,22 @@
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<BasicForm
ref="formRef"
@success="getList"
:rules="PurchaseclaimRequestMainRules"
:formAllSchemas="PurchaseclaimRequestMain.allSchemas"
:tableAllSchemas="PurchaseclaimRequestDetail.allSchemas"
:tableFormRules="PurchaseclaimRequestDetailRules"
:tableData="tableData"
<BasicForm ref="formRef" @success="getList" :rules="PurchaseclaimRequestMainRules"
:formAllSchemas="PurchaseclaimRequestMain.allSchemas" :tableAllSchemas="PurchaseclaimRequestDetail.allSchemas"
:tableFormRules="PurchaseclaimRequestDetailRules" :tableData="tableData"
:apiUpdate="PurchaseclaimRequestMainApi.updatePurchaseclaimRequestMain"
:apiCreate="PurchaseclaimRequestMainApi.createPurchaseclaimRequestMain"
:isBusiness="true"
@handleAddTable="handleAddTable"
@handleDeleteTable="handleDeleteTable"
@searchTableSuccess="searchTableSuccess"
@submitForm="submitForm"
/>
:apiCreate="PurchaseclaimRequestMainApi.createPurchaseclaimRequestMain" :isBusiness="true"
@handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess"
@submitForm="submitForm" />
<!-- 详情 -->
<Detail
ref="detailRef"
:isBasic="false"
:allSchemas="PurchaseclaimRequestMain.allSchemas"
:detailAllSchemas="PurchaseclaimRequestDetail.allSchemas"
:detailAllSchemasRules="PurchaseclaimRequestDetailRules"
<Detail ref="detailRef" :isBasic="false" :allSchemas="PurchaseclaimRequestMain.allSchemas"
:detailAllSchemas="PurchaseclaimRequestDetail.allSchemas" :detailAllSchemasRules="PurchaseclaimRequestDetailRules"
:apiCreate="PurchaseclaimRequestDetailApi.createPurchaseclaimRequestDetail"
:apiUpdate="PurchaseclaimRequestDetailApi.updatePurchaseclaimRequestDetail"
:apiPage="PurchaseclaimRequestDetailApi.getPurchaseclaimRequestDetailPage"
:apiDelete="PurchaseclaimRequestDetailApi.deletePurchaseclaimRequestDetail"
@searchTableSuccessDetail="searchTableSuccessDetail"
/>
@searchTableSuccessDetail="searchTableSuccessDetail" />
<!-- 导入 -->
<ImportForm ref="importFormRef" url="/wms/purchaseclaim-request-main/import" :importTemplateData="importTemplateData"
@ -72,35 +52,37 @@
</template>
<script setup lang="ts">
import { getAccessToken } from '@/utils/auth'
import download from '@/utils/download'
import * as PurchaseclaimRequestMainApi from '@/api/wms/purchaseclaimRequestMain'
import * as PurchaseclaimRequestDetailApi from '@/api/wms/purchaseclaimRequestDetail'
import { PurchaseclaimRequestMain, PurchaseclaimRequestMainRules, PurchaseclaimRequestDetail, PurchaseclaimRequestDetailRules } from './purchaseclaimRequestMain.data'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
import TableHead from '@/components/TableHead/src/TableHead.vue'
//
defineOptions({ name: 'PurchaseclaimRequestMain' })
const message = useMessage() //
const { t } = useI18n() //
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(PurchaseclaimRequestMain.allSchemas.tableColumns)
//
const updataTableColumns = (val) => {
import { getAccessToken } from '@/utils/auth'
import download from '@/utils/download'
import * as PurchaseclaimRequestMainApi from '@/api/wms/purchaseclaimRequestMain'
import * as PurchaseclaimRequestDetailApi from '@/api/wms/purchaseclaimRequestDetail'
import { PurchaseclaimRequestMain, PurchaseclaimRequestMainRules, PurchaseclaimRequestDetail, PurchaseclaimRequestDetailRules } from './purchaseclaimRequestMain.data'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
import TableHead from '@/components/TableHead/src/TableHead.vue'
//
defineOptions({ name: 'PurchaseclaimRequestMain' })
const message = useMessage() //
const { t } = useI18n() //
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(PurchaseclaimRequestMain.allSchemas.tableColumns)
//
const updataTableColumns = (val) => {
tableColumns.value = val
}
}
//
const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
//
const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
nextTick(() => {
if (type == 'tableForm') {
//
row[formField] = val[0][searchField]
row['poLine'] = val[0]['poLine']
@ -117,15 +99,36 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
//
const setV = {}
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['supplierCode'] = val[0]['supplierCode']
formRef.setValues(setV)
}
})
}
//
const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
}
//
const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
console.log(456)
nextTick(() => {
const setV = {}
setV[formField] = val[0][searchField]
setV['poLine'] = val[0]['poLine']
@ -140,17 +143,17 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
setV['uom'] = val[0]['uom']
formRef.setValues(setV)
})
}
}
const exportLoading = ref(false) //
const { tableObject, tableMethods } = useTable({
const exportLoading = ref(false) //
const { tableObject, tableMethods } = useTable({
getListApi: PurchaseclaimRequestMainApi.getPurchaseclaimRequestMainPage //
})
})
//
const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
//
const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchaseclaim-request-main:create' }), //
defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchaseclaim-request-main:import' }), //
defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchaseclaim-request-main:export' }), //
@ -165,10 +168,10 @@ const HeadButttondata = [
// icon: 'Select',
// color: ''
// },
]
]
//
const buttonBaseClick = (val, item) => {
//
const buttonBaseClick = (val, item) => {
if (val == 'add') { //
openForm('create')
} else if (val == 'import') { //
@ -181,33 +184,33 @@ const buttonBaseClick = (val, item) => {
} else { //
console.log('其他按钮', item)
}
}
}
// -
const buttondata = (row) => {
// -
const buttondata = (row) => {
return [
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), //
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5'])}), //
defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2'])}), //
defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), //
defaultButtons.mainListEditBtn({ hide:isShowMainButton(row,['1']),hasPermi: 'wms:purchaseclaim-request-main:update' }), //
defaultButtons.mainListDeleteBtn({ hide:isShowMainButton(row,['1']),hasPermi: 'wms:purchaseclaim-request-main:delete' }), //
defaultButtons.mainListCloseBtn({ hide: isShowMainButton(row, ['1', '2', '3', '4', '6']) }), //
defaultButtons.mainListReAddBtn({ hide: isShowMainButton(row, ['4', '5']) }), //
defaultButtons.mainListSubmitBtn({ hide: isShowMainButton(row, ['1']) }), //
defaultButtons.mainListTurnDownBtn({ hide: isShowMainButton(row, ['2']) }), //
defaultButtons.mainListApproveBtn({ hide: isShowMainButton(row, ['2']) }), //
defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchaseclaim-request-main:update' }), //
defaultButtons.mainListDeleteBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchaseclaim-request-main:delete' }), //
defaultButtons.mainListPointBtn(null), //
]
}
}
//
const isShowMainButton = (row,val) => {
//
const isShowMainButton = (row, val) => {
if (val.indexOf(row.status) > -1) {
return false
} else {
return true
}
}
}
// -
const buttonTableClick = async (val, row) => {
// -
const buttonTableClick = async (val, row) => {
if (val == 'mainClose') { //
console.log('列表-操作按钮事件-关闭')
} else if (val == 'mainReAdd') { //
@ -226,27 +229,27 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'point') { //
handlePoint(row.id)
}
}
}
/** 添加/修改操作 */
const formRef = ref()
const openForm =async (type: string, row?: number) => {
/** 添加/修改操作 */
const formRef = ref()
const openForm = async (type : string, row ?: number) => {
tableData.value = [] //
//  if (row?.id) {
// const data= await PurchaseclaimRequestMainApi.getPurchaseclaimRequestMain(row.id)
// tableData.value = data.subList
// }
formRef.value.open(type, row)
}
}
/** 详情操作 */
const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
/** 详情操作 */
const detailRef = ref()
const openDetail = (row : any, titleName : any, titleValue : any) => {
detailRef.value.openDetail(row, titleName, titleValue)
}
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
/** 删除按钮操作 */
const handleDelete = async (id : number) => {
try {
//
await message.delConfirm()
@ -256,10 +259,10 @@ const handleDelete = async (id: number) => {
//
await getList()
} catch { }
}
}
/** 导出按钮操作 */
const handleExport = async () => {
/** 导出按钮操作 */
const handleExport = async () => {
try {
//
await message.exportConfirm()
@ -271,35 +274,35 @@ const handleExport = async () => {
} finally {
exportLoading.value = false
}
}
const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
const src = ref(BASE_URL + '/jmreport/view/882550592342003712?token=' + getAccessToken())
console.log(src)
//
const handlePoint = async (id) => {
window.open(src.value+'&id='+id)
}
/**
}
const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
const src = ref(BASE_URL + '/jmreport/view/882550592342003712?token=' + getAccessToken())
console.log(src)
//
const handlePoint = async (id) => {
window.open(src.value + '&id=' + id)
}
/**
* tableForm方法
*/
const tableFormKeys = {}
PurchaseclaimRequestDetail.allSchemas.tableFormColumns.forEach(item => {
*/
const tableFormKeys = {}
PurchaseclaimRequestDetail.allSchemas.tableFormColumns.forEach(item => {
tableFormKeys[item.field] = item.default ? item.default : ''
})
const tableData = ref([])
})
const tableData = ref([])
//
const handleAddTable = () => {
//
const handleAddTable = () => {
tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
}
//
const handleDeleteTable = (item, index) => {
}
//
const handleDeleteTable = (item, index) => {
tableData.value.splice(index, 1)
}
}
//
const submitForm = async (formType, data) => {
//
const submitForm = async (formType, data) => {
data.subList = tableData.value //
try {
if (formType === 'create') {
@ -314,37 +317,35 @@ const submitForm = async (formType, data) => {
getList()
} finally {
formRef.value.formLoading = false
}
}
}
/** 导入 */
const importFormRef = ref()
const handleImport = () => {
/** 导入 */
const importFormRef = ref()
const handleImport = () => {
importFormRef.value.open()
}
//
const importTemplateData = reactive({
}
//
const importTemplateData = reactive({
templateUrl: '',
templateTitle: '采购索赔申请信息导入模版.xlsx'
})
//
const importSuccess = () => {
})
//
const importSuccess = () => {
getList()
}
//
const searchFormClick = (searchData) => {
}
//
const searchFormClick = (searchData) => {
tableObject.params = {
isSearch: true,
filters: searchData.filters
}
getList() //
}
}
/** 初始化 **/
onMounted(async () => {
/** 初始化 **/
onMounted(async () => {
getList()
importTemplateData.templateUrl = await PurchaseclaimRequestMainApi.importTemplate()
})
})
</script>

Loading…
Cancel
Save