Browse Source

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

master_hella_20240701
zhaoxuebing 9 months ago
parent
commit
0c2062c1a2
  1. 2
      src/api/wms/productionreturnRequestMainNo/index.ts
  2. 5
      src/api/wms/supplierUser/index.ts
  3. 2
      src/views/wms/basicDataManage/customerManage/project/index.vue
  4. 11
      src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts
  5. 4
      src/views/wms/basicDataManage/factoryModeling/process/index.vue
  6. 4
      src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
  7. 43
      src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
  8. 8
      src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
  9. 4
      src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts
  10. 12
      src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts
  11. 26
      src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
  12. 26
      src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
  13. 1
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

2
src/api/wms/productionreturnRequestMainNo/index.ts

@ -70,7 +70,7 @@ export const exportProductionreturnRequestMain = async (params) => {
// 下载用户导入模板
export const importTemplate = () => {
return request.download({ url: '/wms/productionreturn-request-main/get-import-template' })
return request.download({ url: '/wms/productionreturn-request-main/get-import-template-hold' })
}
// 关闭

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

@ -45,7 +45,12 @@ export const deleteSupplierUser = async (id: number) => {
// 导出供应商用户关联信息 Excel
export const exportSupplierUser = async (params) => {
if (params.isSearch) {
const data = {...params}
return await request.downloadPost({ url: `/wms/supplier-user/export-excel-senior`, data })
} else {
return await request.download({ url: `/wms/supplier-user/export-excel`, params })
}
}
// 下载用户导入模板

2
src/views/wms/basicDataManage/customerManage/project/index.vue

@ -155,7 +155,7 @@ const openForm = (type: string, row?: any) => {
item.componentProps.isSearchList = false
}
if (item.field == 'code') {
item.componentProps.disabled = TransferissueJobMain
item.componentProps.disabled = true
}
})
}else {

11
src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts

@ -85,6 +85,14 @@ export const Documentsetting = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
form: {
component: 'InputNumber',
componentProps: {
min: 0,
max: 50,
precision: 0
}
},
},
{
label: '号码分隔符',
@ -252,8 +260,7 @@ export const DocumentsettingRules = reactive({
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
],
serialLength: [
{ required: true, message: '请输入号码流水长度', trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
{ required: true, message: '请输入号码流水长度', trigger: 'blur' }
],
resetPeriod: [
{ required: true, message: '请选择流水重置周期', trigger: 'change' }

4
src/views/wms/basicDataManage/factoryModeling/process/index.vue

@ -173,8 +173,8 @@ const openForm = (type: string, row?: any) => {
item.componentProps.isSearchList = true
}
if (item.field == 'productionLineCode') {
item.componentProps.disabled = true
item.componentProps.isSearchList = false
item.componentProps.disabled = false
item.componentProps.isSearchList = true
}
})
}

4
src/views/wms/basicDataManage/factoryModeling/workstation/index.vue

@ -174,8 +174,8 @@ const openForm = (type: string, row?: any) => {
item.componentProps.isSearchList = true
}
if (item.field == 'productionLineCode') {
item.componentProps.disabled = true
item.componentProps.isSearchList = false
item.componentProps.disabled = false
item.componentProps.isSearchList = true
}
})
}

43
src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts

@ -37,17 +37,17 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
},
isSearch: true
},
{
label: '类型',
field: 'type',
dictType: DICT_TYPE.WORK_STATION_TYPE,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
},
// {
// label: '类型',
// field: 'type',
// dictType: DICT_TYPE.WORK_STATION_TYPE,
// dictClass: 'string',
// isTable: true,
// sort: 'custom',
// table: {
// width: 150
// },
// },
{
label: '车间代码',
field: 'workshopCode',
@ -123,7 +123,9 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
key: 'available',
value: 'TRUE',
isMainValue: false
}]
}
// TODO: 陈放修改 ; 数据过滤 查询库区对应成品类型下的所有库位
]
}
}
},
@ -149,13 +151,16 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
action: '==',
isSearch: true,
isMainValue: false
},{
key: 'type',
value: 'FG',
action: '==',
isSearch: true,
isMainValue: false
}]
}
// TODO: 陈放修改 ; 数据过滤 查询库区对应成品类型下的所有库位
// ,{
// key: 'type',
// value: 'FG',
// action: '==',
// isSearch: true,
// isMainValue: false
// }
]
}
}
},

8
src/views/wms/basicDataManage/itemManage/bom/bom.data.ts

@ -245,18 +245,18 @@ export const BomRules = reactive({
],
processCode: [
{ required: true, message: '请输入工序代码', trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'change' },
],
version: [
{ required: true, message: '请输入版本', trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
{ max: 50, message: '不得超过50个字符', trigger: 'change' }
],
layer: [
{ required: true, message: '请输入层级', trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
{ max: 50, message: '不得超过50个字符', trigger: 'change' }
],
remark: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
{ max: 50, message: '不得超过50个字符', trigger: 'change' }
],
available: [
{ required: true, message: '请选择是否可用', trigger: 'change' }

4
src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts

@ -16,6 +16,7 @@ export const BarcodeRules = reactive({
length: [required],
prefixLenght: [required],
prefixChar: [
{ required: true, message: '请输入前缀字符', trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
],
entityProperties: [
@ -29,6 +30,9 @@ export const BarcodeRules = reactive({
{ required: true, message: '请输入截断尾部空格', trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
],
labelType:[
{ required: true, message: '请选择标签类型', trigger: 'blur' }
],
isEncypt: [required],
})

12
src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts

@ -121,8 +121,8 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
field: 'activeTime',
isTable: true,
formatter: dateFormatter,
details: {
dateFormatter: 'YYYY-MM-DD HH:mm:ss'
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
table: {
@ -143,8 +143,8 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
field: 'expireTime',
isTable: true,
formatter: dateFormatter,
details: {
dateFormatter: 'YYYY-MM-DD HH:mm:ss'
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
table: {
@ -166,8 +166,8 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
isTable: false,
isForm:false,
formatter: dateFormatter,
details: {
dateFormatter: 'YYYY-MM-DD HH:mm:ss'
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
table: {

26
src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue

@ -85,6 +85,11 @@
@searchTableSuccess="searchTableSuccess"
@submitForm="submitFormLabel"
/>
<!-- 导入 -->
<ImportForm ref="importFormRef" url="/wms/productionreturn-request-main/import" :importTemplateData="importTemplateData"
@success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
</template>
<script setup lang="ts">
@ -232,6 +237,7 @@ const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:productionreturn-request-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:productionreturn-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:productionreturn-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), //
@ -243,6 +249,8 @@ const HeadButttondata = [
const buttonBaseClick = (val, item) => {
if (val == 'add') { //
openForm('create')
} else if (val == 'import') { //
handleImport()
} else if (val == 'export') { //
handleExport()
} else if (val == 'refresh') { //
@ -625,6 +633,23 @@ const handlePoint = async (row) => {
}
}
/** 导入 */
const importFormRef = ref()
const handleImport = () => {
importFormRef.value.open()
}
//
const importTemplateData = reactive({
templateUrl: '',
templateTitle: '生产退料导入模版.xlsx'
})
//
const importSuccess = () => {
getList()
}
//
const searchFormClick = (searchData) => {
tableObject.params = {
@ -637,5 +662,6 @@ const searchFormClick = (searchData) => {
/** 初始化 **/
onMounted(async () => {
getList()
importTemplateData.templateUrl = await ProductionreturnRequestMainApi.importTemplate()
})
</script>

26
src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue

@ -84,6 +84,11 @@
@searchTableSuccess="searchTableSuccess"
@submitForm="submitFormLabel"
/>
<!-- 导入 -->
<ImportForm ref="importFormRef" url="/wms/productionreturn-request-main/importNO" :importTemplateData="importTemplateData"
@success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
</template>
<script setup lang="ts">
@ -237,6 +242,7 @@ const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:productionreturn-request-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:productionreturn-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:productionreturn-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), //
@ -248,6 +254,8 @@ const HeadButttondata = [
const buttonBaseClick = (val, item) => {
if (val == 'add') { //
openForm('create')
} else if (val == 'import') { //
handleImport()
} else if (val == 'export') { //
handleExport()
} else if (val == 'refresh') { //
@ -618,6 +626,23 @@ const handlePoint = async (row) => {
}
}
/** 导入 */
const importFormRef = ref()
const handleImport = () => {
importFormRef.value.open()
}
//
const importTemplateData = reactive({
templateUrl: '',
templateTitle: '隔离退料导入模版.xlsx'
})
//
const importSuccess = () => {
getList()
}
//
const searchFormClick = (searchData) => {
tableObject.params = {
@ -630,5 +655,6 @@ const searchFormClick = (searchData) => {
/** 初始化 **/
onMounted(async () => {
getList()
importTemplateData.templateUrl = await ProductionreturnRequestMainNoApi.importTemplate()
})
</script>

1
src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

@ -601,6 +601,7 @@ const submitForm = async (formType, data) => {
})
if (isExist) {
formRef.value.formLoading = false
isExist = false
return message.warning('包装号重复')
}
data.subList.forEach(item => {

Loading…
Cancel
Save