sfms3.0
/
sfms3.0-ui
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
zhaoxuebing 11 months ago
parent
508346f0b0 12c5c5aa91
commit
7fe57e7bfd
29 changed files with 1868 additions and 808 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/api/wms/inventorymoveJobMain/index.ts
  2. 30
      src/api/wms/inventorymoveRequestMain/index.ts
  3. 26
      src/api/wms/purchaseclaimRequestMain/index.ts
  4. 7
      src/api/wms/supplierdeliverRecordDetail/index.ts
  5. 5
      src/api/wms/supplierinvoiceRequestMain/index.ts
  6. 2
      src/components/BasicForm/src/BasicForm.vue
  7. 2
      src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
  8. 332
      src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
  9. 722
      src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
  10. 2
      src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
  11. 388
      src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
  12. 2
      src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
  13. 251
      src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
  14. 14
      src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
  15. 8
      src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
  16. 26
      src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
  17. 240
      src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue
  18. 4
      src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
  19. 73
      src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
  20. 31
      src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
  21. 91
      src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
  22. 123
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
  23. 44
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
  24. 4
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
  25. 2
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
  26. 30
      src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/purchaseclaimRecordMain.data.ts
  27. 143
      src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
  28. 30
      src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
  29. 24
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

20
src/api/wms/inventorymoveJobMain/index.ts
View File

@ -80,4 +80,24 @@ export const exportInventorymoveJobMain = async (params) => {
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/inventorymove-job-main/get-import-template' }) return request.download({ url: '/wms/inventorymove-job-main/get-import-template' })
}
// 承接库存转移任务
export const acceptInventorymoveMain = async (id) => {
return await request.put({ url: `/wms/inventorymove-job-main/accept?id=` + id })
}
// 放弃库存转移任务
export const abandonInventorymoveMain = async (id) => {
return await request.put({ url: `/wms/inventorymove-job-main/abandon?id=` + id })
}
// 关闭库存转移任务
export const closeInventorymoveMain = async (id) => {
return await request.put({ url: `/wms/inventorymove-job-main/close?id=` + id })
}
// 执行库存转移任务
export const executeInventorymoveMain = async (data) => {
return await request.put({ url: `/wms/inventorymove-job-main/execute`, data})
} }

30
src/api/wms/inventorymoveRequestMain/index.ts
View File

@ -64,4 +64,34 @@ export const exportInventorymoveRequestMain = async (params) => {
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/inventorymove-request-main/get-import-template' }) return request.download({ url: '/wms/inventorymove-request-main/get-import-template' })
}
// 关闭
export const close = (id) => {
return request.put({ url: '/wms/inventorymove-request-main/close?id=' + id })
}
// 重新添加
export const reAdd = (id) => {
return request.put({ url: '/wms/inventorymove-request-main/reAdd?id=' + id })
}
// 提交审批
export const submit = (id) => {
return request.put({ url: '/wms/inventorymove-request-main/submit?id=' + id })
}
// 驳回
export const refused = (id) => {
return request.put({ url: '/wms/inventorymove-request-main/refused?id=' + id })
}
// 审批通过
export const agree = (id) => {
return request.put({ url: '/wms/inventorymove-request-main/agree?id=' + id })
}
// 处理
export const handle = (id) => {
return request.put({ url: '/wms/inventorymove-request-main/handle?id=' + id })
} }

26
src/api/wms/purchaseclaimRequestMain/index.ts
View File

@ -51,6 +51,30 @@ export const deletePurchaseclaimRequestMain = async (id: number) => {
return await request.delete({ url: `/wms/purchaseclaim-request-main/delete?id=` + id }) return await request.delete({ url: `/wms/purchaseclaim-request-main/delete?id=` + id })
} }
// 打开供应商发货申请主
export const opePurchaseclaimRequestMain = async (id: number) => {
return await request.post({ url: `/wms/purchaseclaim-request-main/open?id=` + id })
}
// 关闭供应商发货申请主
export const cloPurchaseclaimRequestMain = async (id: number) => {
return await request.post({ url: `/wms/purchaseclaim-request-main/close?id=` + id })
}
// 提交审批供应商发货申请主
export const subPurchaseclaimRequestMain = async (id: number) => {
return await request.post({ url: `/wms/purchaseclaim-request-main/sub?id=` + id })
}
// 审批通过供应商发货申请主
export const appPurchaseclaimRequestMain = async (id: number) => {
return await request.post({ url: `/wms/purchaseclaim-request-main/app?id=` + id })
}
// 驳回供应商发货申请主
export const rejPurchaseclaimRequestMain = async (id: number) => {
return await request.post({ url: `/wms/purchaseclaim-request-main/rej?id=` + id })
}
// 处理
export const genRecordsPurchaseclaimRequestMain = async (id) => {
return await request.post({ url: `/wms/purchaseclaim-request-main/genRecords?id=` + id })
}
// 导出采购索赔申请主 Excel // 导出采购索赔申请主 Excel
export const exportPurchaseclaimRequestMain = async (params) => { export const exportPurchaseclaimRequestMain = async (params) => {
return await request.download({ url: `/wms/purchaseclaim-request-main/export-excel`, params }) return await request.download({ url: `/wms/purchaseclaim-request-main/export-excel`, params })
@ -59,4 +83,4 @@ export const exportPurchaseclaimRequestMain = async (params) => {
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/purchaseclaim-request-main/get-import-template' }) return request.download({ url: '/wms/purchaseclaim-request-main/get-import-template' })
} }

7
src/api/wms/supplierdeliverRecordDetail/index.ts
View File

@ -51,6 +51,11 @@ export const getSupplierdeliverRecordDetailPage = async (params) => {
} }
} }
// 查询采供应商发货记录子列表
export const getSupplierdeliverRecordDetailList = async (params) => {
return await request.get({ url: `/wms/supplierdeliver-record-detail/allList`, params })
}
// 查询供应商发货记录子详情 // 查询供应商发货记录子详情
export const getSupplierdeliverRecordDetail = async (id: number) => { export const getSupplierdeliverRecordDetail = async (id: number) => {
return await request.get({ url: `/wms/supplierdeliver-record-detail/get?id=` + id }) return await request.get({ url: `/wms/supplierdeliver-record-detail/get?id=` + id })
@ -79,4 +84,4 @@ export const exportSupplierdeliverRecordDetail = async (params) => {
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/supplierdeliver-record-detail/get-import-template' }) return request.download({ url: '/wms/supplierdeliver-record-detail/get-import-template' })
} }

5
src/api/wms/supplierinvoiceRequestMain/index.ts
View File

@ -55,8 +55,3 @@ export const deleteSupplierinvoiceRequestMain = async (id: number) => {
export const exportSupplierinvoiceRequestMain = async (params) => { export const exportSupplierinvoiceRequestMain = async (params) => {
return await request.download({ url: `/wms/supplierinvoice-request-main/export-excel`, params }) return await request.download({ url: `/wms/supplierinvoice-request-main/export-excel`, params })
} }
// 下载用户导入模板
export const importTemplate = () => {
return request.download({ url: '/wms/supplierinvoice-request-main/get-import-template' })
}

2
src/components/BasicForm/src/BasicForm.vue
View File

@ -233,7 +233,6 @@ const formRef = ref() // 表单 Ref
const formSchema = ref(props.formAllSchemas?.formSchema) const formSchema = ref(props.formAllSchemas?.formSchema)
const tableAllSchemas = ref(props.tableAllSchemas) const tableAllSchemas = ref(props.tableAllSchemas)
const tableFormRules = ref(props.tableFormRules) const tableFormRules = ref(props.tableFormRules)
console.log('fromeWhere', props.fromeWhere)
// 列表-按钮 // 列表-按钮
const buttondata = [ const buttondata = [
@ -396,6 +395,7 @@ const submitForm = async () => {
// 主子表——提交请求 // 主子表——提交请求
try { try {
const data = unref(formRef)?.formModel const data = unref(formRef)?.formModel
console.log('data',data)
emit('submitForm', formType.value, data) emit('submitForm', formType.value, data)
} finally { } finally {
} }

2
src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
View File

@ -106,6 +106,8 @@
placeholder="请选择供应商" placeholder="请选择供应商"
style="flex: 1" style="flex: 1"
clearable clearable
multiple
collapse-tags
> >
<el-option <el-option
v-for="cur in options.supplierList" v-for="cur in options.supplierList"

332
src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
View File

@ -1,15 +1,26 @@
<!-- 批次策略弹窗 --> <!-- 批次策略弹窗 -->
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width:800px;"> <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 800px">
<div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;"> <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
<el-form ref="formRef" :model="formData" :rules="rules" label-width="120px" label-position="left"> <el-form
ref="formRef"
:model="formData"
:rules="rules"
label-width="120px"
label-position="left"
>
<!-- 规则 --> <!-- 规则 -->
<div class="item"> <div class="item">
<div class="title">规则</div> <div class="title">规则</div>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="代码" prop="strategyCode"> <el-form-item label="代码" prop="strategyCode">
<el-input v-model="formData.strategyCode" placeholder="请输入代码" clearable disabled /> <el-input
v-model="formData.strategyCode"
placeholder="请输入代码"
clearable
disabled
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@ -42,47 +53,127 @@
<el-col :span="24" v-for="(item, index) in formData.condition" :key="index"> <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
<!-- 选择供应商和客户 --> <!-- 选择供应商和客户 -->
<el-form-item label="" label-width="0" class="err-240" v-if="index == 0"> <el-form-item label="" label-width="0" class="err-240" v-if="index == 0">
<el-select v-model="item.ParamCode" placeholder="" style="width: 110px;margin-right: 10px;" <el-select
@change="changeSupplierCustomer"> v-model="item.ParamCode"
<el-option :label="cur.label" :value="cur.value" v-for="(cur, index) in options.typeOptions" placeholder=""
:key="index" /> style="width: 110px; margin-right: 10px"
@change="changeSupplierCustomer"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="(cur, index) in options.typeOptions"
:key="index"
/>
</el-select> </el-select>
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;"> <el-select
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1" v-model="item.Operator"
:key="cur.value" /> placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="cur.value"
/>
</el-select> </el-select>
<el-select v-model="item.Value" :placeholder="`请选择${item.ParamCode == 'SupplierCode' ? '供应商' : '客户'}`" <el-select
style="flex: 1;" clearable> v-model="item.Value"
<el-option v-for="cur in options.supplierList" :key="cur.id" :label="cur.name" :value="cur.id" /> :placeholder="`请选择${item.ParamCode == 'SupplierCode' ? '供应商' : '客户'}`"
style="flex: 1"
clearable
multiple
collapse-tags
>
<el-option
v-for="cur in options.supplierList"
:key="cur.id"
:label="cur.name"
:value="cur.id"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- 选择物品类型 --> <!-- 选择物品类型 -->
<el-form-item label="" label-width="0" class="err-240" v-if="index == 1"> <el-form-item label="" label-width="0" class="err-240" v-if="index == 1">
<el-select v-model="item.ParamCode" placeholder="" @change="changeItemsType" <el-select
style="width: 110px;margin-right: 10px;"> v-model="item.ParamCode"
<el-option :label="item.label" :value="item.value" v-for="item in options.itemTypeOptions" placeholder=""
:key="item.value" /> @change="changeItemsType"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="item.label"
:value="item.value"
v-for="item in options.itemTypeOptions"
:key="item.value"
/>
</el-select> </el-select>
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;"> <el-select
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1" v-model="item.Operator"
:key="cur.value" /> placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="cur.value"
/>
</el-select> </el-select>
<el-select v-model="item.Value" placeholder="请选择物品类型" style="flex: 1;" clearable <el-select
v-if="item.ParamCode == 'ItemType'"> v-model="item.Value"
<el-option v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)" :key="cur.value" :label="cur.label" placeholder="请选择物品类型"
:value="cur.value" /> style="flex: 1"
clearable
multiple
collapse-tags
v-if="item.ParamCode == 'ItemType'"
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)"
:key="cur.value"
:label="cur.label"
:value="cur.value"
/>
</el-select> </el-select>
<el-select v-model="item.Value" placeholder="请选择ABC类" style="flex: 1;" clearable <el-select
v-else-if="item.ParamCode == 'AbcClass'"> v-model="item.Value"
<el-option v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)" :key="cur.value" :label="cur.label" placeholder="请选择ABC类"
:value="cur.value" /> style="flex: 1"
clearable
multiple
collapse-tags
v-else-if="item.ParamCode == 'AbcClass'"
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)"
:key="cur.value"
:label="cur.label"
:value="cur.value"
/>
</el-select> </el-select>
<el-input v-model="item.Value" placeholder="请输入物品分组" clearable style="flex: 1;" <el-input
v-else-if="item.ParamCode == 'ItemGroup'" /> v-model="item.Value"
<el-input v-model="item.Value" placeholder="请输入项目" clearable style="flex: 1;" placeholder="请输入物品分组，多个物品分组以逗号分隔"
v-else-if="item.ParamCode == 'Project'" /> clearable
<el-input v-model="item.Value" placeholder="请输入物品" clearable style="flex: 1;" style="flex: 1"
v-else-if="item.ParamCode == 'ItemCode'" /> v-else-if="item.ParamCode == 'ItemGroup'"
/>
<el-input
v-model="item.Value"
placeholder="请输入项目，多个项目以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'Project'"
/>
<el-input
v-model="item.Value"
placeholder="请输入物品，多个物品以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'ItemCode'"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -94,37 +185,61 @@
<el-col :span="24"> <el-col :span="24">
<!-- 存储类型 --> <!-- 存储类型 -->
<el-form-item label="" label-width="0" class="flex-top" prop="configurationRules"> <el-form-item label="" label-width="0" class="flex-top" prop="configurationRules">
<div style="width: 100%;display:flex;align-items:center;margin-bottom:10px" <div
v-for="(cur, key) in formData.configuration.ManagementPrecision" :key="key"> style="width: 100%; display: flex; align-items: center; margin-bottom: 10px"
<div style="width: 26px;display: flex;"> v-for="(cur, key) in formData.configuration.ManagementPrecision"
<Icon icon="ep:remove" color="#757575" size="26" style="cursor: pointer;" :key="key"
@click="handleDeleteTable(formData.configuration.ManagementPrecision, cur, key)" v-if="formData?.configuration?.ManagementPrecision?.length > 1" /> >
<div style="width: 26px; display: flex">
<Icon
icon="ep:remove"
color="#757575"
size="26"
style="cursor: pointer"
@click="
handleDeleteTable(formData.configuration.ManagementPrecision, cur, key)
"
v-if="formData?.configuration?.ManagementPrecision?.length > 1"
/>
</div> </div>
<div class="flex w-[28%]"> <div class="flex w-[28%]">
<div class="ml-10px mr-10px">批次类型</div> <div class="ml-10px mr-10px">批次类型</div>
<el-select v-model="cur.BatchType" placeholder="请选择批次类型" style="flex:1"> <el-select v-model="cur.BatchType" placeholder="请选择批次类型" style="flex: 1">
<el-option v-for="it in getStrDictOptions(DICT_TYPE.BATCH_TYPE)" :key="it.value" :label="it.label" <el-option
:value="it.value" /> v-for="it in getStrDictOptions(DICT_TYPE.BATCH_TYPE)"
:key="it.value"
:label="it.label"
:value="it.value"
/>
</el-select> </el-select>
</div> </div>
<div class="flex w-[28%]"> <div class="flex w-[28%]">
<div class="ml-10px mr-10px">批次格式</div> <div class="ml-10px mr-10px">批次格式</div>
<el-input v-model="cur.BatchFormat" placeholder="yyyyMMDD" clearable style="flex:1" <el-input
@blur="inputBlur" /> v-model="cur.BatchFormat"
placeholder="yyyyMMDD"
clearable
style="flex: 1"
@blur="inputBlur"
/>
</div> </div>
<div class="flex" style="flex:1"> <div class="flex" style="flex: 1">
<div class="ml-10px mr-10px">批次方向</div> <div class="ml-10px mr-10px">批次方向</div>
<div class="checkbox"> <div class="checkbox">
<el-radio-group v-model="cur.BatchDirection"> <el-radio-group v-model="cur.BatchDirection">
<el-radio :label="cur.value" v-for="cur in getStrDictOptions(DICT_TYPE.BATCH_DIRECTION)" <el-radio
:key="cur.value">{{ cur.label }}</el-radio> :label="cur.value"
v-for="cur in getStrDictOptions(DICT_TYPE.BATCH_DIRECTION)"
:key="cur.value"
>{{ cur.label }}</el-radio
>
</el-radio-group> </el-radio-group>
</div> </div>
</div> </div>
</div> </div>
<div class="button flex"> <div class="button flex">
<div @click="handleAddTable(formData.configuration.ManagementPrecision)"> <div @click="handleAddTable(formData.configuration.ManagementPrecision)">
<Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer;" /> <Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer" />
<div>添加条件</div> <div>添加条件</div>
</div> </div>
</div> </div>
@ -158,33 +273,33 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
const formType = ref('') // 表单的类型：create - 新增；update - 修改 const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formRef = ref() // 表单 Ref const formRef = ref() // 表单 Ref
const formStrategyCode = ref('') const formStrategyCode = ref('')
// form表单数据 // form表单数据
const formData = ref({ const formData = ref({
id: '', id: '',
strategyCode: formStrategyCode.value,//策略代码id strategyCode: formStrategyCode.value, //策略代码id
name: '',//名称 name: '', //名称
description: '',//描述 description: '', //描述
priority: '',//优先级 priority: '', //优先级
status: true,//状态 status: true, //状态
//规则条件集合 //规则条件集合
condition: [ condition: [
// 供应商 // 供应商
{ ParamCode: 'SupplierCode', Operator: "IN", Value: "" }, { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
// 物品类型/物品分组/物品/abc类/项目/ // 物品类型/物品分组/物品/abc类/项目/
{ ParamCode: 'ItemType', Operator: "IN", Value: "" }, { ParamCode: 'ItemType', Operator: 'IN', Value: '' }
], ],
configuration: { configuration: {
// 管理精度 // 管理精度
ManagementPrecision:[{ ManagementPrecision: [
BatchType: 'ARRIVE_TIME', {
BatchFormat: '', BatchType: 'ARRIVE_TIME',
BatchDirection: 'ASC', BatchFormat: '',
}] BatchDirection: 'ASC'
}
]
}, },
configurationRules: '1'//规则配置验证 configurationRules: '1' //规则配置验证
}) })
// 验证规则 // 验证规则
const rules = ref({ const rules = ref({
@ -192,8 +307,7 @@ const rules = ref({
name: [{ required: true, message: '请输入名字', trigger: 'blur' }], name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
description: [{ required: true, message: '请输入描述', trigger: 'blur' }], description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }], priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
configurationRules: [{ required: true, message: '规则配置请填写完全', trigger: 'blur' }], configurationRules: [{ required: true, message: '规则配置请填写完全', trigger: 'blur' }]
}) })
// 所有的范围类型 // 所有的范围类型
@ -207,11 +321,11 @@ const rangeOptions = [
{ value: 'IN', label: '包含' }, { value: 'IN', label: '包含' },
{ value: 'NOT IN', label: '不包含' }, { value: 'NOT IN', label: '不包含' },
{ value: 'NULL', label: '为空' }, { value: 'NULL', label: '为空' },
{ value: 'NOT NULL', label: '不为空' }, { value: 'NOT NULL', label: '不为空' }
] ]
const formatRangeOptions = (...rest) => { const formatRangeOptions = (...rest) => {
// 交集 // 交集
let result = rangeOptions.filter(aItem => rest.some(bItem => aItem.value === bItem)); let result = rangeOptions.filter((aItem) => rest.some((bItem) => aItem.value === bItem))
return result return result
} }
@ -221,12 +335,20 @@ const options = reactive({
rangeOptions1: formatRangeOptions('IN', 'NOT IN'), rangeOptions1: formatRangeOptions('IN', 'NOT IN'),
rangeOptions2: formatRangeOptions('IN'), rangeOptions2: formatRangeOptions('IN'),
// 供应商客户下拉框列表 // 供应商客户下拉框列表
typeOptions: [{ value: 'SupplierCode', label: '供应商' }, { value: 'CustomerCode', label: '客户' }], typeOptions: [
{ value: 'SupplierCode', label: '供应商' },
{ value: 'CustomerCode', label: '客户' }
],
//供应商列表 //供应商列表
supplierList: [], supplierList: [],
// 物品类型列表 // 物品类型列表
itemTypeOptions: [{ value: 'ItemType', label: '物品类型' }, { value: 'ItemGroup', label: '物品分组' }, { value: 'ItemCode', label: '物品' }, { value: 'Project', label: '项目' }, { value: 'AbcClass', label: 'ABC类' }], itemTypeOptions: [
{ value: 'ItemType', label: '物品类型' },
{ value: 'ItemGroup', label: '物品分组' },
{ value: 'ItemCode', label: '物品' },
{ value: 'Project', label: '项目' },
{ value: 'AbcClass', label: 'ABC类' }
]
}) })
// 弹窗按钮 // 弹窗按钮
const Butttondata = ref([ const Butttondata = ref([
@ -246,11 +368,11 @@ const buttonBaseClick = (val, item) => {
} }
// 获取供应商列表 // 获取供应商列表
const getFormSupplierList = async () => { const getFormSupplierList = async () => {
options.supplierList = await getSupplierList(); options.supplierList = await getSupplierList()
} }
// 获取客户列表 // 获取客户列表
const getFormCustomerList = async () => { const getFormCustomerList = async () => {
options.supplierList = await getCustomerList(); options.supplierList = await getCustomerList()
} }
// 选择客户还是承运商 // 选择客户还是承运商
const changeSupplierCustomer = (e) => { const changeSupplierCustomer = (e) => {
@ -287,7 +409,7 @@ const open = async (type: string, strategyCode: string, id?: number) => {
formData.value.status = data.status == 0 ? true : false formData.value.status = data.status == 0 ? true : false
if (formData.value.priority == 0) { if (formData.value.priority == 0) {
Butttondata.value = [ Butttondata.value = [
defaultButtons.formSaveBtn({disabled:true}), // 保存 defaultButtons.formSaveBtn({ disabled: true }), // 保存
defaultButtons.formCloseBtn(null) // 关闭 defaultButtons.formCloseBtn(null) // 关闭
] ]
} else { } else {
@ -328,7 +450,7 @@ const submitForm = async () => {
if (!formRef) return if (!formRef) return
const valid = await formRef.value.validate() const valid = await formRef.value.validate()
if (!valid) return if (!valid) return
if(formData.value.priority == 0){ if (formData.value.priority == 0) {
message.error('优先级不可以为0') message.error('优先级不可以为0')
return return
} }
@ -337,11 +459,11 @@ const submitForm = async () => {
try { try {
let data = { let data = {
id: formData.value.id, id: formData.value.id,
strategyCode: formData.value.strategyCode,//策略代码 strategyCode: formData.value.strategyCode, //策略代码
name: formData.value.name,//名称 name: formData.value.name, //名称
description: formData.value.description,//描述 description: formData.value.description, //描述
priority: formData.value.priority,//优先级 priority: formData.value.priority, //优先级
status: formData.value.status ? 0 : 1,//状态 status: formData.value.status ? 0 : 1, //状态
//规则条件集合 //规则条件集合
condition: JSON.stringify(formData.value.condition), condition: JSON.stringify(formData.value.condition),
configuration: JSON.stringify(formData.value.configuration) configuration: JSON.stringify(formData.value.configuration)
@ -365,27 +487,29 @@ const submitForm = async () => {
const resetForm = () => { const resetForm = () => {
formData.value = { formData.value = {
id: '', id: '',
strategyCode: formStrategyCode.value,//策略代码id strategyCode: formStrategyCode.value, //策略代码id
name: '',//名称 name: '', //名称
description: '',//描述 description: '', //描述
priority: '',//优先级 priority: '', //优先级
status: true,//状态 status: true, //状态
//规则条件集合 //规则条件集合
condition: [ condition: [
// 供应商 // 供应商
{ ParamCode: 'SupplierCode', Operator: "IN", Value: "" }, { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
// 物品类型/物品分组/物品/abc类/项目/ // 物品类型/物品分组/物品/abc类/项目/
{ ParamCode: 'ItemType', Operator: "IN", Value: "" }, { ParamCode: 'ItemType', Operator: 'IN', Value: '' }
], ],
configuration: { configuration: {
// 管理精度 // 管理精度
ManagementPrecision:[{ ManagementPrecision: [
BatchType: 'ARRIVE_TIME', {
BatchFormat: '', BatchType: 'ARRIVE_TIME',
BatchDirection: 'ASC', BatchFormat: '',
}] BatchDirection: 'ASC'
}
]
}, },
configurationRules: '1'//规则配置验证 configurationRules: '1' //规则配置验证
} }
} }
@ -394,7 +518,7 @@ const handleAddTable = (item) => {
item.push({ item.push({
BatchType: 'ARRIVE_TIME', BatchType: 'ARRIVE_TIME',
BatchFormat: '', BatchFormat: '',
BatchDirection: 'ASC', BatchDirection: 'ASC'
}) })
} }
// 删除规则配置 // 删除规则配置
@ -404,21 +528,21 @@ const handleDeleteTable = (item, cur, key) => {
//失去焦点的时候验证 //失去焦点的时候验证
const inputBlur = () => { const inputBlur = () => {
let arr = [] let arr = []
formData.value.configuration.ManagementPrecision.forEach(item => { formData.value.configuration.ManagementPrecision.forEach((item) => {
let bol = false let bol = false
if (!item.BatchFormat) { if (!item.BatchFormat) {
bol = false bol = false
} else { } else {
bol = true bol = true
} }
arr.push(bol) arr.push(bol)
}) })
const isEmpty = arr.some(cur => { const isEmpty = arr.some((cur) => {
return !cur return !cur
}) })
if (isEmpty) { if (isEmpty) {
formData.value.configurationRules = '' formData.value.configurationRules = ''
return; return
} else { } else {
formData.value.configurationRules = '1' formData.value.configurationRules = '1'
} }
@ -463,13 +587,13 @@ const inputBlur = () => {
} }
.button { .button {
>div { > div {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
cursor: pointer; cursor: pointer;
>div { > div {
margin-left: 6px; margin-left: 6px;
text-decoration: underline; text-decoration: underline;
color: #409eff; color: #409eff;

722
src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
View File

File diff suppressed because it is too large

2
src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
View File

@ -132,7 +132,7 @@
:key="cur.value" :key="cur.value"
/> />
</el-select> </el-select>
<el-input v-model="item.Value" placeholder="请输入物品" clearable style="flex: 1" /> <el-input v-model="item.Value" placeholder="请输入物品，多个物品以逗号分隔" clearable style="flex: 1" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

388
src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
View File

@ -1,15 +1,26 @@
<!-- 管理精度策略弹窗 --> <!-- 管理精度策略弹窗 -->
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px;"> <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
<div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;"> <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
<el-form ref="formRef" :model="formData" :rules="rules" label-width="120px" label-position="left"> <el-form
ref="formRef"
:model="formData"
:rules="rules"
label-width="120px"
label-position="left"
>
<!-- 规则 --> <!-- 规则 -->
<div class="item"> <div class="item">
<div class="title">规则</div> <div class="title">规则</div>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="代码" prop="strategyCode"> <el-form-item label="代码" prop="strategyCode">
<el-input v-model="formData.strategyCode" placeholder="请输入代码" clearable disabled /> <el-input
v-model="formData.strategyCode"
placeholder="请输入代码"
clearable
disabled
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@ -42,80 +53,226 @@
<el-col :span="24" v-for="(item, index) in formData.condition" :key="index"> <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
<!-- 选择供应商和客户 --> <!-- 选择供应商和客户 -->
<el-form-item label="" label-width="0" class="err-240" v-if="index == 0"> <el-form-item label="" label-width="0" class="err-240" v-if="index == 0">
<el-select v-model="item.ParamCode" placeholder="" style="width: 110px;margin-right: 10px;" <el-select
@change="changeSupplierCustomer"> v-model="item.ParamCode"
<el-option :label="cur.label" :value="cur.value" v-for="(cur, index) in options.typeOptions" placeholder=""
:key="index" /> style="width: 110px; margin-right: 10px"
@change="changeSupplierCustomer"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="(cur, index) in options.typeOptions"
:key="index"
/>
</el-select> </el-select>
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;"> <el-select
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1" v-model="item.Operator"
:key="cur.value" /> placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="cur.value"
/>
</el-select> </el-select>
<el-select v-model="item.Value" :placeholder="`请选择${item.ParamCode == 'SupplierCode' ? '供应商' : '客户'}`" <el-select
style="flex: 1;" clearable> v-model="item.Value"
<el-option v-for="cur in options.supplierList" :key="cur.id" :label="cur.name" :value="cur.id" /> :placeholder="`请选择${item.ParamCode == 'SupplierCode' ? '供应商' : '客户'}`"
style="flex: 1"
clearable
multiple
collapse-tags
>
<el-option
v-for="cur in options.supplierList"
:key="cur.id"
:label="cur.name"
:value="cur.id"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- 选择物品类型 --> <!-- 选择物品类型 -->
<el-form-item label="" label-width="0" class="err-240" v-if="index == 1"> <el-form-item label="" label-width="0" class="err-240" v-if="index == 1">
<el-select v-model="item.ParamCode" placeholder="" @change="changeItemsType" <el-select
style="width: 110px;margin-right: 10px;"> v-model="item.ParamCode"
<el-option :label="item.label" :value="item.value" v-for="item in options.itemTypeOptions" placeholder=""
:key="item.value" /> @change="changeItemsType"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="item.label"
:value="item.value"
v-for="item in options.itemTypeOptions"
:key="item.value"
/>
</el-select> </el-select>
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;"> <el-select
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1" v-model="item.Operator"
:key="cur.value" /> placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="cur.value"
/>
</el-select> </el-select>
<el-select v-model="item.Value" placeholder="请选择物品类型" style="flex: 1;" clearable <el-select
v-if="item.ParamCode == 'ItemType'"> v-model="item.Value"
<el-option v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)" :key="cur.value" :label="cur.label" placeholder="请选择物品类型"
:value="cur.value" /> style="flex: 1"
clearable
multiple
collapse-tags
v-if="item.ParamCode == 'ItemType'"
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)"
:key="cur.value"
:label="cur.label"
:value="cur.value"
/>
</el-select> </el-select>
<el-select v-model="item.Value" placeholder="请选择ABC类" style="flex: 1;" clearable <el-select
v-else-if="item.ParamCode == 'AbcClass'"> v-model="item.Value"
<el-option v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)" :key="cur.value" :label="cur.label" placeholder="请选择ABC类"
:value="cur.value" /> style="flex: 1"
clearable
multiple
collapse-tags
v-else-if="item.ParamCode == 'AbcClass'"
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)"
:key="cur.value"
:label="cur.label"
:value="cur.value"
/>
</el-select> </el-select>
<el-input v-model="item.Value" placeholder="请输入物品分组" clearable style="flex: 1;" <el-input
v-else-if="item.ParamCode == 'ItemGroup'" /> v-model="item.Value"
<el-input v-model="item.Value" placeholder="请输入项目" clearable style="flex: 1;" placeholder="请输入物品分组，多个物品分组以逗号分隔"
v-else-if="item.ParamCode == 'Project'" /> clearable
<el-input v-model="item.Value" placeholder="请输入物品" clearable style="flex: 1;" style="flex: 1"
v-else-if="item.ParamCode == 'ItemCode'" /> v-else-if="item.ParamCode == 'ItemGroup'"
/>
<el-input
v-model="item.Value"
placeholder="请输入项目，多个项目以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'Project'"
/>
<el-input
v-model="item.Value"
placeholder="请输入物品，多个物品以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'ItemCode'"
/>
</el-form-item> </el-form-item>
<!-- 仓库 库区 库位组 库位 --> <!-- 仓库 库区 库位组 库位 -->
<el-form-item label="" label-width="0" class="err-240" v-if="index == 2"> <el-form-item label="" label-width="0" class="err-240" v-if="index == 2">
<el-select v-model="item.ParamCode" placeholder="" style="width: 110px;margin-right: 10px;" <el-select
@change="changeWarehouse"> v-model="item.ParamCode"
<el-option :label="cur.label" :value="cur.value" v-for="(cur, index) in options.warehouseTypeOptions" placeholder=""
:key="index" /> style="width: 110px; margin-right: 10px"
@change="changeWarehouse"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="(cur, index) in options.warehouseTypeOptions"
:key="index"
/>
</el-select> </el-select>
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;"> <el-select
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1" v-model="item.Operator"
:key="cur.value" /> placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="cur.value"
/>
</el-select> </el-select>
<el-select v-model="item.Value" <el-select
:placeholder="`请选择${item.ParamCode == 'WarehouseCode' ? '仓库' : item.ParamCode == 'AreaCode' ? '库区' : item.ParamCode == 'LocationGroupCode' ? '库位组' : item.ParamCode == 'LocationCode' ? '库位' : ''}`" v-model="item.Value"
clearable style="flex: 1;"> :placeholder="`请选择${
<el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" /> item.ParamCode == 'WarehouseCode'
? '仓库'
: item.ParamCode == 'AreaCode'
? '库区'
: item.ParamCode == 'LocationGroupCode'
? '库位组'
: item.ParamCode == 'LocationCode'
? '库位'
: ''
}`"
clearable
multiple
collapse-tags
style="flex: 1"
>
<el-option
v-for="cur in options.warehouseList"
:key="cur.code"
:label="cur.code"
:value="cur.code"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- 忽略物品 --> <!-- 忽略物品 -->
<el-form-item label="忽略物品" class="err-120" v-if="index == 3"> <el-form-item label="忽略物品" class="err-120" v-if="index == 3">
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;"> <el-select
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions2" v-model="item.Operator"
:key="cur.value" /> placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions2"
:key="cur.value"
/>
</el-select> </el-select>
<el-input v-model="item.Value" placeholder="请输入忽略物品" clearable style="flex: 1;" /> <el-input
v-model="item.Value"
placeholder="请输入忽略物品，多个忽略物品以逗号分隔"
clearable
multiple
collapse-tags
style="flex: 1"
/>
</el-form-item> </el-form-item>
<!-- 忽略库位 --> <!-- 忽略库位 -->
<el-form-item label="忽略库位" class="err-120" v-if="index == 4"> <el-form-item label="忽略库位" class="err-120" v-if="index == 4">
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;margin-right: 10px;"> <el-select
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions2" v-model="item.Operator"
:key="cur.value" /> placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions2"
:key="cur.value"
/>
</el-select> </el-select>
<el-input v-model="item.Value" placeholder="请输入忽略库位" clearable style="flex: 1;" /> <el-input
v-model="item.Value"
placeholder="请输入忽略库位，多个忽略库位以逗号分隔"
clearable
multiple
collapse-tags
style="flex: 1"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -129,8 +286,12 @@
<el-form-item label="管理精度"> <el-form-item label="管理精度">
<div class="checkbox"> <div class="checkbox">
<el-radio-group v-model="formData.configuration.ManagementPrecision"> <el-radio-group v-model="formData.configuration.ManagementPrecision">
<el-radio :label="cur.value" v-for="cur in getStrDictOptions(DICT_TYPE.MANAGEMENT_MODE)" <el-radio
:key="cur.value">{{ cur.label }}</el-radio> :label="cur.value"
v-for="cur in getStrDictOptions(DICT_TYPE.MANAGEMENT_MODE)"
:key="cur.value"
>{{ cur.label }}</el-radio
>
</el-radio-group> </el-radio-group>
</div> </div>
</el-form-item> </el-form-item>
@ -167,42 +328,39 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
const formType = ref('') // 表单的类型：create - 新增；update - 修改 const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formRef = ref() // 表单 Ref const formRef = ref() // 表单 Ref
const formStrategyCode = ref('') const formStrategyCode = ref('')
// form表单数据 // form表单数据
const formData = ref({ const formData = ref({
id: '', id: '',
strategyCode: formStrategyCode.value,//策略代码id strategyCode: formStrategyCode.value, //策略代码id
name: '',//名称 name: '', //名称
description: '',//描述 description: '', //描述
priority: '',//优先级 priority: '', //优先级
status: true,//状态 status: true, //状态
//规则条件集合 //规则条件集合
condition: [ condition: [
// 供应商 // 供应商
{ ParamCode: 'SupplierCode', Operator: "IN", Value: "" }, { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
// 物品类型/物品分组/物品/abc类/项目/ // 物品类型/物品分组/物品/abc类/项目/
{ ParamCode: 'ItemType', Operator: "IN", Value: "" }, { ParamCode: 'ItemType', Operator: 'IN', Value: '' },
// 仓库 // 仓库
{ ParamCode: 'LocationCode', Operator: "IN", Value: "" }, { ParamCode: 'LocationCode', Operator: 'IN', Value: '' },
// 忽略物品 // 忽略物品
{ ParamCode: 'IgnoreListOfItem', Operator: "IN", Value: "" }, { ParamCode: 'IgnoreListOfItem', Operator: 'IN', Value: '' },
// 忽略库位 // 忽略库位
{ ParamCode: 'IgnoreListOfLocation', Operator: "IN", Value: "" }, { ParamCode: 'IgnoreListOfLocation', Operator: 'IN', Value: '' }
], ],
configuration: { configuration: {
// 管理精度 // 管理精度
ManagementPrecision:'BY_PACKAGING' ManagementPrecision: 'BY_PACKAGING'
} }
}) })
// 验证规则 // 验证规则
const rules = ref({ const rules = ref({
strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }], strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }],
name: [{ required: true, message: '请输入名字', trigger: 'blur' }], name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
description: [{ required: true, message: '请输入描述', trigger: 'blur' }], description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }], priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
}) })
// 所有的范围类型 // 所有的范围类型
@ -216,11 +374,11 @@ const rangeOptions = [
{ value: 'IN', label: '包含' }, { value: 'IN', label: '包含' },
{ value: 'NOT IN', label: '不包含' }, { value: 'NOT IN', label: '不包含' },
{ value: 'NULL', label: '为空' }, { value: 'NULL', label: '为空' },
{ value: 'NOT NULL', label: '不为空' }, { value: 'NOT NULL', label: '不为空' }
] ]
const formatRangeOptions = (...rest) => { const formatRangeOptions = (...rest) => {
// 交集 // 交集
let result = rangeOptions.filter(aItem => rest.some(bItem => aItem.value === bItem)); let result = rangeOptions.filter((aItem) => rest.some((bItem) => aItem.value === bItem))
return result return result
} }
@ -230,18 +388,36 @@ const options = reactive({
rangeOptions1: formatRangeOptions('IN', 'NOT IN'), rangeOptions1: formatRangeOptions('IN', 'NOT IN'),
rangeOptions2: formatRangeOptions('IN'), rangeOptions2: formatRangeOptions('IN'),
// 供应商客户下拉框列表 // 供应商客户下拉框列表
typeOptions: [{ value: 'SupplierCode', label: '供应商' }, { value: 'CustomerCode', label: '客户' }], typeOptions: [
{ value: 'SupplierCode', label: '供应商' },
{ value: 'CustomerCode', label: '客户' }
],
//供应商列表 //供应商列表
supplierList: [], supplierList: [],
// 物品类型列表 // 物品类型列表
itemTypeOptions: [{ value: 'ItemType', label: '物品类型' }, { value: 'ItemGroup', label: '物品分组' }, { value: 'ItemCode', label: '物品' }, { value: 'Project', label: '项目' }, { value: 'AbcClass', label: 'ABC类' }], itemTypeOptions: [
{ value: 'ItemType', label: '物品类型' },
{ value: 'ItemGroup', label: '物品分组' },
{ value: 'ItemCode', label: '物品' },
{ value: 'Project', label: '项目' },
{ value: 'AbcClass', label: 'ABC类' }
],
// 重量体积面积类型列表 // 重量体积面积类型列表
calculationTypeOptions: [{ value: 'Weight', label: '重量' }, { value: 'Volume', label: '体积' }, { value: 'Area', label: '面积' }], calculationTypeOptions: [
{ value: 'Weight', label: '重量' },
{ value: 'Volume', label: '体积' },
{ value: 'Area', label: '面积' }
],
warehouseTypeOptions: [{ value: 'WarehouseCode', label: '仓库' }, { value: 'AreaCode', label: '库区' }, { value: 'LocationGroupCode', label: '库位组' }, { value: 'LocationCode', label: '库位' }], warehouseTypeOptions: [
{ value: 'WarehouseCode', label: '仓库' },
{ value: 'AreaCode', label: '库区' },
{ value: 'LocationGroupCode', label: '库位组' },
{ value: 'LocationCode', label: '库位' }
],
//仓库列表 //仓库列表
warehouseList: [], warehouseList: []
}) })
// 弹窗按钮 // 弹窗按钮
const Butttondata = ref([ const Butttondata = ref([
@ -261,11 +437,11 @@ const buttonBaseClick = (val, item) => {
} }
// 获取供应商列表 // 获取供应商列表
const getFormSupplierList = async () => { const getFormSupplierList = async () => {
options.supplierList = await getSupplierList(); options.supplierList = await getSupplierList()
} }
// 获取客户列表 // 获取客户列表
const getFormCustomerList = async () => { const getFormCustomerList = async () => {
options.supplierList = await getCustomerList(); options.supplierList = await getCustomerList()
} }
// 选择客户还是承运商 // 选择客户还是承运商
const changeSupplierCustomer = (e) => { const changeSupplierCustomer = (e) => {
@ -284,19 +460,19 @@ const changeItemsType = () => {
// 获取仓库列表 // 获取仓库列表
const getFormWarehouseList = async () => { const getFormWarehouseList = async () => {
options.warehouseList = await getWarehouseList(); options.warehouseList = await getWarehouseList()
} }
// 获取库区列表 // 获取库区列表
const getFormAreaList = async () => { const getFormAreaList = async () => {
options.warehouseList = await getAreaList(); options.warehouseList = await getAreaList()
} }
// 获取库位组列表 // 获取库位组列表
const getFormLocationgrouList = async () => { const getFormLocationgrouList = async () => {
options.warehouseList = await getLocationgroupList(); options.warehouseList = await getLocationgroupList()
} }
// 获取库位列表 // 获取库位列表
const getFormLocationList = async () => { const getFormLocationList = async () => {
options.warehouseList = await getLocationList(); options.warehouseList = await getLocationList()
} }
getFormLocationList() getFormLocationList()
// 选择仓库/库位/库位组/库区 // 选择仓库/库位/库位组/库区
@ -332,7 +508,7 @@ const open = async (type: string, strategyCode: string, id?: number) => {
formData.value.status = data.status == 0 ? true : false formData.value.status = data.status == 0 ? true : false
if (formData.value.priority == 0) { if (formData.value.priority == 0) {
Butttondata.value = [ Butttondata.value = [
defaultButtons.formSaveBtn({disabled:true}), // 保存 defaultButtons.formSaveBtn({ disabled: true }), // 保存
defaultButtons.formCloseBtn(null) // 关闭 defaultButtons.formCloseBtn(null) // 关闭
] ]
} else { } else {
@ -363,7 +539,6 @@ const open = async (type: string, strategyCode: string, id?: number) => {
} else if (formData.value.condition[2].ParamCode == 'LocationCode') { } else if (formData.value.condition[2].ParamCode == 'LocationCode') {
getFormLocationList() getFormLocationList()
} }
} finally { } finally {
formLoading.value = false formLoading.value = false
} }
@ -383,8 +558,8 @@ const submitForm = async () => {
if (!formRef) return if (!formRef) return
const valid = await formRef.value.validate() const valid = await formRef.value.validate()
if (!valid) return if (!valid) return
if(formData.value.priority == 0){ if (formData.value.priority == 0) {
message.error('优先级不可以为0') message.error('优先级不可以为0')
return return
} }
@ -393,11 +568,11 @@ const submitForm = async () => {
try { try {
let data = { let data = {
id: formData.value.id, id: formData.value.id,
strategyCode: formData.value.strategyCode,//策略代码 strategyCode: formData.value.strategyCode, //策略代码
name: formData.value.name,//名称 name: formData.value.name, //名称
description: formData.value.description,//描述 description: formData.value.description, //描述
priority: formData.value.priority,//优先级 priority: formData.value.priority, //优先级
status: formData.value.status ? 0 : 1,//状态 status: formData.value.status ? 0 : 1, //状态
//规则条件集合 //规则条件集合
condition: JSON.stringify(formData.value.condition), condition: JSON.stringify(formData.value.condition),
configuration: JSON.stringify(formData.value.configuration) configuration: JSON.stringify(formData.value.configuration)
@ -421,31 +596,30 @@ const submitForm = async () => {
const resetForm = () => { const resetForm = () => {
formData.value = { formData.value = {
id: '', id: '',
strategyCode: formStrategyCode.value,//策略代码id strategyCode: formStrategyCode.value, //策略代码id
name: '',//名称 name: '', //名称
description: '',//描述 description: '', //描述
priority: '',//优先级 priority: '', //优先级
status: true,//状态 status: true, //状态
//规则条件集合 //规则条件集合
condition: [ condition: [
// 供应商 // 供应商
{ ParamCode: 'SupplierCode', Operator: "IN", Value: "" }, { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
// 物品类型/物品分组/物品/abc类/项目/ // 物品类型/物品分组/物品/abc类/项目/
{ ParamCode: 'ItemType', Operator: "IN", Value: "" }, { ParamCode: 'ItemType', Operator: 'IN', Value: '' },
// 仓库 // 仓库
{ ParamCode: 'LocationCode', Operator: "IN", Value: "" }, { ParamCode: 'LocationCode', Operator: 'IN', Value: '' },
// 忽略物品 // 忽略物品
{ ParamCode: 'IgnoreListOfItem', Operator: "IN", Value: "" }, { ParamCode: 'IgnoreListOfItem', Operator: 'IN', Value: '' },
// 忽略库位 // 忽略库位
{ ParamCode: 'IgnoreListOfLocation', Operator: "IN", Value: "" }, { ParamCode: 'IgnoreListOfLocation', Operator: 'IN', Value: '' }
], ],
configuration: { configuration: {
// 管理精度 // 管理精度
ManagementPrecision:'BY_PACKAGING' ManagementPrecision: 'BY_PACKAGING'
} }
} }
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.item { .item {

2
src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
View File

@ -107,6 +107,8 @@
placeholder="请选择供应商" placeholder="请选择供应商"
style="flex: 1" style="flex: 1"
clearable clearable
multiple
collapse-tags
> >
<el-option <el-option
v-for="cur in options.supplierList" v-for="cur in options.supplierList"

251
src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
View File

@ -1,15 +1,26 @@
<!-- 补料策略弹窗 --> <!-- 补料策略弹窗 -->
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px;"> <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
<div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;"> <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
<el-form ref="formRef" :model="formData" :rules="rules" label-width="120px" label-position="left"> <el-form
ref="formRef"
:model="formData"
:rules="rules"
label-width="120px"
label-position="left"
>
<!-- 规则 --> <!-- 规则 -->
<div class="item"> <div class="item">
<div class="title">规则</div> <div class="title">规则</div>
<el-row gutter="10"> <el-row gutter="10">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="代码" prop="strategyCode"> <el-form-item label="代码" prop="strategyCode">
<el-input v-model="formData.strategyCode" placeholder="请输入代码" clearable disabled /> <el-input
v-model="formData.strategyCode"
placeholder="请输入代码"
clearable
disabled
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@ -42,47 +53,136 @@
<el-col :span="24" v-for="(item, index) in formData.condition" :key="index"> <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
<!-- 选择物品类型 --> <!-- 选择物品类型 -->
<el-form-item label="" label-width="0" class="err-240" v-if="index == 0"> <el-form-item label="" label-width="0" class="err-240" v-if="index == 0">
<el-select v-model="item.ParamCode" placeholder="" @change="changeItemsType" <el-select
style="width: 110px;margin-right: 10px;"> v-model="item.ParamCode"
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.itemTypeOptions" placeholder=""
:key="cur.value" /> @change="changeItemsType"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.itemTypeOptions"
:key="cur.value"
/>
</el-select> </el-select>
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;"> <el-select
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1" v-model="item.Operator"
:key="cur.value" /> placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="cur.value"
/>
</el-select> </el-select>
<el-select v-model="item.Value" placeholder="请选择物品类型" style="flex: 1;" clearable <el-select
v-if="item.ParamCode == 'ItemType'"> v-model="item.Value"
<el-option v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)" :key="cur.value" :label="cur.label" placeholder="请选择物品类型"
:value="cur.value" /> style="flex: 1"
clearable
multiple
collapse-tags
v-if="item.ParamCode == 'ItemType'"
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)"
:key="cur.value"
:label="cur.label"
:value="cur.value"
/>
</el-select> </el-select>
<el-select v-model="item.Value" placeholder="请选择ABC类" style="flex: 1;" clearable <el-select
v-else-if="item.ParamCode == 'AbcClass'"> v-model="item.Value"
<el-option v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)" :key="cur.value" :label="cur.label" placeholder="请选择ABC类"
:value="cur.value" /> style="flex: 1"
clearable
multiple
collapse-tags
v-else-if="item.ParamCode == 'AbcClass'"
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)"
:key="cur.value"
:label="cur.label"
:value="cur.value"
/>
</el-select> </el-select>
<el-input v-model="item.Value" placeholder="请输入物品分组" clearable style="flex: 1;" <el-input
v-else-if="item.ParamCode == 'ItemGroup'" /> v-model="item.Value"
<el-input v-model="item.Value" placeholder="请输入项目" clearable style="flex: 1;" placeholder="请输入物品分组，多个物品分组以逗号分隔"
v-else-if="item.ParamCode == 'Project'" /> clearable
<el-input v-model="item.Value" placeholder="请输入物品" clearable style="flex: 1;" style="flex: 1"
v-else-if="item.ParamCode == 'ItemCode'" /> v-else-if="item.ParamCode == 'ItemGroup'"
/>
<el-input
v-model="item.Value"
placeholder="请输入项目，多个项目以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'Project'"
/>
<el-input
v-model="item.Value"
placeholder="请输入物品，多个物品以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'ItemCode'"
/>
</el-form-item> </el-form-item>
<!-- 仓库 库区 库位组 库位 --> <!-- 仓库 库区 库位组 库位 -->
<el-form-item label="" label-width="0" class="err-240" v-if="index == 1"> <el-form-item label="" label-width="0" class="err-240" v-if="index == 1">
<el-select v-model="item.ParamCode" placeholder="" style="width: 110px;margin-right: 10px;" <el-select
@change="changeWarehouse"> v-model="item.ParamCode"
<el-option :label="cur.label" :value="cur.value" v-for="(cur, index) in options.warehouseTypeOptions" placeholder=""
:key="index" /> style="width: 110px; margin-right: 10px"
@change="changeWarehouse"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="(cur, index) in options.warehouseTypeOptions"
:key="index"
/>
</el-select> </el-select>
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;"> <el-select
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1" v-model="item.Operator"
:key="cur.value" /> placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="cur.value"
/>
</el-select> </el-select>
<el-select v-model="item.Value" <el-select
:placeholder="`请选择${item.ParamCode == 'WarehouseCode' ? '仓库' : item.ParamCode == 'AreaCode' ? '库区' : item.ParamCode == 'LocationGroupCode' ? '库位组' : item.ParamCode == 'LocationCode' ? '库位' : ''}`" v-model="item.Value"
clearable style="flex: 1;"> :placeholder="`请选择${
<el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" /> item.ParamCode == 'WarehouseCode'
? '仓库'
: item.ParamCode == 'AreaCode'
? '库区'
: item.ParamCode == 'LocationGroupCode'
? '库位组'
: item.ParamCode == 'LocationCode'
? '库位'
: ''
}`"
clearable
multiple
collapse-tags
style="flex: 1"
>
<el-option
v-for="cur in options.warehouseList"
:key="cur.code"
:label="cur.code"
:value="cur.code"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -95,32 +195,76 @@
<el-row gutter="10"> <el-row gutter="10">
<!-- 最大库存 --> <!-- 最大库存 -->
<el-col :span="24"> <el-col :span="24">
<el-form-item label="最大库存" prop="configuration.MaxQty" :rules="[{ required: true, message: '请输入最小库存', trigger: 'change', }]"> <el-form-item
<el-input-number v-model="formData.configuration.MaxQty" :min="-1" controls-position="right" /> label="最大库存"
prop="configuration.MaxQty"
:rules="[{ required: true, message: '请输入最小库存', trigger: 'change' }]"
>
<el-input-number
v-model="formData.configuration.MaxQty"
:min="-1"
controls-position="right"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- 最小库存 --> <!-- 最小库存 -->
<el-col :span="24"> <el-col :span="24">
<el-form-item label="最小库存" prop="configuration.MinQty" :rules="[{ required: true, message: '请输入最小库存', trigger: 'change', }, { validator: validatorNum, message: '不可以大于最大库存', trigger: 'change', }]"> <el-form-item
<el-input-number v-model="formData.configuration.MinQty" :min="0" label="最小库存"
:max="formData.configuration.MaxQty != -1 ? formData.configuration.MaxQty : Infinity" prop="configuration.MinQty"
controls-position="right" /> :rules="[
{ required: true, message: '请输入最小库存', trigger: 'change' },
{ validator: validatorNum, message: '不可以大于最大库存', trigger: 'change' }
]"
>
<el-input-number
v-model="formData.configuration.MinQty"
:min="0"
:max="
formData.configuration.MaxQty != -1 ? formData.configuration.MaxQty : Infinity
"
controls-position="right"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- 安全库存 --> <!-- 安全库存 -->
<el-col :span="24"> <el-col :span="24">
<el-form-item label="安全库存" prop="configuration.SafetyQty" :rules="[{ required: true, message: '请输入安全库存', trigger: 'change', }, { validator: validatorNum, message: '不可以大于最大库存', trigger: 'change', }]"> <el-form-item
<el-input-number v-model="formData.configuration.SafetyQty" :min="0" label="安全库存"
:max="formData.configuration.MaxQty != -1 ? formData.configuration.MaxQty : Infinity" prop="configuration.SafetyQty"
controls-position="right" /> :rules="[
{ required: true, message: '请输入安全库存', trigger: 'change' },
{ validator: validatorNum, message: '不可以大于最大库存', trigger: 'change' }
]"
>
<el-input-number
v-model="formData.configuration.SafetyQty"
:min="0"
:max="
formData.configuration.MaxQty != -1 ? formData.configuration.MaxQty : Infinity
"
controls-position="right"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- 补料数量 --> <!-- 补料数量 -->
<el-col :span="24"> <el-col :span="24">
<el-form-item label="补料数量" prop="configuration.FeedQty" :rules="[{ required: true, message: '请输入补料数量', trigger: 'change', }, { validator: validatorNum, message: '不可以大于最大库存', trigger: 'change', }]"> <el-form-item
<el-input-number v-model="formData.configuration.FeedQty" :min="0" label="补料数量"
:max="formData.configuration.MaxQty != -1 ? formData.configuration.MaxQty : Infinity" prop="configuration.FeedQty"
controls-position="right" /> :rules="[
{ required: true, message: '请输入补料数量', trigger: 'change' },
{ validator: validatorNum, message: '不可以大于最大库存', trigger: 'change' }
]"
>
<el-input-number
v-model="formData.configuration.FeedQty"
:min="0"
:max="
formData.configuration.MaxQty != -1 ? formData.configuration.MaxQty : Infinity
"
controls-position="right"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -312,7 +456,7 @@ const open = async (type: string, strategyCode: string, id?: number) => {
formData.value.status = data.status == 0 ? true : false formData.value.status = data.status == 0 ? true : false
if (formData.value.priority == 0) { if (formData.value.priority == 0) {
Butttondata.value = [ Butttondata.value = [
defaultButtons.formSaveBtn({disabled:true}), // 保存 defaultButtons.formSaveBtn({ disabled: true }), // 保存
defaultButtons.formCloseBtn(null) // 关闭 defaultButtons.formCloseBtn(null) // 关闭
] ]
} else { } else {
@ -341,7 +485,7 @@ const open = async (type: string, strategyCode: string, id?: number) => {
} finally { } finally {
formLoading.value = false formLoading.value = false
} }
}else { } else {
Butttondata.value = [ Butttondata.value = [
defaultButtons.formSaveBtn(null), // 保存 defaultButtons.formSaveBtn(null), // 保存
defaultButtons.formCloseBtn(null) // 关闭 defaultButtons.formCloseBtn(null) // 关闭
@ -357,7 +501,7 @@ const submitForm = async () => {
if (!formRef) return if (!formRef) return
const valid = await formRef.value.validate() const valid = await formRef.value.validate()
if (!valid) return if (!valid) return
if(formData.value.priority == 0){ if (formData.value.priority == 0) {
message.error('优先级不可以为0') message.error('优先级不可以为0')
return return
} }
@ -419,7 +563,6 @@ const resetForm = () => {
} }
} }
const validatorNum = (rule: any, value: any, callback: any) => { const validatorNum = (rule: any, value: any, callback: any) => {
if (value && formData.value.configuration.MaxQty != -1) { if (value && formData.value.configuration.MaxQty != -1) {
if (value > formData.value.configuration.MaxQty) { if (value > formData.value.configuration.MaxQty) {

14
src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
View File

@ -83,6 +83,8 @@
placeholder="请选择物品类型" placeholder="请选择物品类型"
style="flex: 1" style="flex: 1"
clearable clearable
multiple
collapse-tags
v-if="item.ParamCode == 'ItemType'" v-if="item.ParamCode == 'ItemType'"
> >
<el-option <el-option
@ -97,6 +99,8 @@
placeholder="请选择ABC类" placeholder="请选择ABC类"
style="flex: 1" style="flex: 1"
clearable clearable
multiple
collapse-tags
v-else-if="item.ParamCode == 'AbcClass'" v-else-if="item.ParamCode == 'AbcClass'"
> >
<el-option <el-option
@ -108,21 +112,21 @@
</el-select> </el-select>
<el-input <el-input
v-model="item.Value" v-model="item.Value"
placeholder="请输入物品分组" placeholder="请输入物品分组，多个物品分组以逗号分隔"
clearable clearable
style="flex: 1" style="flex: 1"
v-else-if="item.ParamCode == 'ItemGroup'" v-else-if="item.ParamCode == 'ItemGroup'"
/> />
<el-input <el-input
v-model="item.Value" v-model="item.Value"
placeholder="请输入项目" placeholder="请输入项目，多个项目以逗号分隔"
clearable clearable
style="flex: 1" style="flex: 1"
v-else-if="item.ParamCode == 'Project'" v-else-if="item.ParamCode == 'Project'"
/> />
<el-input <el-input
v-model="item.Value" v-model="item.Value"
placeholder="请输入物品" placeholder="请输入物品，多个物品以逗号分隔"
clearable clearable
style="flex: 1" style="flex: 1"
v-else-if="item.ParamCode == 'ItemCode'" v-else-if="item.ParamCode == 'ItemCode'"
@ -169,12 +173,14 @@
: '' : ''
}`" }`"
clearable clearable
multiple
collapse-tags
style="flex: 1" style="flex: 1"
> >
<el-option <el-option
v-for="cur in options.warehouseList" v-for="cur in options.warehouseList"
:key="cur.code" :key="cur.code"
:label="cur.name" :label="cur.code"
:value="cur.code" :value="cur.code"
/> />
</el-select> </el-select>

8
src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
View File

@ -107,6 +107,8 @@
placeholder="请选择供应商" placeholder="请选择供应商"
style="flex: 1" style="flex: 1"
clearable clearable
multiple
collapse-tags
> >
<el-option <el-option
v-for="cur in options.supplierList" v-for="cur in options.supplierList"
@ -195,7 +197,7 @@
<el-option <el-option
v-for="cur in options.warehouseList" v-for="cur in options.warehouseList"
:key="cur.code" :key="cur.code"
:label="cur.name" :label="cur.code"
:value="cur.code" :value="cur.code"
/> />
</el-select> </el-select>
@ -210,7 +212,7 @@
<el-option <el-option
v-for="cur in options.dockList" v-for="cur in options.dockList"
:key="cur.code" :key="cur.code"
:label="cur.name" :label="cur.code"
:value="cur.code" :value="cur.code"
/> />
</el-select> </el-select>
@ -225,7 +227,7 @@
<el-option <el-option
v-for="cur in options.locationList" v-for="cur in options.locationList"
:key="cur.code" :key="cur.code"
:label="cur.name" :label="cur.code"
:value="cur.code" :value="cur.code"
/> />
</el-select> </el-select>

26
src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
View File

@ -84,6 +84,8 @@
:placeholder="`请选择${item.ParamCode == 'SupplierCode' ? '供应商' : '客户'}`" :placeholder="`请选择${item.ParamCode == 'SupplierCode' ? '供应商' : '客户'}`"
style="flex: 1" style="flex: 1"
clearable clearable
multiple
collapse-tags
> >
<el-option <el-option
v-for="cur in options.supplierList" v-for="cur in options.supplierList"
@ -125,6 +127,8 @@
placeholder="请选择物品类型" placeholder="请选择物品类型"
style="flex: 1" style="flex: 1"
clearable clearable
multiple
collapse-tags
v-if="item.ParamCode == 'ItemType'" v-if="item.ParamCode == 'ItemType'"
> >
<el-option <el-option
@ -139,6 +143,8 @@
placeholder="请选择ABC类" placeholder="请选择ABC类"
style="flex: 1" style="flex: 1"
clearable clearable
multiple
collapse-tags
v-else-if="item.ParamCode == 'AbcClass'" v-else-if="item.ParamCode == 'AbcClass'"
> >
<el-option <el-option
@ -150,21 +156,21 @@
</el-select> </el-select>
<el-input <el-input
v-model="item.Value" v-model="item.Value"
placeholder="请输入物品分组" placeholder="请输入物品分组，多个物品分组以逗号分隔"
clearable clearable
style="flex: 1" style="flex: 1"
v-else-if="item.ParamCode == 'ItemGroup'" v-else-if="item.ParamCode == 'ItemGroup'"
/> />
<el-input <el-input
v-model="item.Value" v-model="item.Value"
placeholder="请输入项目" placeholder="请输入项目，多个项目以逗号分隔"
clearable clearable
style="flex: 1" style="flex: 1"
v-else-if="item.ParamCode == 'Project'" v-else-if="item.ParamCode == 'Project'"
/> />
<el-input <el-input
v-model="item.Value" v-model="item.Value"
placeholder="请输入物品" placeholder="请输入物品，多个物品以逗号分隔"
clearable clearable
style="flex: 1" style="flex: 1"
v-else-if="item.ParamCode == 'ItemCode'" v-else-if="item.ParamCode == 'ItemCode'"
@ -225,6 +231,8 @@
placeholder="请选择库存状态" placeholder="请选择库存状态"
style="flex: 1" style="flex: 1"
clearable clearable
multiple
collapse-tags
> >
<el-option <el-option
v-for="cur in getStrDictOptions(DICT_TYPE.INVENTORY_STATUS)" v-for="cur in getStrDictOptions(DICT_TYPE.INVENTORY_STATUS)"
@ -253,6 +261,8 @@
placeholder="请选择存储类型" placeholder="请选择存储类型"
style="flex: 1" style="flex: 1"
clearable clearable
multiple
collapse-tags
> >
<el-option <el-option
v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)" v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)"
@ -278,7 +288,7 @@
</el-select> </el-select>
<el-input <el-input
v-model="item.Value" v-model="item.Value"
placeholder="请输入库存事务" placeholder="请输入库存事务，多个库存事务以逗号分隔"
clearable clearable
style="flex: 1" style="flex: 1"
/> />
@ -317,7 +327,7 @@
<el-option <el-option
v-for="cur in options.warehouseList" v-for="cur in options.warehouseList"
:key="cur.code" :key="cur.code"
:label="cur.name" :label="cur.code"
:value="cur.code" :value="cur.code"
/> />
</el-select> </el-select>
@ -331,7 +341,7 @@
<el-option <el-option
v-for="cur in options.warehouseList" v-for="cur in options.warehouseList"
:key="cur.code" :key="cur.code"
:label="cur.name" :label="cur.code"
:value="cur.code" :value="cur.code"
/> />
</el-select> </el-select>
@ -345,7 +355,7 @@
<el-option <el-option
v-for="cur in options.warehouseList" v-for="cur in options.warehouseList"
:key="cur.code" :key="cur.code"
:label="cur.name" :label="cur.code"
:value="cur.code" :value="cur.code"
/> />
</el-select> </el-select>
@ -360,7 +370,7 @@
<el-option <el-option
v-for="cur in options.warehouseList" v-for="cur in options.warehouseList"
:key="cur.code" :key="cur.code"
:label="cur.name" :label="cur.code"
:value="cur.code" :value="cur.code"
/> />
</el-select> </el-select>

240
src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue
View File

@ -1,15 +1,26 @@
<!-- 器具容量策略弹窗 --> <!-- 器具容量策略弹窗 -->
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px;"> <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
<div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;"> <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
<el-form ref="formRef" :model="formData" :rules="rules" label-width="120px" label-position="left"> <el-form
ref="formRef"
:model="formData"
:rules="rules"
label-width="120px"
label-position="left"
>
<!-- 规则 --> <!-- 规则 -->
<div class="item"> <div class="item">
<div class="title">规则</div> <div class="title">规则</div>
<el-row gutter="10"> <el-row gutter="10">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="代码" prop="strategyCode"> <el-form-item label="代码" prop="strategyCode">
<el-input v-model="formData.strategyCode" placeholder="请输入代码" clearable disabled /> <el-input
v-model="formData.strategyCode"
placeholder="请输入代码"
clearable
disabled
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@ -41,47 +52,125 @@
<el-row gutter="10"> <el-row gutter="10">
<el-col :span="24" v-for="(item, index) in formData.condition" :key="index"> <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
<!-- 器具类型 --> <!-- 器具类型 -->
<el-form-item label="器具类型" class="err-120" v-if="index == 0" :prop="'condition.' + index + '.Value'" :rules="{ <el-form-item
required: true, label="器具类型"
message: '请选择器具类型', class="err-120"
trigger: 'change', v-if="index == 0"
}"> :prop="'condition.' + index + '.Value'"
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;"> :rules="{
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1" required: true,
:key="cur.value" /> message: '请选择器具类型',
trigger: 'change'
}"
>
<el-select
v-model="item.Operator"
placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="cur.value"
/>
</el-select> </el-select>
<el-select v-model="item.Value" placeholder="请选择器具类型" style="flex: 1;" clearable> <el-select
<el-option v-for="cur in getStrDictOptions(DICT_TYPE.CONTAINER_TYPE)" :key="cur.value" v-model="item.Value"
:label="cur.label" :value="cur.value" /> placeholder="请选择器具类型"
style="flex: 1"
clearable
multiple
collapse-tags
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.CONTAINER_TYPE)"
:key="cur.value"
:label="cur.label"
:value="cur.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- 选择物品类型 --> <!-- 选择物品类型 -->
<el-form-item label="" label-width="0" class="err-240" v-if="index == 1"> <el-form-item label="" label-width="0" class="err-240" v-if="index == 1">
<el-select v-model="item.ParamCode" placeholder="" @change="changeItemsType" <el-select
style="width: 110px;margin-right: 10px;"> v-model="item.ParamCode"
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.itemTypeOptions" placeholder=""
:key="cur.value" /> @change="changeItemsType"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.itemTypeOptions"
:key="cur.value"
/>
</el-select> </el-select>
<el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;"> <el-select
<el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1" v-model="item.Operator"
:key="cur.value" /> placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
>
<el-option
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="cur.value"
/>
</el-select> </el-select>
<el-select v-model="item.Value" placeholder="请选择物品类型" style="flex: 1;" clearable <el-select
v-if="item.ParamCode == 'ItemType'"> v-model="item.Value"
<el-option v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)" :key="cur.value" :label="cur.label" placeholder="请选择物品类型"
:value="cur.value" /> style="flex: 1"
clearable
multiple
collapse-tags
v-if="item.ParamCode == 'ItemType'"
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)"
:key="cur.value"
:label="cur.label"
:value="cur.value"
/>
</el-select> </el-select>
<el-select v-model="item.Value" placeholder="请选择ABC类" style="flex: 1;" clearable <el-select
v-else-if="item.ParamCode == 'AbcClass'"> v-model="item.Value"
<el-option v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)" :key="cur.value" :label="cur.label" placeholder="请选择ABC类"
:value="cur.value" /> style="flex: 1"
clearable
multiple
collapse-tags
v-else-if="item.ParamCode == 'AbcClass'"
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)"
:key="cur.value"
:label="cur.label"
:value="cur.value"
/>
</el-select> </el-select>
<el-input v-model="item.Value" placeholder="请输入物品分组" clearable style="flex: 1;" <el-input
v-else-if="item.ParamCode == 'ItemGroup'" /> v-model="item.Value"
<el-input v-model="item.Value" placeholder="请输入项目" clearable style="flex: 1;" placeholder="请输入物品分组，多个物品分组以逗号分隔"
v-else-if="item.ParamCode == 'Project'" /> clearable
<el-input v-model="item.Value" placeholder="请输入物品" clearable style="flex: 1;" style="flex: 1"
v-else-if="item.ParamCode == 'ItemCode'" /> v-else-if="item.ParamCode == 'ItemGroup'"
/>
<el-input
v-model="item.Value"
placeholder="请输入项目，多个项目以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'Project'"
/>
<el-input
v-model="item.Value"
placeholder="请输入物品，多个物品以逗号分隔"
clearable
style="flex: 1"
v-else-if="item.ParamCode == 'ItemCode'"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -93,9 +182,16 @@
<el-row gutter="10"> <el-row gutter="10">
<el-col :span="24"> <el-col :span="24">
<!-- 容纳数量 --> <!-- 容纳数量 -->
<el-form-item label="容纳数量" prop="configuration.ContentCount" <el-form-item
:rules="[{ required: true, message: '请输入容纳数量', trigger: 'change', }]"> label="容纳数量"
<el-input-number v-model="formData.configuration.ContentCount" :min="-1" controls-position="right" /> prop="configuration.ContentCount"
:rules="[{ required: true, message: '请输入容纳数量', trigger: 'change' }]"
>
<el-input-number
v-model="formData.configuration.ContentCount"
:min="-1"
controls-position="right"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -115,7 +211,6 @@ import * as RuleApi from '@/api/wms/rule'
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
@ -125,35 +220,33 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
const formType = ref('') // 表单的类型：create - 新增；update - 修改 const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formRef = ref() // 表单 Ref const formRef = ref() // 表单 Ref
const formStrategyCode = ref('') const formStrategyCode = ref('')
// form表单数据 // form表单数据
const formData = ref({ const formData = ref({
id: '', id: '',
strategyCode: formStrategyCode.value,//策略代码id strategyCode: formStrategyCode.value, //策略代码id
name: '',//名称 name: '', //名称
description: '',//描述 description: '', //描述
priority: '',//优先级 priority: '', //优先级
status: true,//状态 status: true, //状态
//规则条件集合 //规则条件集合
condition: [ condition: [
// 器具类型 // 器具类型
{ ParamCode: 'ContainerType', Operator: "IN", Value: "" }, { ParamCode: 'ContainerType', Operator: 'IN', Value: '' },
// 物品类型/物品分组/物品/abc类/项目/ // 物品类型/物品分组/物品/abc类/项目/
{ ParamCode: 'ItemGroup', Operator: "IN", Value: "" }, { ParamCode: 'ItemGroup', Operator: 'IN', Value: '' }
], ],
configuration: { configuration: {
// 容纳数量 // 容纳数量
ContentCount:0 ContentCount: 0
} }
}) })
// 验证规则 // 验证规则
const rules = ref({ const rules = ref({
strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }], strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }],
name: [{ required: true, message: '请输入名字', trigger: 'blur' }], name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
description: [{ required: true, message: '请输入描述', trigger: 'blur' }], description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }], priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
}) })
// 所有的范围类型 // 所有的范围类型
@ -167,11 +260,11 @@ const rangeOptions = [
{ value: 'IN', label: '包含' }, { value: 'IN', label: '包含' },
{ value: 'NOT IN', label: '不包含' }, { value: 'NOT IN', label: '不包含' },
{ value: 'NULL', label: '为空' }, { value: 'NULL', label: '为空' },
{ value: 'NOT NULL', label: '不为空' }, { value: 'NOT NULL', label: '不为空' }
] ]
const formatRangeOptions = (...rest) => { const formatRangeOptions = (...rest) => {
// 交集 // 交集
let result = rangeOptions.filter(aItem => rest.some(bItem => aItem.value === bItem)); let result = rangeOptions.filter((aItem) => rest.some((bItem) => aItem.value === bItem))
return result return result
} }
@ -181,7 +274,11 @@ const options = reactive({
rangeOptions1: formatRangeOptions('IN', 'NOT IN'), rangeOptions1: formatRangeOptions('IN', 'NOT IN'),
// 物品类型列表 // 物品类型列表
itemTypeOptions: [{ value: 'ItemGroup', label: '物品分组' }, { value: 'ItemCode', label: '物品' }, { value: 'Project', label: '项目' }], itemTypeOptions: [
{ value: 'ItemGroup', label: '物品分组' },
{ value: 'ItemCode', label: '物品' },
{ value: 'Project', label: '项目' }
]
}) })
// 弹窗按钮 // 弹窗按钮
const Butttondata = ref([ const Butttondata = ref([
@ -224,7 +321,7 @@ const open = async (type: string, strategyCode: string, id?: number) => {
formData.value.status = data.status == 0 ? true : false formData.value.status = data.status == 0 ? true : false
if (formData.value.priority == 0) { if (formData.value.priority == 0) {
Butttondata.value = [ Butttondata.value = [
defaultButtons.formSaveBtn({disabled:true}), // 保存 defaultButtons.formSaveBtn({ disabled: true }), // 保存
defaultButtons.formCloseBtn(null) // 关闭 defaultButtons.formCloseBtn(null) // 关闭
] ]
} else { } else {
@ -239,7 +336,6 @@ const open = async (type: string, strategyCode: string, id?: number) => {
if (data.configuration) { if (data.configuration) {
formData.value.configuration = JSON.parse(data.configuration) formData.value.configuration = JSON.parse(data.configuration)
} }
} finally { } finally {
formLoading.value = false formLoading.value = false
} }
@ -259,7 +355,7 @@ const submitForm = async () => {
if (!formRef) return if (!formRef) return
const valid = await formRef.value.validate() const valid = await formRef.value.validate()
if (!valid) return if (!valid) return
if(formData.value.priority == 0){ if (formData.value.priority == 0) {
message.error('优先级不可以为0') message.error('优先级不可以为0')
return return
} }
@ -268,11 +364,11 @@ const submitForm = async () => {
try { try {
let data = { let data = {
id: formData.value.id, id: formData.value.id,
strategyCode: formData.value.strategyCode,//策略代码 strategyCode: formData.value.strategyCode, //策略代码
name: formData.value.name,//名称 name: formData.value.name, //名称
description: formData.value.description,//描述 description: formData.value.description, //描述
priority: formData.value.priority,//优先级 priority: formData.value.priority, //优先级
status: formData.value.status ? 0 : 1,//状态 status: formData.value.status ? 0 : 1, //状态
//规则条件集合 //规则条件集合
condition: JSON.stringify(formData.value.condition), condition: JSON.stringify(formData.value.condition),
configuration: JSON.stringify(formData.value.configuration) configuration: JSON.stringify(formData.value.configuration)
@ -296,32 +392,30 @@ const submitForm = async () => {
const resetForm = () => { const resetForm = () => {
formData.value = { formData.value = {
id: '', id: '',
strategyCode: formStrategyCode.value,//策略代码id strategyCode: formStrategyCode.value, //策略代码id
name: '',//名称 name: '', //名称
description: '',//描述 description: '', //描述
priority: '',//优先级 priority: '', //优先级
status: true,//状态 status: true, //状态
//规则条件集合 //规则条件集合
condition: [ condition: [
// 器具类型 // 器具类型
{ ParamCode: 'ContainerType', Operator: "IN", Value: "" }, { ParamCode: 'ContainerType', Operator: 'IN', Value: '' },
// 物品类型/物品分组/物品/abc类/项目/ // 物品类型/物品分组/物品/abc类/项目/
{ ParamCode: 'ItemGroup', Operator: "IN", Value: "" }, { ParamCode: 'ItemGroup', Operator: 'IN', Value: '' }
], ],
configuration: { configuration: {
// 容纳数量 // 容纳数量
ContentCount:0 ContentCount: 0
} }
} }
} }
const validatorNum = (rule: any, value: any, callback: any) => { const validatorNum = (rule: any, value: any, callback: any) => {
if (value && formData.value.configuration[0].Value != -1) { if (value && formData.value.configuration[0].Value != -1) {
if (value > formData.value.configuration[0].Value) { if (value > formData.value.configuration[0].Value) {
callback(new Error("11")) callback(new Error('11'))
} else { } else {
callback() callback()
} }
} else { } else {

4
src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
View File

@ -86,7 +86,7 @@
<el-option <el-option
v-for="cur in options.warehouseList" v-for="cur in options.warehouseList"
:key="cur.code" :key="cur.code"
:label="cur.name" :label="cur.code"
:value="cur.code" :value="cur.code"
/> />
</el-select> </el-select>
@ -125,7 +125,7 @@
<el-option <el-option
v-for="cur in options.overflowWarehouseList" v-for="cur in options.overflowWarehouseList"
:key="cur.code" :key="cur.code"
:label="cur.name" :label="cur.code"
:value="cur.code" :value="cur.code"
/> />
</el-select> </el-select>

73
src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
View File

@ -72,7 +72,7 @@
<!-- 导入 --> <!-- 导入 -->
<ImportForm ref="importFormRef" url="/wms/inventorychange-request-main/import" :importTemplateData="importTemplateData" <ImportForm ref="importFormRef" url="/wms/inventorychange-request-main/import" :importTemplateData="importTemplateData"
@success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :fromInventoryStatus= "fromInventoryStatus" :toInventoryStatus="toInventoryStatus" /> @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
@ -82,20 +82,6 @@ import * as InventorychangeRequestMainApi from '@/api/wms/inventorychangeRequest
import * as InventorychangeRequestDetailApi from '@/api/wms/inventorychangeRequestDetail' import * as InventorychangeRequestDetailApi from '@/api/wms/inventorychangeRequestDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'
// 库存修改申请 合格转隔离
defineOptions({ name: 'OktoholdRequestMain' })
// 库存修改申请 隔离转合格
// defineOptions({ name: 'HoldtookRequestMain' })
// // 库存修改申请 隔离转报废
// defineOptions({ name: 'HoldtoscrapRequestMain' })
// // 库存修改申请 合格转报废
// defineOptions({ name: 'OktoscrapRequestMain' })
// // 库存修改申请 报废转隔离
// defineOptions({ name: 'ScraptoholdRequestMain' })
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
@ -105,54 +91,10 @@ const routeName = ref()
routeName.value = route.name routeName.value = route.name
const tableColumns = ref(InventorychangeRequestMain.allSchemas.tableColumns) const tableColumns = ref(InventorychangeRequestMain.allSchemas.tableColumns)
console.log(99 , routeName.value)
const fromInventoryStatus = ref()
const toInventoryStatus = ref()
const { tableObject, tableMethods } = useTable({ const { tableObject, tableMethods } = useTable({
getListApi: InventorychangeRequestMainApi.getInventorychangeRequestMainPage // 分页接口 getListApi: InventorychangeRequestMainApi.getInventorychangeRequestMainPage // 分页接口
}) })
// 判断 路由名称 进行条件过滤
/**
* OktoholdRequestMain 合格转隔离
*/
if ( routeName.value == 'OktoholdRequestMain') {
tableObject.params = {
fromInventoryStatus: 'OK',
toInventoryStatus:'HOLD'
}
fromInventoryStatus.value = 'OK'
toInventoryStatus.value = "HOLD"
} else if ( routeName.value == 'HoldtookRequestMain') {
tableObject.params = {
fromInventoryStatus: 'HOLD',
toInventoryStatus:'OK'
}
fromInventoryStatus.value = 'HOLD'
toInventoryStatus.value = "OK"
} else if ( routeName.value == 'HoldtoscrapRequestMain') {
tableObject.params = {
fromInventoryStatus: 'HOLD',
toInventoryStatus:'SCRAP'
}
fromInventoryStatus.value = 'HOLD'
toInventoryStatus.value = "SCRAP"
} else if ( routeName.value == 'OktoscrapRequestMain') {
tableObject.params = {
fromInventoryStatus: 'OK',
toInventoryStatus:'SCRAP'
}
fromInventoryStatus.value = 'OK'
toInventoryStatus.value = "SCRAP"
} else if ( routeName.value == 'ScraptoholdRequestMain') {
tableObject.params = {
fromInventoryStatus: 'SCRAP',
toInventoryStatus:'HOLD'
}
fromInventoryStatus.value = 'SCRAP'
toInventoryStatus.value = "HOLD"
}
// 字段设置 更新主列表字段 // 字段设置 更新主列表字段
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -169,11 +111,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
row['itemCode'] = val[0]['itemCode'] row['itemCode'] = val[0]['itemCode']
row['fromBatch'] = val[0]['batch'] row['fromBatch'] = val[0]['batch']
row['locationCode'] = val[0]['locationCode'] row['locationCode'] = val[0]['locationCode']
} else { row['fromInventoryStatus'] = val[0]['inventoryStatus']
const setV = {}
setV[formField] = val[0][searchField]
formRef.setValues(setV)
} }
console.log(116, row)
const setV = {}
setV[formField] = val[0][searchField]
formRef.setValues(setV)
}) })
} }
// 查询页面返回——详情 // 查询页面返回——详情
@ -372,10 +315,6 @@ const handleDeleteTable = (item, index) => {
// 主子数据 提交 // 主子数据 提交
const submitForm = async (formType, data) => { const submitForm = async (formType, data) => {
data.subList = tableData.value // 拼接子表数据参数 data.subList = tableData.value // 拼接子表数据参数
data.subList.forEach(item => {
item.fromInventoryStatus = fromInventoryStatus.value
item.toInventoryStatus = toInventoryStatus.value
})
try { try {
if (formType === 'create') { if (formType === 'create') {
console.log(data) console.log(data)

31
src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
View File

@ -348,34 +348,8 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: { table: {
width: 150 width: 150
}, },
tableForm:{ tableForm: {
isInpuFocusShow: true, // 开启查询弹窗 disabled: true
searchListPlaceholder: '请选择物品代码',
searchField: 'code',
searchTitle: '物品基础信息',
searchAllSchemas: Itembasic.allSchemas,
searchPage: ItembasicApi.getItembasicPage,
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true,
searchListPlaceholder: '请选择物品代码',
searchField: 'code',
searchTitle: '物品基础信息',
searchAllSchemas: Itembasic.allSchemas,
searchPage: ItembasicApi.getItembasicPage,
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
}
} }
}, },
{ {
@ -608,7 +582,6 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
tableForm: { tableForm: {
type: 'Select' type: 'Select'
}, },
isTableForm: false,
}, },
{ {
label: '库位组代码', label: '库位组代码',

91
src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
View File

@ -177,7 +177,7 @@ const butttondata = (row) => {
defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接 defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭 defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃 defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
// defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
] ]
} }
@ -185,12 +185,95 @@ const butttondata = (row) => {
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
if (val == 'mainJobExe') { // 执行 if (val == 'mainJobExe') { // 执行
console.log('列表-操作按钮事件-执行') console.log('列表-操作按钮事件-执行')
let aaa = {
"id": 3,
"requestNumber": "REQ3720231215-0003",
"useOnTheWayLocation": "TRUE",
"fromWarehouseCode": "W1",
"requestTime": 1702604632000,
"requestDueTime": 1703952000000,
"status": "1",
"expiredTime": 1703952000000,
"updateTime": 1702607543000,
"updater": "1",
"jobStageStatus": null,
"priority": null,
"priorityIncrement": null,
"departmentCode": "研发部门",
"acceptUserId": null,
"acceptTime": null,
"completeUserId": null,
"completeTime": null,
"fromLocationTypes": "SCRAP",
"toLocationTypes": "SCRAP",
"number": "JOB1120231215-0005",
"businessType": "OkToHoldJob",
"remark": "主备注",
"createTime": 1702607543000,
"creator": "1",
"creatorName": null,
"toWarehouseCode": "W1",
"fromAreaCodes": "L-R-001",
"toAreaCodes": "L-R-001",
"autoComplete": "FALSE",
"allowModifyLocation": "FALSE",
"allowModifyQty": "TRUE",
"allowBiggerQty": "TRUE",
"allowSmallerQty": "TRUE",
"allowModifyInventoryStatus": "TRUE",
"allowContinuousScanning": "TRUE",
"allowPartialComplete": "TRUE",
"allowModifyBatch": "FALSE",
"allowModifyPackingNumber": "FALSE",
subList: [{
"id": "1809190000225116835",
"itemCode": "testCF",
"itemName": "陈放测试物品",
"itemDesc1": "测试用",
"itemDesc2": "测试用",
"projectCode": "5",
"qty": 1,
"uom": "EA",
"number": "JOB1120231215-0005",
"remark": "子备注",
"createtime": null,
"creator": "1",
"packingNumber": "testCF",
"containerNumber": null,
"batch": "20230808",
"inventoryStatus": "OK",
"poNumber": null,
"poLine": null,
"fromLocationCode": "Loc_testCF",
"toLocationCode": "L-R-001-001-1-01",
"fromOwnerCode": null,
"toOwnerCode": null,
recordList: [{
handleQty: 10,
toPackingNumber: '12',
toContainerNumber: '001',
toBatch: '21',
toInventoryStatus: 'OK',
toLocationCode: 'H03',
supplierCode: '31213',
},{
handleQty: 22,
toPackingNumber: 'M20230421000005',
toContainerNumber: '001',
toBatch: '20230808',
toInventoryStatus: 'OK',
toLocationCode: 'SFG',
supplierCode: '31213',
}]
}]
}
InventorymoveJobMainApi.executeInventorymoveMain(aaa)
} else if (val == 'mainJobAba') { // 放弃 } else if (val == 'mainJobAba') { // 放弃
console.log('列表-操作按钮事件-放弃') InventorymoveJobMainApi.abandonInventorymoveMain(row.id)
} else if (val == 'mainJobClo') { // 关闭 } else if (val == 'mainJobClo') { // 关闭
console.log('列表-操作按钮事件-关闭') InventorymoveJobMainApi.closeInventorymoveMain(row.id)
} else if (val == 'mainJobAcc') { // 承接 } else if (val == 'mainJobAcc') { // 承接
console.log('列表-操作按钮事件-承接') InventorymoveJobMainApi.acceptInventorymoveMain(row.id)
} }
} }

123
src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
View File

@ -73,7 +73,7 @@
<!-- 导入 --> <!-- 导入 -->
<ImportForm ref="importFormRef" url="/wms/inventorymove-request-main/import" :importTemplateData="importTemplateData" <ImportForm ref="importFormRef" url="/wms/inventorymove-request-main/import" :importTemplateData="importTemplateData"
@success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" /> @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :fromInventoryStatus= "fromInventoryStatus" :toInventoryStatus="toInventoryStatus" />
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
@ -94,6 +94,56 @@ const routeName = ref()
routeName.value = route.name routeName.value = route.name
const tableColumns = ref(InventorymoveRequestMain.allSchemas.tableColumns) const tableColumns = ref(InventorymoveRequestMain.allSchemas.tableColumns)
console.log(99 , routeName.value)
const fromInventoryStatus = ref()
const toInventoryStatus = ref()
const { tableObject, tableMethods } = useTable({
getListApi: InventorymoveRequestMainApi.getInventorymoveRequestMainPage // 分页接口
})
// 判断 路由名称 进行条件过滤
/**
* OktoholdRequestMain 合格转隔离
*/
if ( routeName.value == 'OktoholdRequestMain') {
tableObject.params = {
fromInventoryStatus: 'OK',
toInventoryStatus:'HOLD'
}
fromInventoryStatus.value = 'OK'
toInventoryStatus.value = "HOLD"
} else if ( routeName.value == 'HoldtookRequestMain') {
tableObject.params = {
fromInventoryStatus: 'HOLD',
toInventoryStatus:'OK'
}
fromInventoryStatus.value = 'HOLD'
toInventoryStatus.value = "OK"
} else if ( routeName.value == 'HoldtoscrapRequestMain') {
tableObject.params = {
fromInventoryStatus: 'HOLD',
toInventoryStatus:'SCRAP'
}
fromInventoryStatus.value = 'HOLD'
toInventoryStatus.value = "SCRAP"
} else if ( routeName.value == 'OktoscrapRequestMain') {
tableObject.params = {
fromInventoryStatus: 'OK',
toInventoryStatus:'SCRAP'
}
fromInventoryStatus.value = 'OK'
toInventoryStatus.value = "SCRAP"
} else if ( routeName.value == 'ScraptoholdRequestMain') {
tableObject.params = {
fromInventoryStatus: 'SCRAP',
toInventoryStatus:'HOLD'
}
fromInventoryStatus.value = 'SCRAP'
toInventoryStatus.value = "HOLD"
}
// 字段设置 更新主列表字段 // 字段设置 更新主列表字段
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
tableColumns.value = val tableColumns.value = val
@ -142,10 +192,6 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom'] // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
const Echo = [] const Echo = []
const { tableObject, tableMethods } = useTable({
getListApi: InventorymoveRequestMainApi.getInventorymoveRequestMainPage // 分页接口
})
// 获得表格的各种操作 // 获得表格的各种操作
const { getList, setSearchParams } = tableMethods const { getList, setSearchParams } = tableMethods
@ -195,13 +241,14 @@ const isShowMainButton = (row,val) => {
// 列表-操作按钮 // 列表-操作按钮
const butttondata = (row) => { const butttondata = (row) => {
return [ return [
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), // 关闭 defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:inventorymove-request-main:close'}), // 关闭
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5'])}), // 重新添加 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:inventorymove-request-main:reAdd'}), //重新添加
defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1'])}), // 提交审批 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventorymove-request-main:submit'}), // 提交审批
defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2'])}), // 驳回 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventorymove-request-main:refused'}), // 驳回
defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), // 审批通过 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventorymove-request-main:agree'}), // 审批通过
defaultButtons.mainListEditBtn({hasPermi:'wms:inventorymove-request-main:update'}), // 编辑 defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:inventorymove-request-main:handle'}), // 处理
defaultButtons.mainListDeleteBtn({hasPermi:'wms:inventorymove-request-main:delete'}), // 删除 defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventorymove-request-main:update'}), // 编辑
// defaultButtons.mainListDeleteBtn({hasPermi:'wms:inventorymove-request-main:delete'}), // 删除
] ]
} }
@ -210,15 +257,53 @@ const butttondata = (row) => {
// 列表-操作按钮事件 // 列表-操作按钮事件
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
if (val == 'mainClose') { // 关闭 if (val == 'mainClose') { // 关闭
console.log('列表-操作按钮事件-关闭') await message.confirm('确认要关闭吗？')
InventorymoveRequestMainApi.close(row.id).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
console.log(err)
})
} else if (val == 'mainReAdd') { // 重新添加 } else if (val == 'mainReAdd') { // 重新添加
console.log('列表-操作按钮事件-重新添加') await message.confirm('确认要重新添加吗？')
InventorymoveRequestMainApi.reAdd(row.id).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
console.log(err)
})
} else if (val == 'mainSubmit') { // 提交审批 } else if (val == 'mainSubmit') { // 提交审批
console.log('列表-操作按钮事件-提交审批') await message.confirm('确认要提交审批吗？')
InventorymoveRequestMainApi.submit(row.id).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
console.log(err)
})
} else if (val == 'mainTurnDown') { // 驳回 } else if (val == 'mainTurnDown') { // 驳回
console.log('列表-操作按钮事件-驳回') await message.confirm('确认要驳回吗？')
InventorymoveRequestMainApi.refused(row.id).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
console.log(err)
})
} else if (val == 'mainApprove') { // 审批通过 } else if (val == 'mainApprove') { // 审批通过
console.log('列表-操作按钮事件-审批通过') await message.confirm('确认要审批通过吗？')
InventorymoveRequestMainApi.agree(row.id).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
console.log(err)
})
} else if (val == 'mainHandle') { // 处理
await message.confirm('确认要处理吗？')
InventorymoveRequestMainApi.handle(row.id).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
console.log(err)
})
} else if (val == 'edit') { // 编辑 } else if (val == 'edit') { // 编辑
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { // 删除 } else if (val == 'delete') { // 删除
@ -289,6 +374,10 @@ const handleDeleteTable = (item, index) => {
// 主子数据 提交 // 主子数据 提交
const submitForm = async (formType, data) => { const submitForm = async (formType, data) => {
data.subList = tableData.value // 拼接子表数据参数 data.subList = tableData.value // 拼接子表数据参数
data.subList.forEach(item => {
item.fromInventoryStatus = fromInventoryStatus.value
item.toInventoryStatus = toInventoryStatus.value
})
try { try {
if (formType === 'create') { if (formType === 'create') {
await InventorymoveRequestMainApi.createInventorymoveRequestMain(data) await InventorymoveRequestMainApi.createInventorymoveRequestMain(data)

44
src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
View File

@ -8,6 +8,9 @@ import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
import * as LocationApi from '@/api/wms/location' import * as LocationApi from '@/api/wms/location'
import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
import * as WarehouseApi from '@/api/wms/warehouse'
import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@ -57,6 +60,43 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
} }
} }
}, },
{
label: '从仓库代码',
field: 'fromWarehouseCode',
sort: 'custom',
table: {
width: 150
},
tableForm:{
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择从仓库代码',
searchField: 'code',
searchTitle: '仓库基础信息',
searchAllSchemas: Warehouse.allSchemas,
searchPage: WarehouseApi.getWarehousePage,
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true,
searchListPlaceholder: '请选择从仓库代码',
searchField: 'code',
searchTitle: '仓库基础信息',
searchAllSchemas: Warehouse.allSchemas,
searchPage: WarehouseApi.getWarehousePage,
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
}
}
},
{ {
label: '申请时间', label: '申请时间',
field: 'requestTime', field: 'requestTime',
@ -102,7 +142,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
{ {
label: '从仓库代码', label: '从仓库代码',
field: 'fromWarehouseOde', field: 'fromWarehouseCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -375,7 +415,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
//表单校验 //表单校验
export const InventorymoveRequestMainRules = reactive({ export const InventorymoveRequestMainRules = reactive({
// fromWarehouseOde: [ // fromWarehouseCode: [
// { required: true, message: '请选择从仓库代码', trigger: 'change' } // { required: true, message: '请选择从仓库代码', trigger: 'change' }
// ], // ],
// fromLocationTypes: [ // fromLocationTypes: [

4
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
View File

@ -127,7 +127,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
nextTick(() => { nextTick(() => {
if (type == 'tableForm') { if (type == 'tableForm') {
// 明细查询页赋值 // 明细查询页赋值
console.log(val[0])
row[formField] = val[0][searchField] row[formField] = val[0][searchField]
row['poNumber'] = val[0]['poNumber'] row['poNumber'] = val[0]['poNumber']
row['poLine'] = val[0]['poLine'] row['poLine'] = val[0]['poLine']
@ -174,7 +173,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
}) })
.then((res) => { .then((res) => {
if (res) tableData.value = res if (res) tableData.value = res
console.log(PurchasereturnRequestDetail.allSchemas.tableFormColumns)
tableData.value.forEach((item) => { tableData.value.forEach((item) => {
item.batch = item.toBatch item.batch = item.toBatch
item.packingNumber = item.toPackingNumber item.packingNumber = item.toPackingNumber
@ -451,7 +449,6 @@ const handleAddTable = () => {
// 删除明细 // 删除明细
const handleDeleteTable = (item, index,formRef) => { const handleDeleteTable = (item, index,formRef) => {
tableData.value.splice(index, 1) tableData.value.splice(index, 1)
console.log(item)
if (tableData.value.length == 0) { if (tableData.value.length == 0) {
isShowButton.value = true isShowButton.value = true
nextTick(() => { nextTick(() => {
@ -468,6 +465,7 @@ const handleDeleteTable = (item, index,formRef) => {
// 主子数据 提交 // 主子数据 提交
const submitForm = async (formType, data) => { const submitForm = async (formType, data) => {
console.log(formType)
data.subList = tableData.value // 拼接子表数据参数 data.subList = tableData.value // 拼接子表数据参数
try { try {
if (formType === 'create') { if (formType === 'create') {

2
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
View File

@ -221,7 +221,7 @@
handleApp(row.id) handleApp(row.id)
} else if (val == 'mainPlanTur') { // 驳回按钮 } else if (val == 'mainPlanTur') { // 驳回按钮
handleTur(row.id) handleTur(row.id)
}else if (val == 'genRecords') { // 驳回按钮 }else if (val == 'genRecords') { // 处理
genRecords(row.id) genRecords(row.id)
}else if (val == 'edit') { // 编辑 }else if (val == 'edit') { // 编辑
openForm('update', row) openForm('update', row)

30
src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/purchaseclaimRecordMain.data.ts
View File

@ -240,14 +240,6 @@ export const PurchaseclaimRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
} }
}, },
{
label: '替代批次',
field: 'altBatch',
sort: 'custom',
table: {
width: 150
}
},
{ {
label: '订单号', label: '订单号',
field: 'poNumber', field: 'poNumber',
@ -268,7 +260,6 @@ export const PurchaseclaimRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
label: '原因', label: '原因',
field: 'reason', field: 'reason',
isTable: true, isTable: true,
dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
dictClass: 'string', dictClass: 'string',
sort: 'custom', sort: 'custom',
table: { table: {
@ -313,25 +304,6 @@ export const PurchaseclaimRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
} }
}, },
{
label: '接口类型',
field: 'interfaceType',
dictType: DICT_TYPE.INTERFACE_TYPE,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
}
},
{
label: '任务明细ID',
field: 'jobDetailId',
sort: 'custom',
table: {
width: 150
}
},
{ {
label: '是否可用', label: '是否可用',
field: 'available', field: 'available',
@ -398,4 +370,4 @@ export const PurchaseclaimRecordDetailRules = reactive({
creator: [ creator: [
{ required: true, message: '请输入创建者', trigger: 'blur' } { required: true, message: '请输入创建者', trigger: 'blur' }
], ],
}) })

143
src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
View File

@ -55,6 +55,7 @@
import { getAccessToken } from '@/utils/auth' import { getAccessToken } from '@/utils/auth'
import download from '@/utils/download' import download from '@/utils/download'
import * as PurchaseclaimRequestMainApi from '@/api/wms/purchaseclaimRequestMain' import * as PurchaseclaimRequestMainApi from '@/api/wms/purchaseclaimRequestMain'
import * as SupplierdeliverRecordDetailApi from '@/api/wms/supplierdeliverRecordDetail'
import * as PurchaseclaimRequestDetailApi from '@/api/wms/purchaseclaimRequestDetail' import * as PurchaseclaimRequestDetailApi from '@/api/wms/purchaseclaimRequestDetail'
import { PurchaseclaimRequestMain, PurchaseclaimRequestMainRules, PurchaseclaimRequestDetail, PurchaseclaimRequestDetailRules } from './purchaseclaimRequestMain.data' import { PurchaseclaimRequestMain, PurchaseclaimRequestMainRules, PurchaseclaimRequestDetail, PurchaseclaimRequestDetailRules } from './purchaseclaimRequestMain.data'
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'
@ -79,10 +80,10 @@
// 查询页面返回 // 查询页面返回
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']
@ -99,11 +100,10 @@
// 主表查询页赋值 // 主表查询页赋值
const setV = {} const setV = {}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
if(formField=='asnNumber'){ if(formField=='asnNumber'){
// 获取子表数据 getBomDisassemble // 获取子表数据 getSupplierdeliverRecordDetailList
PurchasePlanDetailApi.getPurchasePlanDetailList({ SupplierdeliverRecordDetailApi.getSupplierdeliverRecordDetailList({
number: val[0]['asnNumber']}).then(res => { asnNumber: val[0]['asnNumber']}).then(res => {
if (res) tableData.value = res; if (res) tableData.value = res;
tableData.value.forEach(item=>{ tableData.value.forEach(item=>{
item.batch = item.toBatch item.batch = item.toBatch
@ -113,11 +113,6 @@
console.log(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)
@ -128,7 +123,7 @@
const searchTableSuccessDetail = (formField, searchField, val, formRef) => { const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
console.log(456) 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']
@ -189,14 +184,25 @@
// 列表-操作按钮 // 列表-操作按钮
const buttondata = (row) => { const buttondata = (row) => {
return [ return [
defaultButtons.mainListCloseBtn({ hide: isShowMainButton(row, ['1', '2', '3', '4', '6']) }), // 关闭 defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['5']) }), // 打开
defaultButtons.mainListReAddBtn({ hide: isShowMainButton(row, ['4', '5']) }), // 重新添加 defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1', '2', '4']) }), // 关闭
defaultButtons.mainListSubmitBtn({ hide: isShowMainButton(row, ['1']) }), // 提交审批 defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1']) }), // 提交审批
defaultButtons.mainListTurnDownBtn({ hide: isShowMainButton(row, ['2']) }), // 驳回 defaultButtons.mainListPlanAppBtn({ hide: isShowMainButton(row, ['2']) }), // 审批通过
defaultButtons.mainListApproveBtn({ hide: isShowMainButton(row, ['2']) }), // 审批通过 defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['2']) }), // 驳回按钮
defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchaseclaim-request-main:update' }), // 编辑 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.mainListDeleteBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchaseclaim-request-main:delete' }), // 删除
defaultButtons.mainListPointBtn(null), // 打印 defaultButtons.mainListPointBtn(null), // 打印
// 生成记录
{
label: '处理',
name: 'genRecords',
hide: isShowMainButton(row, ['3']),
type: 'primary',
icon: '',
color: '',
hasPermi: '',
link: true, // 文本展现按钮
},
] ]
} }
@ -211,17 +217,19 @@
// 列表-操作按钮事件 // 列表-操作按钮事件
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
if (val == 'mainClose') { // 关闭 if (val == 'mainPurPlanOpe') { // 打开
console.log('列表-操作按钮事件-关闭') handleOpe(row.id)
} else if (val == 'mainReAdd') { // 重新添加 } else if (val == 'mainPurPlanClo') {// 关闭
console.log('列表-操作按钮事件-重新添加') handleClo(row.id)
} else if (val == 'mainSubmit') { // 提交审批 } else if (val == 'mainPlanSub') { // 提交审批
console.log('列表-操作按钮事件-提交审批') handleSub(row.id)
} else if (val == 'mainTurnDown') { // 驳回 } else if (val == 'mainPlanApp') { // 审批通过
console.log('列表-操作按钮事件-驳回') handleApp(row.id)
} else if (val == 'mainApprove') { // 审批通过 } else if (val == 'mainPlanTur') { // 驳回按钮
console.log('列表-操作按钮事件-审批通过') handleTur(row.id)
} else if (val == 'edit') { // 编辑 }else if (val == 'genRecords') { // 驳回按钮
genRecords(row.id)
}else if (val == 'edit') { // 编辑
// const res = await ItempackagingApi.getItempackaging(row.id) // const res = await ItempackagingApi.getItempackaging(row.id)
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { // 删除 } else if (val == 'delete') { // 删除
@ -260,6 +268,85 @@
await getList() await getList()
} catch { } } catch { }
} }
/** 关闭按钮操作 */
const handleClo = async (id : number) => {
try {
// 关闭的二次确认
await message.confirm('是否关闭所选中数据？')
// 发起关闭
await PurchaseclaimRequestMainApi.cloPurchaseclaimRequestMain(id)
message.success(t('关闭成功!'))
// 刷新列表
await getList()
} catch { }
}
/** 打开按钮操作 */
const handleOpe = async (id : number) => {
try {
// 打开的二次确认
await message.confirm('是否打开所选中数据？')
// 发起打开
await PurchaseclaimRequestMainApi.opePurchaseclaimRequestMain(id)
message.success(t('打开成功!'))
// 刷新列表
await getList()
} catch { }
}
/** 提交审批按钮操作 */
const handleSub = async (id : number) => {
try {
// 提交审批的二次确认
await message.confirm('是否提交审批所选中数据？')
// 发起提交审批
await PurchaseclaimRequestMainApi.subPurchaseclaimRequestMain(id)
message.success(t('提交审批成功!'))
// 刷新列表
await getList()
} catch { }
}
/** 审批通过按钮操作 */
const handleApp = async (id : number) => {
try {
// 审批通过的二次确认
await message.confirm('是否审批通过所选中数据？')
// 发起审批通过
await PurchaseclaimRequestMainApi.appPurchaseclaimRequestMain(id)
message.success(t('审批通过成功!'))
// 刷新列表
await getList()
} catch { }
}
/** 驳回按钮操作 */
const handleTur = async (id : number) => {
try {
// 驳回的二次确认
await message.confirm('是否驳回所选中数据？')
// 发起驳回
await PurchaseclaimRequestMainApi.rejPurchaseclaimRequestMain(id)
message.success(t('驳回成功!'))
// 刷新列表
await getList()
} catch { }
}
/** 处理按钮操作 */
const genRecords = async (id : number) => {
try {
// 处理的二次确认
await message.confirm('是否处理所选中数据？')
// 发起处理
await PurchaseclaimRequestMainApi.genRecordsPurchaseclaimRequestMain(id)
message.success(t('处理成功!'))
// 刷新列表
await getList()
} catch { }
}
/** 导出按钮操作 */ /** 导出按钮操作 */
const handleExport = async () => { const handleExport = async () => {

30
src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
View File

@ -375,13 +375,6 @@ export const PurchaseclaimRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
width: 150 width: 150
}, },
}, },
{
label: '替代批次',
field: 'altBatch',
table: {
width: 150
},
},
{ {
label: '原因', label: '原因',
field: 'reason', field: 'reason',
@ -436,27 +429,6 @@ export const PurchaseclaimRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
width: 150 width: 150
}, },
}, },
{
label: '物品描述1',
field: 'itemDesc1',
table: {
width: 150
},
},
{
label: '物品描述2',
field: 'itemDesc2',
table: {
width: 150
},
},
{
label: '项目代码',
field: 'projectCode',
table: {
width: 150
},
},
{ {
label: '数量', label: '数量',
field: 'qty', field: 'qty',
@ -576,4 +548,4 @@ export const PurchaseclaimRequestDetailRules = reactive({
uom: [ uom: [
{ required: true, message: '请输入计量单位', trigger: 'change' } { required: true, message: '请输入计量单位', trigger: 'change' }
], ],
}) })

24
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
View File

@ -71,10 +71,6 @@
:apiDelete="SupplierinvoiceRequestDetailApi.deleteSupplierinvoiceRequestDetail" :apiDelete="SupplierinvoiceRequestDetailApi.deleteSupplierinvoiceRequestDetail"
:Echo="Echo" :Echo="Echo"
/> />
<!-- 导入 -->
<ImportForm ref="importFormRef" url="/wms/supplierinvoice-request-main/import" :importTemplateData="importTemplateData"
@success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
@ -150,7 +146,7 @@ const { getList, setSearchParams } = tableMethods
// 列表头部按钮 // 列表头部按钮
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:supplierinvoice-request-main:create'}), // 新增——需要手动修改下权限 defaultButtons.defaultAddBtn({hasPermi:'wms:supplierinvoice-request-main:create'}), // 新增——需要手动修改下权限
defaultButtons.defaultImportBtn({hasPermi:'wms:supplierinvoice-request-main:import'}), // 导入
defaultButtons.defaultExportBtn({hasPermi:'wms:supplierinvoice-request-main:export'}), // 导出 defaultButtons.defaultExportBtn({hasPermi:'wms:supplierinvoice-request-main:export'}), // 导出
defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFreshBtn(null), // 刷新
defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultFilterBtn(null), // 筛选
@ -303,23 +299,6 @@ const submitForm = async (formType, data) => {
} }
} }
/** 导入 */
const importFormRef = ref()
const handleImport = () => {
importFormRef.value.open()
}
// 导入附件弹窗所需的参数
const importTemplateData = reactive({
templateUrl: '',
templateTitle: '供应商发票申请主导入模版.xlsx'
})
// 导入成功之后
const importSuccess = () => {
getList()
}
// 筛选提交 // 筛选提交
const searchFormClick = (searchData) => { const searchFormClick = (searchData) => {
tableObject.params = { tableObject.params = {
@ -332,6 +311,5 @@ const searchFormClick = (searchData) => {
/** 初始化 **/ /** 初始化 **/
onMounted(async () => { onMounted(async () => {
getList() getList()
importTemplateData.templateUrl = await SupplierinvoiceRequestMainApi.importTemplate()
}) })
</script> </script>

Write Preview
Loading…
Cancel
Save