@@ -94,6 +94,7 @@ $prefix-cls: #{$namespace}-login;
z-index: -1;
width: 100%;
height: 100%;
+ background-size: cover;
// background-image: url('@/assets/svgs/login-bg.svg');
background-image: url('@/assets/imgs/login-bg.png');
background-position: center;
diff --git a/src/views/qms/aql/index.vue b/src/views/qms/aql/index.vue
index c74fe3459..3dc399dba 100644
--- a/src/views/qms/aql/index.vue
+++ b/src/views/qms/aql/index.vue
@@ -1,22 +1,27 @@
-
+
-
-
+
+
-
@@ -55,12 +63,17 @@
-
+
diff --git a/src/views/qms/counter/index.vue b/src/views/qms/counter/index.vue
index cd789a436..d57b19136 100644
--- a/src/views/qms/counter/index.vue
+++ b/src/views/qms/counter/index.vue
@@ -1,22 +1,27 @@
-
+
-
-
+
+
-
@@ -54,12 +59,17 @@
-
+
diff --git a/src/views/qms/dynamicRule/index.vue b/src/views/qms/dynamicRule/index.vue
index 951326cc8..72b59a060 100644
--- a/src/views/qms/dynamicRule/index.vue
+++ b/src/views/qms/dynamicRule/index.vue
@@ -1,22 +1,27 @@
-
+
-
-
+
+
-
@@ -60,15 +68,15 @@
import download from '@/utils/download'
-import { DynamicRule,DynamicRuleRules } from './dynamicRule.data'
-import { InspectionStage,InspectionStageRules } from '../inspectionStage/inspectionStage.data'
+import { DynamicRule, DynamicRuleRules } from './dynamicRule.data'
+import { InspectionStage, InspectionStageRules } from '../inspectionStage/inspectionStage.data'
import * as DynamicRuleApi from '@/api/qms/dynamicRule'
import * as InspectionStageApi from '@/api/qms/inspectionStage'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import UploadFile from '@/components/UploadFile/src/UploadFile.vue'
import { checkPermi } from '@/utils/permission'
-import ImportForm from "../../../components/ImportForm/src/ImportForm.vue";
+import ImportForm from '../../../components/ImportForm/src/ImportForm.vue'
// import TableHead from '@/components/TableHead/src/TableHead.vue'
// import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
// import Detail from '@/components/Detail/src/Detail.vue'
@@ -141,12 +149,12 @@ const { getList, setSearchParams } = tableMethods
// 列表头部按钮
const HeadButttondata = [
- defaultButtons.defaultAddBtn({hasPermi:'qms:dynamic-rule:create'}), // 新增
- defaultButtons.defaultImportBtn({hasPermi:'qms:dynamic-rule:import'}), // 导入
- defaultButtons.defaultExportBtn({hasPermi:'qms:dynamic-rule:export'}), // 导出
+ defaultButtons.defaultAddBtn({ hasPermi: 'qms:dynamic-rule:create' }), // 新增
+ defaultButtons.defaultImportBtn({ hasPermi: 'qms:dynamic-rule:import' }), // 导入
+ defaultButtons.defaultExportBtn({ hasPermi: 'qms:dynamic-rule:export' }), // 导出
defaultButtons.defaultFreshBtn(null), // 刷新
defaultButtons.defaultFilterBtn(null), // 筛选
- defaultButtons.defaultSetBtn(null), // 设置
+ defaultButtons.defaultSetBtn(null) // 设置
// {
// label: '自定义扩展按钮',
// name: 'zdy',
@@ -159,21 +167,27 @@ const HeadButttondata = [
// 头部按钮事件
const buttonBaseClick = (val, item) => {
- if (val == 'add') { // 新增
+ if (val == 'add') {
+ // 新增
openForm('create')
- } else if (val == 'import') { // 导入
+ } else if (val == 'import') {
+ // 导入
handleImport()
- } else if (val == 'export') { // 导出
+ } else if (val == 'export') {
+ // 导出
handleExport()
- } else if (val == 'refresh') { // 刷新
+ } else if (val == 'refresh') {
+ // 刷新
getList()
- } else if (val == 'filtrate') { // 筛选
- } else { // 其他按钮
+ } else if (val == 'filtrate') {
+ // 筛选
+ } else {
+ // 其他按钮
console.log('其他按钮', item)
}
}
-const isShowMainButton = (row,val) => {
+const isShowMainButton = (row, val) => {
if (val.indexOf(row.available) > -1) {
return false
} else {
@@ -183,22 +197,30 @@ const isShowMainButton = (row,val) => {
const butttondata = (row) => {
return [
- defaultButtons.mainListEditBtn({hasPermi: 'qms:dynamic-rule:update'}),
- defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:dynamic-rule:enable'}),
- defaultButtons.mainListDisableBtn({ hide: isShowMainButton(row, ['TRUE']), hasPermi: 'qms:dynamic-rule:disable' }),
- defaultButtons.mainListDeleteBtn({hasPermi:'qms:dynamic-rule:delete'}), // 删除
+ defaultButtons.mainListEditBtn({ hasPermi: 'qms:dynamic-rule:update' }),
+ defaultButtons.mainListEnableBtn({
+ hide: isShowMainButton(row, ['FALSE']),
+ hasPermi: 'qms:dynamic-rule:enable'
+ }),
+ defaultButtons.mainListDisableBtn({
+ hide: isShowMainButton(row, ['TRUE']),
+ hasPermi: 'qms:dynamic-rule:disable'
+ }),
+ defaultButtons.mainListDeleteBtn({ hasPermi: 'qms:dynamic-rule:delete' }) // 删除
]
}
// 列表-操作按钮事件
const buttonTableClick = async (val, row) => {
- if (val == 'edit') { // 编辑
+ if (val == 'edit') {
+ // 编辑
editForm('update', row)
- } else if (val == 'delete') { // 删除
+ } else if (val == 'delete') {
+ // 删除
handleDelete(row.id)
- }else if (val == 'enable') {
+ } else if (val == 'enable') {
handleEnable(row.id)
- }else if (val == 'disable') {
+ } else if (val == 'disable') {
handleDisable(row.id)
}
}
@@ -212,33 +234,39 @@ const openForm = async (type: string, row?: any) => {
const editForm = async (type: string, row?: any) => {
tableData.value = []
detailMasterId.value = row.id
- InspectionStageApi.getInspectionStageNoPage({masterId:row.id}).then(res=>{
+ InspectionStageApi.getInspectionStageNoPage({ masterId: row.id }).then((res) => {
tableData.value = res
})
basicFormRef.value.open(type, row)
}
// form表单提交
-const formsSuccess = async (formType,data) => {
- var isHave =DynamicRule.allSchemas.formSchema.some(function (item) {
- return item.field === 'activeTime' || item.field === 'expireTime';
- });
- if(isHave){
- if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
- message.error('失效时间要大于生效时间')
- return;
+const formsSuccess = async (formType, data) => {
+ try {
+ var isHave = DynamicRule.allSchemas.formSchema.some(function (item) {
+ return item.field === 'activeTime' || item.field === 'expireTime'
+ })
+ if (isHave) {
+ if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
+ message.error('失效时间要大于生效时间')
+ return
+ }
}
+ if (data.activeTime == 0) data.activeTime = null
+ if (data.expireTime == 0) data.expireTime = null
+ basicFormRef.value.formLoading = true
+ if (formType === 'create') {
+ await DynamicRuleApi.createDynamicRule(data)
+ message.success(t('common.createSuccess'))
+ } else {
+ await DynamicRuleApi.updateDynamicRule(data)
+ message.success(t('common.updateSuccess'))
+ }
+ basicFormRef.value.dialogVisible = false
+ basicFormRef.value.formLoading = false
+ getList()
+ } catch {
+ basicFormRef.value.formLoading = false
}
- if(data.activeTime==0)data.activeTime = null;
- if(data.expireTime==0)data.expireTime = null;
- if (formType === 'create') {
- await DynamicRuleApi.createDynamicRule(data)
- message.success(t('common.createSuccess'))
- } else {
- await DynamicRuleApi.updateDynamicRule(data)
- message.success(t('common.updateSuccess'))
- }
- basicFormRef.value.dialogVisible = false
- getList()
}
/** 详情操作 */
@@ -331,23 +359,23 @@ const handleDeleteTable = (item, index) => {
tableData.value.splice(index, 1)
}
-
// 主子数据 提交
const submitForm = async (formType, data) => {
- const flag = validateNotRepetition(tableData.value);
- const emptyFlag = validateDetailEmpty(tableData.value);
- if(!emptyFlag){
+ const flag = validateNotRepetition(tableData.value)
+ const emptyFlag = validateDetailEmpty(tableData.value)
+ if (!emptyFlag) {
message.alertWarning('明细不能为空')
basicFormRef.value.formLoading = false
return
}
- if(!flag){
+ if (!flag) {
message.alertWarning('动态规则阶段不能重复')
basicFormRef.value.formLoading = false
return
}
- data.inspectionStageDOList = tableData.value// 拼接子表数据参数
+ data.inspectionStageDOList = tableData.value // 拼接子表数据参数
try {
+ basicFormRef.value.formLoading = true
if (formType === 'create') {
await DynamicRuleApi.createDynamicRule(data)
message.success(t('common.createSuccess'))
@@ -356,6 +384,7 @@ const submitForm = async (formType, data) => {
message.success(t('common.updateSuccess'))
}
basicFormRef.value.dialogVisible = false
+ basicFormRef.value.formLoading = false
// 刷新当前列表
getList()
} finally {
@@ -363,9 +392,9 @@ const submitForm = async (formType, data) => {
}
}
-const detailValidate = (type,data) => {
- let tag = true;
- if(!validateIfRepeat(type,data)){
+const detailValidate = (type, data) => {
+ let tag = true
+ if (!validateIfRepeat(type, data)) {
tag = false
message.alertWarning('动态规则阶段不能重复')
}
@@ -374,49 +403,49 @@ const detailValidate = (type,data) => {
const detailOpenForm = (type, row, masterParmas) => {
detailMasterId.value = masterParmas.masterId
- InspectionStageApi.getInspectionStageNoPage({masterId:masterParmas.masterId}).then(res=>{
+ InspectionStageApi.getInspectionStageNoPage({ masterId: masterParmas.masterId }).then((res) => {
detailList.value = res
})
}
-const validateIfRepeat = (type,data) => {
- let mergedArray: any[] = [];
- if(type == 'create'){
- mergedArray = [data, ...detailList.value];
- }if(type == 'update'){
- detailList.value = detailList.value.filter(item => item.id !== data.id);
- mergedArray = [data, ...detailList.value];
+const validateIfRepeat = (type, data) => {
+ let mergedArray: any[] = []
+ if (type == 'create') {
+ mergedArray = [data, ...detailList.value]
+ }
+ if (type == 'update') {
+ detailList.value = detailList.value.filter((item) => item.id !== data.id)
+ mergedArray = [data, ...detailList.value]
}
- const stageSet = new Set(mergedArray.map(item => item.stage));
- return stageSet.size === mergedArray.length;
+ const stageSet = new Set(mergedArray.map((item) => item.stage))
+ return stageSet.size === mergedArray.length
}
const validateDetailEmpty = (data) => {
- const codes = data.map(item => item.stage);
- if(codes.length == 0){
- return false;
+ const codes = data.map((item) => item.stage)
+ if (codes.length == 0) {
+ return false
}
- return true;
+ return true
}
const validateNotRepetition = (data) => {
// 提取所有的 dictionaryTypeAndCode 值
- const codes = data.map(item => item.stage);
+ const codes = data.map((item) => item.stage)
// 创建一个 Set 来存储唯一的 dictionaryTypeAndCode 值
- const uniqueCodes = new Set(codes);
+ const uniqueCodes = new Set(codes)
// 如果原始数组的长度大于 Set 集合的大小，则说明有重复
if (codes.length > uniqueCodes.size) {
- return false; // 发现重复，返回 false
+ return false // 发现重复，返回 false
}
- return true; // 未发现重复，返回 true
-};
+ return true // 未发现重复，返回 true
+}
/** 初始化 **/
onMounted(async () => {
- tableObject.params = {
- available: true
- }
+ tableObject.params = {
+ available: true
+ }
getList()
importTemplateData.templateUrl = await DynamicRuleApi.importTemplate()
})
-
diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue
index 3c188f9dd..df041bc5b 100644
--- a/src/views/qms/inspectionJob/index.vue
+++ b/src/views/qms/inspectionJob/index.vue
@@ -389,6 +389,7 @@ const tableData = ref([])
const submitForm = async (formType, data) => {
// return
try {
+ formRef.value.formLoading = true
if (formType === 'create') {
await InspectionJobMainApi.createInspectionJobMain(data)
message.success(t('common.createSuccess'))
@@ -397,6 +398,7 @@ const submitForm = async (formType, data) => {
message.success(t('common.updateSuccess'))
}
formRef.value.dialogVisible = false
+ formRef.value.formLoading = false
// 刷新当前列表
getList()
} finally {
diff --git a/src/views/qms/inspectionMethod/index.vue b/src/views/qms/inspectionMethod/index.vue
index 29a9a5cd0..0fd66b4a8 100644
--- a/src/views/qms/inspectionMethod/index.vue
+++ b/src/views/qms/inspectionMethod/index.vue
@@ -1,22 +1,27 @@
-
+
-
-
+
+
-
@@ -42,12 +50,14 @@
import download from '@/utils/download'
-import { InspectionMethod,InspectionMethodRules } from './inspectionMethod.data'
+import { InspectionMethod, InspectionMethodRules } from './inspectionMethod.data'
import * as InspectionMethodApi from '@/api/qms/inspectionMethod'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
@@ -113,12 +123,12 @@ const { getList, setSearchParams } = tableMethods
// 列表头部按钮
const HeadButttondata = [
- defaultButtons.defaultAddBtn({hasPermi:'qms:inspection-method:create'}), // 新增
- defaultButtons.defaultImportBtn({hasPermi:'qms:inspection-method:import'}), // 导入
- defaultButtons.defaultExportBtn({hasPermi:'qms:inspection-method:export'}), // 导出
+ defaultButtons.defaultAddBtn({ hasPermi: 'qms:inspection-method:create' }), // 新增
+ defaultButtons.defaultImportBtn({ hasPermi: 'qms:inspection-method:import' }), // 导入
+ defaultButtons.defaultExportBtn({ hasPermi: 'qms:inspection-method:export' }), // 导出
defaultButtons.defaultFreshBtn(null), // 刷新
defaultButtons.defaultFilterBtn(null), // 筛选
- defaultButtons.defaultSetBtn(null), // 设置
+ defaultButtons.defaultSetBtn(null) // 设置
// {
// label: '自定义扩展按钮',
// name: 'zdy',
@@ -131,21 +141,27 @@ const HeadButttondata = [
// 头部按钮事件
const buttonBaseClick = (val, item) => {
- if (val == 'add') { // 新增
+ if (val == 'add') {
+ // 新增
openForm('create')
- } else if (val == 'import') { // 导入
+ } else if (val == 'import') {
+ // 导入
handleImport()
- } else if (val == 'export') { // 导出
+ } else if (val == 'export') {
+ // 导出
handleExport()
- } else if (val == 'refresh') { // 刷新
+ } else if (val == 'refresh') {
+ // 刷新
getList()
- } else if (val == 'filtrate') { // 筛选
- } else { // 其他按钮
+ } else if (val == 'filtrate') {
+ // 筛选
+ } else {
+ // 其他按钮
console.log('其他按钮', item)
}
}
-const isShowMainButton = (row,val) => {
+const isShowMainButton = (row, val) => {
if (val.indexOf(row.available) > -1) {
return false
} else {
@@ -155,22 +171,30 @@ const isShowMainButton = (row,val) => {
const butttondata = (row) => {
return [
- defaultButtons.mainListEditBtn({hasPermi: 'qms:inspection-method:update'}),
- defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:inspection-method:enable'}),
- defaultButtons.mainListDisableBtn({ hide: isShowMainButton(row, ['TRUE']), hasPermi: 'qms:inspection-method:disable' }),
- defaultButtons.mainListDeleteBtn({hasPermi:'qms:inspection-method:delete'}), // 删除
+ defaultButtons.mainListEditBtn({ hasPermi: 'qms:inspection-method:update' }),
+ defaultButtons.mainListEnableBtn({
+ hide: isShowMainButton(row, ['FALSE']),
+ hasPermi: 'qms:inspection-method:enable'
+ }),
+ defaultButtons.mainListDisableBtn({
+ hide: isShowMainButton(row, ['TRUE']),
+ hasPermi: 'qms:inspection-method:disable'
+ }),
+ defaultButtons.mainListDeleteBtn({ hasPermi: 'qms:inspection-method:delete' }) // 删除
]
}
// 列表-操作按钮事件
const buttonTableClick = async (val, row) => {
- if (val == 'edit') { // 编辑
+ if (val == 'edit') {
+ // 编辑
openForm('update', row)
- } else if (val == 'delete') { // 删除
+ } else if (val == 'delete') {
+ // 删除
handleDelete(row.id)
- }else if (val == 'enable') {
+ } else if (val == 'enable') {
handleEnable(row.id)
- }else if (val == 'disable') {
+ } else if (val == 'disable') {
handleDisable(row.id)
}
}
@@ -178,7 +202,7 @@ const buttonTableClick = async (val, row) => {
/** 添加/修改操作 */
const basicFormRef = ref()
const openForm = (type: string, row?: any) => {
- if(row && row.videoAddress?.trim()){
+ if (row && row.videoAddress?.trim()) {
row.filePathList = row.videoAddress.split(',')
}
@@ -190,39 +214,47 @@ const openForm = (type: string, row?: any) => {
}
})
}
- if(type=='create'){
+ if (type == 'create') {
const currentTime = new Date().getTime()
- const fileId = InspectionMethod.allSchemas.formSchema.find(item=>item.field=='fileId')
- const uploadFile = InspectionMethod.allSchemas.formSchema.find(item=>item.field=='videoAddress')
- if(fileId){
+ const fileId = InspectionMethod.allSchemas.formSchema.find((item) => item.field == 'fileId')
+ const uploadFile = InspectionMethod.allSchemas.formSchema.find(
+ (item) => item.field == 'videoAddress'
+ )
+ if (fileId) {
fileId['value'] = currentTime
}
- if(uploadFile){
+ if (uploadFile) {
uploadFile['componentProps']['upData']['tableId'] = currentTime
- uploadFile['componentProps']['modelValue']= []
+ uploadFile['componentProps']['modelValue'] = []
}
- }else if(type=='update'){
- const uploadFile = InspectionMethod.allSchemas.formSchema.find(item=>item.field=='videoAddress')
- uploadFile['componentProps']['modelValue']= row.filePathListView
-
+ } else if (type == 'update') {
+ const uploadFile = InspectionMethod.allSchemas.formSchema.find(
+ (item) => item.field == 'videoAddress'
+ )
+ uploadFile['componentProps']['modelValue'] = row.filePathListView
}
basicFormRef.value.open(type, row)
}
// form表单提交
-const formsSuccess = async (formType,data) => {
- if (formType === 'create') {
-
- delete data['uploadFile']
- await InspectionMethodApi.createInspectionMethod(data)
- message.success(t('common.createSuccess'))
- } else {
- // debugger
- await InspectionMethodApi.updateInspectionMethod(data)
- message.success(t('common.updateSuccess'))
+const formsSuccess = async (formType, data) => {
+ try {
+ basicFormRef.value.formLoading = true
+ if (formType === 'create') {
+ delete data['uploadFile']
+ await InspectionMethodApi.createInspectionMethod(data)
+ message.success(t('common.createSuccess'))
+ } else {
+ // debugger
+ await InspectionMethodApi.updateInspectionMethod(data)
+ message.success(t('common.updateSuccess'))
+ }
+ basicFormRef.value.dialogVisible = false
+ basicFormRef.value.formLoading = false
+ getList()
+ } finally {
+ basicFormRef.value.formLoading = false
}
- basicFormRef.value.dialogVisible = false
- getList()
}
/** 详情操作 */
@@ -302,11 +334,10 @@ const searchFormClick = (searchData) => {
/** 初始化 **/
onMounted(async () => {
- tableObject.params = {
- available: true
- }
+ tableObject.params = {
+ available: true
+ }
getList()
importTemplateData.templateUrl = await InspectionMethodApi.importTemplate()
})
-
diff --git a/src/views/qms/inspectionQ1/index.vue b/src/views/qms/inspectionQ1/index.vue
index 6e42909ac..71ee2fd82 100644
--- a/src/views/qms/inspectionQ1/index.vue
+++ b/src/views/qms/inspectionQ1/index.vue
@@ -1,18 +1,22 @@
-
+
-
-
+
+
@@ -27,13 +31,16 @@
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
-
+
{{ row.number }}
-
+
@@ -54,12 +61,17 @@
-
+
diff --git a/src/views/qms/inspectionQ1/inspectionQ1.data.ts b/src/views/qms/inspectionQ1/inspectionQ1.data.ts
index 3bcbde33e..e4e396c42 100644
--- a/src/views/qms/inspectionQ1/inspectionQ1.data.ts
+++ b/src/views/qms/inspectionQ1/inspectionQ1.data.ts
@@ -282,21 +282,21 @@ export const Q1 = useCrudSchemas(
{
label: '索赔日期',
field: 'claimTime',
- sort: 'custom',
- formatter: dateFormatter,
isSearch: false,
- search: {
- component: 'DatePicker',
- componentProps: {
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- type: 'daterange',
- defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
- }
+ isTable: false,
+ table: {
+ width: 180
+ },
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
form: {
component: 'DatePicker',
componentProps: {
+ style: { width: '100%' },
type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
}
}
@@ -304,22 +304,21 @@ export const Q1 = useCrudSchemas(
{
label: '处理时间',
field: 'handleTime',
- sort: 'custom',
- formatter: dateFormatter,
isSearch: false,
isTable: false,
- search: {
- component: 'DatePicker',
- componentProps: {
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- type: 'daterange',
- defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
- }
+ table: {
+ width: 180
+ },
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
form: {
component: 'DatePicker',
componentProps: {
+ style: { width: '100%' },
type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
}
}
@@ -367,23 +366,29 @@ export const Q1 = useCrudSchemas(
{
label: '创建时间',
field: 'createTime',
- sort: 'custom',
+ isForm: false,
+ table: {
+ width: 180
+ },
formatter: dateFormatter,
- isSearch: false,
- search: {
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ form: {
component: 'DatePicker',
componentProps: {
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- type: 'daterange',
- defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
}
- },
- isForm: false
+ }
},
{
label: '操作',
field: 'action',
isForm: false,
+ isDetail: false,
table: {
width: 150,
fixed: 'right'
diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue
index 83f9aa46c..b82dd5bb1 100644
--- a/src/views/qms/inspectionQ2/index.vue
+++ b/src/views/qms/inspectionQ2/index.vue
@@ -1,18 +1,22 @@
-
+
-
-
+
+
@@ -27,13 +31,16 @@
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
-
+
{{ row.number }}
-
+
@@ -54,12 +61,17 @@
-
+
diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
index 39ed48b5c..84f67557c 100644
--- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts
+++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
@@ -372,25 +372,23 @@ export const Q2 = useCrudSchemas(
}
}
},
-
{
label: '索赔日期',
field: 'claimTime',
- sort: 'custom',
+ isForm: false,
+ table: {
+ width: 180
+ },
formatter: dateFormatter,
- isSearch: false,
- search: {
- component: 'DatePicker',
- componentProps: {
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- type: 'daterange',
- defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
- }
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
form: {
component: 'DatePicker',
componentProps: {
+ style: { width: '100%' },
type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
}
}
@@ -398,22 +396,20 @@ export const Q2 = useCrudSchemas(
{
label: '处理时间',
field: 'handleTime',
- sort: 'custom',
+ isForm: false,
+ table: {
+ width: 180
+ },
formatter: dateFormatter,
- isSearch: false,
- isTable: false,
- search: {
- component: 'DatePicker',
- componentProps: {
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- type: 'daterange',
- defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
- }
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
form: {
component: 'DatePicker',
componentProps: {
+ style: { width: '100%' },
type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
}
}
@@ -445,23 +441,29 @@ export const Q2 = useCrudSchemas(
{
label: '创建时间',
field: 'createTime',
- sort: 'custom',
+ isForm: false,
+ table: {
+ width: 180
+ },
formatter: dateFormatter,
- isSearch: false,
- search: {
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ form: {
component: 'DatePicker',
componentProps: {
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- type: 'daterange',
- defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
}
- },
- isForm: false
+ }
},
{
label: '操作',
field: 'action',
isForm: false,
+ isDetail: false,
table: {
width: 150,
fixed: 'right'
diff --git a/src/views/qms/inspectionQ3/index.vue b/src/views/qms/inspectionQ3/index.vue
index e313d6371..3754cb665 100644
--- a/src/views/qms/inspectionQ3/index.vue
+++ b/src/views/qms/inspectionQ3/index.vue
@@ -1,18 +1,22 @@
-
+
-
-
+
+
@@ -27,13 +31,16 @@
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
-
+
{{ row.number }}
-
+
@@ -54,12 +61,17 @@
-
+
diff --git a/src/views/qms/inspectionQ3/inspectionQ3.data.ts b/src/views/qms/inspectionQ3/inspectionQ3.data.ts
index 18e41531c..b53a2c90b 100644
--- a/src/views/qms/inspectionQ3/inspectionQ3.data.ts
+++ b/src/views/qms/inspectionQ3/inspectionQ3.data.ts
@@ -334,22 +334,21 @@ export const Q3 = useCrudSchemas(
{
label: '处理时间',
field: 'handleTime',
- sort: 'custom',
- formatter: dateFormatter,
isSearch: false,
isTable: false,
- search: {
- component: 'DatePicker',
- componentProps: {
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- type: 'daterange',
- defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
- }
+ table: {
+ width: 180
+ },
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
form: {
component: 'DatePicker',
componentProps: {
+ style: { width: '100%' },
type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
}
}
@@ -381,23 +380,31 @@ export const Q3 = useCrudSchemas(
{
label: '创建时间',
field: 'createTime',
- sort: 'custom',
- formatter: dateFormatter,
isSearch: false,
- search: {
+ isTable: false,
+ isForm: false,
+ table: {
+ width: 180
+ },
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ form: {
component: 'DatePicker',
componentProps: {
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- type: 'daterange',
- defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
}
- },
- isForm: false
+ }
},
{
label: '操作',
field: 'action',
isForm: false,
+ isDetail: false,
table: {
width: 150,
fixed: 'right'
diff --git a/src/views/qms/inspectionRecordFirst/addForm.vue b/src/views/qms/inspectionRecordFirst/addForm.vue
index 7fc3ed700..d4fed9f00 100644
--- a/src/views/qms/inspectionRecordFirst/addForm.vue
+++ b/src/views/qms/inspectionRecordFirst/addForm.vue
@@ -1081,6 +1081,11 @@ const opensearchItemsTable = () => {
column: 'type',
action: 'in',
value: 'BCP,CCP'
+ },
+ {
+ column: 'status',
+ action: 'in',
+ value: 'ENABLE'
}
)
// 参数整理
@@ -1523,6 +1528,11 @@ const onItemBlur = async (field, pageApi) => {
column: 'code',
action: '==',
value: data.value[field]?.trim()
+ },
+ {
+ column: 'status',
+ action: 'in',
+ value: 'ENABLE'
}
)
// 参数整理
diff --git a/src/views/qms/inspectionRecordFirst/detail.vue b/src/views/qms/inspectionRecordFirst/detail.vue
index ac7889043..3204d6adc 100644
--- a/src/views/qms/inspectionRecordFirst/detail.vue
+++ b/src/views/qms/inspectionRecordFirst/detail.vue
@@ -290,13 +290,13 @@
-
+
diff --git a/src/views/qms/inspectionRecordFirst/index.vue b/src/views/qms/inspectionRecordFirst/index.vue
index 84d0b942a..df2442aed 100644
--- a/src/views/qms/inspectionRecordFirst/index.vue
+++ b/src/views/qms/inspectionRecordFirst/index.vue
@@ -244,6 +244,7 @@ const handleMainExport = async (row: any) => {
const submitForm = async (formType, data) => {
// data.subList = tableData.value // 拼接子表数据参数
try {
+ basicFormRef.value.formLoading = true
if (formType === 'create') {
await InspectionRecordMainApi.createInspectionRecordMain(data)
message.success(t('common.createSuccess'))
@@ -252,6 +253,7 @@ const handleMainExport = async (row: any) => {
message.success(t('common.updateSuccess'))
}
basicFormRef.value.dialogVisible = false
+ basicFormRef.value.formLoading = false
// 刷新当前列表
getList()
} finally {
diff --git a/src/views/qms/inspectionRequest/index.vue b/src/views/qms/inspectionRequest/index.vue
index 0d2adf9f3..6e1351e10 100644
--- a/src/views/qms/inspectionRequest/index.vue
+++ b/src/views/qms/inspectionRequest/index.vue
@@ -1,375 +1,456 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ row.number }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.number }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
{{ row.reqCode }}
-
+
@@ -60,16 +68,21 @@
diff --git a/src/views/qms/inspectionStage/index.vue b/src/views/qms/inspectionStage/index.vue
index dcbbb196a..ac7db008e 100644
--- a/src/views/qms/inspectionStage/index.vue
+++ b/src/views/qms/inspectionStage/index.vue
@@ -1,22 +1,27 @@
-
+
-
-
+
+
-
@@ -54,12 +59,17 @@
-
+
diff --git a/src/views/qms/inspectionTemplate/index.vue b/src/views/qms/inspectionTemplate/index.vue
index 2b4151705..3a506ec9c 100644
--- a/src/views/qms/inspectionTemplate/index.vue
+++ b/src/views/qms/inspectionTemplate/index.vue
@@ -1,22 +1,27 @@
-
+
-
-
+
+
-
-
+
{{ row.reqCode }}
-
+
@@ -49,11 +57,7 @@
@submitForm="submitForm"
/>
-
+
import download from '@/utils/download'
-import { InspectionTemplateMain,InspectionTemplateProcess,InspectionTemplateFeatures,InspectionTemplateRules } from './inspectionTemplate.data'
+import {
+ InspectionTemplateMain,
+ InspectionTemplateProcess,
+ InspectionTemplateFeatures,
+ InspectionTemplateRules
+} from './inspectionTemplate.data'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
@@ -101,12 +110,12 @@ const { getList, setSearchParams } = tableMethods
// 列表头部按钮
const HeadButttondata = [
- defaultButtons.defaultAddBtn({hasPermi:'qms:programme-template:create'}), // 新增
- defaultButtons.defaultImportBtn({hasPermi:'qms:programme-template:import'}), // 导入
- defaultButtons.defaultExportBtn({hasPermi:'qms:programme-template:export'}), // 导出
+ defaultButtons.defaultAddBtn({ hasPermi: 'qms:programme-template:create' }), // 新增
+ defaultButtons.defaultImportBtn({ hasPermi: 'qms:programme-template:import' }), // 导入
+ defaultButtons.defaultExportBtn({ hasPermi: 'qms:programme-template:export' }), // 导出
defaultButtons.defaultFreshBtn(null), // 刷新
defaultButtons.defaultFilterBtn(null), // 筛选
- defaultButtons.defaultSetBtn(null), // 设置
+ defaultButtons.defaultSetBtn(null) // 设置
// {
// label: '自定义扩展按钮',
// name: 'zdy',
@@ -119,16 +128,22 @@ const HeadButttondata = [
// 头部按钮事件
const buttonBaseClick = (val, item) => {
- if (val == 'add') { // 新增
+ if (val == 'add') {
+ // 新增
openForm('create')
- } else if (val == 'import') { // 导入
+ } else if (val == 'import') {
+ // 导入
handleImport()
- } else if (val == 'export') { // 导出
+ } else if (val == 'export') {
+ // 导出
handleExport()
- } else if (val == 'refresh') { // 刷新
+ } else if (val == 'refresh') {
+ // 刷新
getList()
- } else if (val == 'filtrate') { // 筛选
- } else { // 其他按钮
+ } else if (val == 'filtrate') {
+ // 筛选
+ } else {
+ // 其他按钮
console.log('其他按钮', item)
}
}
@@ -149,7 +164,7 @@ const handleExport = async () => {
}
}
-const isShowMainButton = (row,val) => {
+const isShowMainButton = (row, val) => {
if (val.indexOf(row.available) > -1) {
return false
} else {
@@ -159,25 +174,33 @@ const isShowMainButton = (row,val) => {
const butttondata = (row) => {
return [
- defaultButtons.mainListEditBtn({hasPermi: 'qms:programme-template:update'}),
- defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:programme-template:enable'}),
- defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:programme-template:disable'}),
+ defaultButtons.mainListEditBtn({ hasPermi: 'qms:programme-template:update' }),
+ defaultButtons.mainListEnableBtn({
+ hide: isShowMainButton(row, ['FALSE']),
+ hasPermi: 'qms:programme-template:enable'
+ }),
+ defaultButtons.mainListDisableBtn({
+ hide: isShowMainButton(row, ['TRUE']),
+ hasPermi: 'qms:programme-template:disable'
+ }),
defaultButtons.mainCopyBtn({ hasPermi: 'qms:programme-template:copy' }),
- defaultButtons.mainListDeleteBtn({hasPermi:'qms:programme-template:delete'}), // 删除
+ defaultButtons.mainListDeleteBtn({ hasPermi: 'qms:programme-template:delete' }) // 删除
]
}
// 列表-操作按钮事件
const buttonTableClick = async (val, row) => {
- if (val == 'edit') { // 编辑
+ if (val == 'edit') {
+ // 编辑
openForm('update', row)
- } else if (val == 'delete') { // 删除
+ } else if (val == 'delete') {
+ // 删除
handleDelete(row.id)
- }else if (val == 'enable') {
+ } else if (val == 'enable') {
handleEnable(row.id)
- }else if (val == 'disable') {
+ } else if (val == 'disable') {
handleDisable(row.id)
- }else if (val == 'copy') {
+ } else if (val == 'copy') {
openForm('create', row)
}
}
@@ -189,16 +212,22 @@ const openForm = (type: string, row?: any) => {
}
// form表单提交
-const submitForm = async (formType,data) => {
- if (formType === 'create') {
- await InspectionProcessPageApi.inspectionTemplateCreat(data.value)
- message.success(t('common.createSuccess'))
- } else {
- await InspectionProcessPageApi.inspectionTemplateUpdate(data.value)
- message.success(t('common.updateSuccess'))
+const submitForm = async (formType, data) => {
+ try {
+ basicFormRef.value.formLoading = true
+ if (formType === 'create') {
+ await InspectionProcessPageApi.inspectionTemplateCreat(data.value)
+ message.success(t('common.createSuccess'))
+ } else {
+ await InspectionProcessPageApi.inspectionTemplateUpdate(data.value)
+ message.success(t('common.updateSuccess'))
+ }
+ basicFormRef.value.dialogVisible = false
+ basicFormRef.value.formLoading = false
+ getList()
+ } finally {
+ basicFormRef.value.formLoading = false
}
- basicFormRef.value.dialogVisible = false
- getList()
}
/** 详情操作 */
@@ -263,11 +292,10 @@ const importSuccess = () => {
/** 初始化 **/
onMounted(async () => {
- tableObject.params = {
- available: true
- }
+ tableObject.params = {
+ available: true
+ }
getList()
importTemplateData.templateUrl = await InspectionProcessPageApi.importTemplate()
})
-
diff --git a/src/views/qms/qualityNotice/index.vue b/src/views/qms/qualityNotice/index.vue
index 064613a52..56a0ff62f 100644
--- a/src/views/qms/qualityNotice/index.vue
+++ b/src/views/qms/qualityNotice/index.vue
@@ -184,6 +184,7 @@
// 主子数据 提交
const submitForm = async (formType, data) => {
try {
+ formRef.value.formLoading = true
if (formType === 'create') {
await qualityNoticeApi.qualityNoticeCreat(data)
message.success(t('common.createSuccess'))
@@ -192,6 +193,7 @@
message.success(t('common.updateSuccess'))
}
formRef.value.dialogVisible = false
+ formRef.value.formLoading = false
// 刷新当前列表
getList()
} finally {
diff --git a/src/views/qms/sampleCode/index.vue b/src/views/qms/sampleCode/index.vue
index 38ed151c0..9288e264f 100644
--- a/src/views/qms/sampleCode/index.vue
+++ b/src/views/qms/sampleCode/index.vue
@@ -1,22 +1,27 @@
-
+
-
-
+
+
-
@@ -55,12 +63,17 @@
-
+
diff --git a/src/views/qms/samplingProcess/index.vue b/src/views/qms/samplingProcess/index.vue
index 7733e50c5..1d5254334 100644
--- a/src/views/qms/samplingProcess/index.vue
+++ b/src/views/qms/samplingProcess/index.vue
@@ -1,22 +1,27 @@
-
+
-
-
+
+
-
@@ -68,13 +76,13 @@
diff --git a/src/views/qms/samplingScheme/index.vue b/src/views/qms/samplingScheme/index.vue
index 01c52c11a..cddeb98d1 100644
--- a/src/views/qms/samplingScheme/index.vue
+++ b/src/views/qms/samplingScheme/index.vue
@@ -1,22 +1,27 @@
-
+
-
-
+
+
-
@@ -54,12 +62,17 @@
-
+
diff --git a/src/views/qms/selectedProject/index.vue b/src/views/qms/selectedProject/index.vue
index 9ab2bce19..1e5442f4d 100644
--- a/src/views/qms/selectedProject/index.vue
+++ b/src/views/qms/selectedProject/index.vue
@@ -1,18 +1,22 @@
-
+
-
-
+
+
@@ -27,13 +31,13 @@
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
-
+
{{ row.code }}
-
+
@@ -54,12 +58,17 @@
-
+
diff --git a/src/views/qms/selectedSet/index.vue b/src/views/qms/selectedSet/index.vue
index c3e93a9b5..25f479d28 100644
--- a/src/views/qms/selectedSet/index.vue
+++ b/src/views/qms/selectedSet/index.vue
@@ -1,22 +1,27 @@
-
+
-
-
+
+
-
@@ -60,24 +68,24 @@
/>
-
@@ -94,16 +102,16 @@
diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts
index bdef4ffcb..52907c4d6 100644
--- a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts
+++ b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts
@@ -119,6 +119,7 @@ export const Businesstype = useCrudSchemas(reactive([
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
+ multiple: true,
enterSearch: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择库区代码', // 输入框占位文本
@@ -147,6 +148,7 @@ export const Businesstype = useCrudSchemas(reactive([
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
+ multiple: true,
enterSearch: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择库区代码', // 输入框占位文本
diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue
index db22cb30d..dd394b284 100644
--- a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue
@@ -324,7 +324,13 @@ const onChange = (field, value)=>{
const searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick(() => {
const setV = {}
- setV[formField] = val[0][searchField]
+ if(formField == 'outAreaCodes'||formField == 'inAreaCodes'){
+ //出库库区范围 入库库区范围
+ setV[formField] = val.map(item=>(item[searchField])).join(',')
+
+ }else{
+ setV[formField] = val[0][searchField]
+ }
formRef.setValues(setV)
})
}
diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
index 7d4ca92ef..9adee35d2 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
@@ -765,7 +765,8 @@ const labelPrint = async (row) => {
item.width = item.table?.width || 150
})
tableObjectPrint.tableList.forEach(item=>{
- item.fromBatch = item.batch
+ item.downItemCode = item.itemCode
+ item.toBatch = item.batch
})
searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
}
diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
index f0b3251f8..65c84c4ae 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
@@ -742,7 +742,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive([
export const RelegateRequestDetailLabel = useCrudSchemas(reactive([
{
label: '物料代码',
- field: 'itemCode',
+ field: 'downItemCode',
sort: 'custom',
table: {
width: 150
@@ -756,49 +756,9 @@ export const RelegateRequestDetailLabel = useCrudSchemas(reactive(
}
}
},
- {
- label: '物料名称',
- field: 'itemName',
- sort: 'custom',
- table: {
- width: 150
- },
- isTableForm: false,
- isForm: false,
- },
- {
- label: '物料描述1',
- field: 'itemDesc1',
- sort: 'custom',
- table: {
- width: 150
- },
- isTableForm: false,
- isForm: false,
- },
- {
- label: '物料描述2',
- field: 'itemDesc2',
- sort: 'custom',
- table: {
- width: 150
- },
- isTableForm: false,
- isForm: false,
- },
- {
- label: '项目代码',
- field: 'projectCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTableForm: false,
- isForm: false,
- },
{
label: '批次',
- field: 'fromBatch',
+ field: 'toBatch',
sort: 'custom',
table: {
width: 150
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
index 52fef9371..af95c27c6 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
@@ -1,627 +1,678 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
+import * as InspectionQ1Api from '@/api/qms/inspectionQ1'
+import { Q1 } from '@/views/qms/inspectionQ1/inspectionQ1.data'
+
/**
* @returns {Array} 客户退货任务主表
*/
-export const CustomerreturnJobMain = useCrudSchemas(reactive([
- {
- label: '单据号',
- field: 'number',
- sort: 'custom',
- table: {
- width: 180,
- fixed: 'left'
- },
- isSearch: true,
- },
- {
- label: '状态',
- field: 'status',
- dictType: DICT_TYPE.JOB_STATUS,
- dictClass: 'string',
- isSearch: true,
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '申请单号',
- field: 'requestNumber',
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: true,
- isSearch: true,
- },
- {
- label: '发货记录单号',
- field: 'deliverRecordNumber',
- sort: 'custom',
- table: {
- width: 180
- },
- },
- {
- label: '发货计划单号',
- field: 'deliverPlanNumber',
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: true,
-
- },
- {
- label: '客户代码',
- field: 'customerCode',
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '客户月台代码',
- field: 'customerDockCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
-
- },
- {
- label: '收货月台',
- field: 'receiptDock',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
-
- },
- {
- label: '承运商',
- field: 'carrierCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '运输方式',
- field: 'transferMode',
- sort: 'custom',
- dictType: DICT_TYPE.TRANSFER_MODE,
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '车牌号',
- field: 'vehiclePlateNumber',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
-
- },
- {
- label: '申请时间',
- field: 'requestTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+export const CustomerreturnJobMain = useCrudSchemas(
+ reactive([
+ {
+ label: '单据号',
+ field: 'number',
+ sort: 'custom',
+ table: {
+ width: 180,
+ fixed: 'left'
+ },
+ isSearch: true
+ },
+ {
+ label: '状态',
+ field: 'status',
+ dictType: DICT_TYPE.JOB_STATUS,
+ dictClass: 'string',
+ isSearch: true,
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
}
},
- },
- {
- label: '要求截止时间',
- field: 'requestDueTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '申请单号',
+ field: 'requestNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: true,
+ isSearch: true
+ },
+ {
+ label: '发货记录单号',
+ field: 'deliverRecordNumber',
+ sort: 'custom',
+ table: {
+ width: 180
}
},
- },
- {
- label: '过期时间',
- field: 'expiredTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '发货计划单号',
+ field: 'deliverPlanNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: true
+ },
+ {
+ label: 'Q1通知单号',
+ field: 'q1Number',
+ sort: 'custom',
+ isSearch: false,
+ isDetail: true,
+ table: {
+ width: 150
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true,
+ // multiple: true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择Q1通知单号', // 输入框占位文本
+ searchField: 'number', // 查询弹窗赋值字段
+ searchTitle: 'Q1通知单号', // 查询弹窗标题
+ searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
+ searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'status',
+ value: '0',
+ isMainValue: false
+ },
+ {
+ key: 'customerCode',
+ value: 'customerCode',
+ isMainValue: true
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'number',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
}
},
- },
- {
- label: '从仓库代码',
- field: 'fromWarehouseCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '到仓库代码',
- field: 'toWarehouseCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '从库区类型范围',
- field: 'fromAreaTypes',
- dictType: DICT_TYPE.AREA_TYPE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '到库区类型范围',
- field: 'toAreaTypes',
- dictType: DICT_TYPE.AREA_TYPE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
- },
- },
- // {
- // label: '状态',
- // field: 'jobStageStatus',
- // sort: 'custom',
- // table: {
- // width: 150
- // },
- // },
- {
- label: '从库区代码范围',
- field: 'fromAreaCodes',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '到库区代码范围',
- field: 'toAreaCodes',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '到月台代码',
- field: 'toDockCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '优先级',
- field: 'priority',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- form: {
- component: 'InputNumber',
- }
- },
- {
- label: '优先级增量',
- field: 'priorityIncrement',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- form: {
- component: 'InputNumber',
- }
- },
- {
- label: '业务类型',
- field: 'businessType',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '部门',
- field: 'departmentCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '备注',
- field: 'remark',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '自动完成',
- field: 'autoComplete',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '客户代码',
+ field: 'customerCode',
+ sort: 'custom',
+ table: {
+ width: 150
}
- }
- },
- {
- label: '允许修改库位',
- field: 'allowModifyLocation',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '客户月台代码',
+ field: 'customerDockCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '收货月台',
+ field: 'receiptDock',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '承运商',
+ field: 'carrierCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '运输方式',
+ field: 'transferMode',
+ sort: 'custom',
+ dictType: DICT_TYPE.TRANSFER_MODE,
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '车牌号',
+ field: 'vehiclePlateNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '申请时间',
+ field: 'requestTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
- }
- },
- {
- label: '允许修改数量',
- field: 'allowModifyQty',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '要求截止时间',
+ field: 'requestDueTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
- }
- },
- {
- label: '允许大于推荐数量',
- field: 'allowBiggerQty',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '过期时间',
+ field: 'expiredTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
- }
- },
- {
- label: '允许小于推荐数量',
- field: 'allowSmallerQty',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '从仓库代码',
+ field: 'fromWarehouseCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '到仓库代码',
+ field: 'toWarehouseCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '从库区类型范围',
+ field: 'fromAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
}
- }
- },
- {
- label: '允许修改库存状态',
- field: 'allowModifyInventoryStatus',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '到库区类型范围',
+ field: 'toAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
}
- }
- },
- {
- label: '允许连续扫描',
- field: 'allowContinuousScanning',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ // {
+ // label: '状态',
+ // field: 'jobStageStatus',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
+ {
+ label: '从库区代码范围',
+ field: 'fromAreaCodes',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '到库区代码范围',
+ field: 'toAreaCodes',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '到月台代码',
+ field: 'toDockCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '优先级',
+ field: 'priority',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ form: {
+ component: 'InputNumber'
}
- }
- },
- {
- label: '允许部分完成',
- field: 'allowPartialComplete',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '优先级增量',
+ field: 'priorityIncrement',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ form: {
+ component: 'InputNumber'
}
- }
- },
- {
- label: '允许修改批次',
- field: 'allowModifyBatch',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '业务类型',
+ field: 'businessType',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '部门',
+ field: 'departmentCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '备注',
+ field: 'remark',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '自动完成',
+ field: 'autoComplete',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
}
- }
- },
- {
- label: '允许修改箱码',
- field: 'allowModifyPackingNumber',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '允许修改库位',
+ field: 'allowModifyLocation',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
}
- }
- },
- {
- label: '承接时间',
- field: 'acceptTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
},
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '允许修改数量',
+ field: 'allowModifyQty',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
}
},
- },
- {
- label: '承接人',
- field: 'acceptUserId',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '完成时间',
- field: 'completeTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '允许大于推荐数量',
+ field: 'allowBiggerQty',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
}
},
- },
- {
- label: '完成人',
- field: 'completeUserId',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '允许小于推荐数量',
+ field: 'allowSmallerQty',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
+ }
},
- isTable: false,
- },
- {
- label: '创建时间',
- field: 'createTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ {
+ label: '允许修改库存状态',
+ field: 'allowModifyInventoryStatus',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
+ }
},
- sort: 'custom',
- table: {
- width: 180
+ {
+ label: '允许连续扫描',
+ field: 'allowContinuousScanning',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
+ }
},
- isTable: true,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '允许部分完成',
+ field: 'allowPartialComplete',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
}
},
- },
- {
- label: '创建者',
- field: 'creator',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '允许修改批次',
+ field: 'allowModifyBatch',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
+ }
},
- isTable: true,
- },
- {
- label: '最后更新时间',
- field: 'updateTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ {
+ label: '允许修改箱码',
+ field: 'allowModifyPackingNumber',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
+ }
},
- sort: 'custom',
- table: {
- width: 180
+ {
+ label: '承接时间',
+ field: 'acceptTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '承接人',
+ field: 'acceptUserId',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '完成时间',
+ field: 'completeTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
},
- },
- {
- label: '最后更新者',
- field: 'updater',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '完成人',
+ field: 'completeUserId',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '创建时间',
+ field: 'createTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: true,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- isTable: false,
- },
- {
- label: '操作',
- field: 'action',
- isDetail: false,
- isForm: false,
- table: {
- width: 120,
- fixed: 'right'
+ {
+ label: '创建者',
+ field: 'creator',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: true
+ },
+ {
+ label: '最后更新时间',
+ field: 'updateTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- }
-]))
+ {
+ label: '最后更新者',
+ field: 'updater',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '操作',
+ field: 'action',
+ isDetail: false,
+ isForm: false,
+ table: {
+ width: 120,
+ fixed: 'right'
+ }
+ }
+ ])
+)
//表单校验
export const CustomerreturnJobMainRules = reactive({
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
index 3d36a8181..4f55dbf93 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
@@ -1,382 +1,437 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
+
+import * as InspectionQ1Api from '@/api/qms/inspectionQ1'
+import { Q1 } from '@/views/qms/inspectionQ1/inspectionQ1.data'
/**
* @returns {Array} 客户退货记录主表
*/
-export const CustomerreturnRecordMain = useCrudSchemas(reactive([
- {
- label: '单据号',
- field: 'number',
- sort: 'custom',
- table: {
- width: 180,
- fixed: 'left'
- },
- isSearch: true
- },
- {
- label: '状态',
- field: 'status',
- dictType: DICT_TYPE.REQUEST_STATUS,
- dictClass: 'string',
- isSearch: false,
- isTable: false,
- isDetail: false,
- isForm: false,
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '申请单号',
- field: 'requestNumber',
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: true,
- isSearch: true
- },
- {
- label: '任务单号',
- field: 'jobNumber',
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- },
- {
- label: '发货记录单号',
- field: 'deliverRecordNumber',
- sort: 'custom',
- table: {
- width: 180
- },
- },
- {
- label: '发货计划单号',
- field: 'deliverPlanNumber',
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: true,
- },
- {
- label: '客户代码',
- field: 'customerCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isSearch: true
- },
- {
- label: '客户月台代码',
- field: 'customerDockCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '承运商',
- field: 'carrierCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '运输方式',
- field: 'transferMode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '车牌号',
- field: 'vehiclePlateNumber',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '申请时间',
- field: 'requestTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+export const CustomerreturnRecordMain = useCrudSchemas(
+ reactive([
+ {
+ label: '单据号',
+ field: 'number',
+ sort: 'custom',
+ table: {
+ width: 180,
+ fixed: 'left'
+ },
+ isSearch: true
+ },
+ {
+ label: '状态',
+ field: 'status',
+ dictType: DICT_TYPE.REQUEST_STATUS,
+ dictClass: 'string',
+ isSearch: false,
+ isTable: false,
+ isDetail: false,
+ isForm: false,
+ sort: 'custom',
+ table: {
+ width: 150
}
},
- },
- {
- label: '截止时间',
- field: 'dueTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '申请单号',
+ field: 'requestNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: true,
+ isSearch: true
+ },
+ {
+ label: '任务单号',
+ field: 'jobNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false
+ },
+ {
+ label: '发货记录单号',
+ field: 'deliverRecordNumber',
+ sort: 'custom',
+ table: {
+ width: 180
}
},
- },
- {
- label: '执行时间',
- field: 'executeTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '发货计划单号',
+ field: 'deliverPlanNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: true
+ },
+ {
+ label: 'Q1通知单号',
+ field: 'q1Number',
+ sort: 'custom',
+ isSearch: false,
+ isDetail: true,
+ table: {
+ width: 150
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true,
+ // multiple: true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择Q1通知单号', // 输入框占位文本
+ searchField: 'number', // 查询弹窗赋值字段
+ searchTitle: 'Q1通知单号', // 查询弹窗标题
+ searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
+ searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'status',
+ value: '0',
+ isMainValue: false
+ },
+ {
+ key: 'customerCode',
+ value: 'customerCode',
+ isMainValue: true
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'number',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
}
},
- },
- {
- label: '生效日期',
- field: 'activeDate',
- formatter: dateFormatter2,
- detail: {
- dateFormat: 'YYYY-MM-DD'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width: '100%'},
- type: 'date',
- dateFormat: 'YYYY-MM-DD',
- valueFormat: 'x',
+ {
+ label: '客户代码',
+ field: 'customerCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isSearch: true
+ },
+ {
+ label: '客户月台代码',
+ field: 'customerDockCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '承运商',
+ field: 'carrierCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '运输方式',
+ field: 'transferMode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '车牌号',
+ field: 'vehiclePlateNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '申请时间',
+ field: 'requestTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
},
- },
- {
- label: '从仓库代码',
- field: 'fromWarehouseCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '到仓库代码',
- field: 'toWarehouseCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '从库区类型范围',
- field: 'fromAreaTypes',
- dictType: DICT_TYPE.AREA_TYPE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '从库区代码范围',
- field: 'fromAreaCodes',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '到库区类型范围',
- field: 'toAreaTypes',
- dictType: DICT_TYPE.AREA_TYPE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '到库区代码范围',
- field: 'toAreaCodes',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '到月台代码',
- field: 'toDockCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '出库事务类型',
- field: 'outTransactionType',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '入库事务类型',
- field: 'inTransactionType',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '业务类型',
- field: 'businessType',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '部门',
- field: 'departmentCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '接口类型',
- field: 'interfaceType',
- dictType: DICT_TYPE.INTERFACE_TYPE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '截止时间',
+ field: 'dueTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- },
- {
- label: '备注',
- field: 'remark',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '执行时间',
+ field: 'executeTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- isTable: false,
- },
- {
- label: '创建时间',
- field: 'createTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ {
+ label: '生效日期',
+ field: 'activeDate',
+ formatter: dateFormatter2,
+ detail: {
+ dateFormat: 'YYYY-MM-DD'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'date',
+ dateFormat: 'YYYY-MM-DD',
+ valueFormat: 'x'
+ }
+ }
},
- sort: 'custom',
- table: {
- width: 180
+ {
+ label: '从仓库代码',
+ field: 'fromWarehouseCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '到仓库代码',
+ field: 'toWarehouseCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '从库区类型范围',
+ field: 'fromAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- isTable: true,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '从库区代码范围',
+ field: 'fromAreaCodes',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '到库区类型范围',
+ field: 'toAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
}
},
- },
- {
- label: '创建者',
- field: 'creator',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '到库区代码范围',
+ field: 'toAreaCodes',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '到月台代码',
+ field: 'toDockCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '出库事务类型',
+ field: 'outTransactionType',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '入库事务类型',
+ field: 'inTransactionType',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '业务类型',
+ field: 'businessType',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '部门',
+ field: 'departmentCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '接口类型',
+ field: 'interfaceType',
+ dictType: DICT_TYPE.INTERFACE_TYPE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- isTable: true,
- },
- // {
- // label: '代码',
- // field: 'code',
- // sort: 'custom',
- // table: {
- // width: 150
- // },
- // },
- {
- label: '是否可用',
- field: 'available',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isSearch: false,
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '备注',
+ field: 'remark',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '创建时间',
+ field: 'createTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: true,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '创建者',
+ field: 'creator',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: true
+ },
+ // {
+ // label: '代码',
+ // field: 'code',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
+ {
+ label: '是否可用',
+ field: 'available',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isSearch: false,
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
}
}
- },
-]))
+ ])
+)
//表单校验
export const CustomerreturnRecordMainRules = reactive({
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
index 164f9d421..93916bd81 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@@ -2,12 +2,15 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { TableColumn } from '@/types/table'
import { dateFormatter, formatDate } from '@/utils/formatTime'
-import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
+import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
import * as DeliverRecordMainApi from '@/api/wms/deliverRecordMain'
import * as DeliverRecordDetailApi from '@/api/wms/deliverRecordDetail'
-import { DeliverRecordMain,DeliverRecordDetail } from '../../deliver/deliverRecordMain/deliverRecordMain.data'
+import {
+ DeliverRecordMain,
+ DeliverRecordDetail
+} from '../../deliver/deliverRecordMain/deliverRecordMain.data'
import * as CustomerApi from '@/api/wms/customer'
import { Customer } from '../../../basicDataManage/customerManage/customer/customer.data'
@@ -18,594 +21,663 @@ import { Customerdock } from '../../../basicDataManage/customerManage/customerdo
import * as CarrierApi from '@/api/wms/carrier'
import { Carrier } from '@/views/wms/basicDataManage/orderManage/carrier/carrier.data'
-import * as BalanceApi from '@/api/wms/balance'
+import * as BalanceApi from '@/api/wms/balance'
import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
import * as ItemPackageApi from '@/api/wms/itempackage/index'
-import * as CustomerreturnRequestApi from '@/api/wms/customerreturnRequestMain'
-import * as LocationApi from '@/api/wms/location'
+import * as CustomerreturnRequestApi from '@/api/wms/customerreturnRequestMain'
+import * as LocationApi from '@/api/wms/location'
import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+import * as InspectionQ1Api from '@/api/qms/inspectionQ1'
+import { Q1 } from '@/views/qms/inspectionQ1/inspectionQ1.data'
+
const { t } = useI18n() // 国际化
const dateTime = new Date().getTime()
-console.log(dateTime);
+console.log(dateTime)
// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
const queryParams = {
- pageSize:10,
- pageNo:1,
- code:'CustomerRejectRequest'
+ pageSize: 10,
+ pageNo: 1,
+ code: 'CustomerRejectRequest'
}
- const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
- const requestsettingData =data?.list[0]||{}
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData = data?.list[0] || {}
- // 获取当前操作人的部门
+// 获取当前操作人的部门
import { useUserStore } from '@/store/modules/user'
+import { fa } from 'element-plus/es/locale'
const userStore = useUserStore()
const userDept = userStore.userSelfInfo.dept
- // id 转str 否则form回显匹配不到
- userDept.id = userDept.id.toString()
-const userDeptArray:any = [userDept]
+// id 转str 否则form回显匹配不到
+userDept.id = userDept.id.toString()
+const userDeptArray: any = [userDept]
/**
* @returns {Array} 客户退货申请主表
*/
-export const CustomerreturnRequestMain = useCrudSchemas(reactive([
- {
- label: '单据号',
- field: 'number',
- sort: 'custom',
- table: {
- width: 180,
- fixed: 'left'
- },
- isForm: false,
- isSearch: true,
- },
- {
- label: '状态',
- field: 'status',
- dictType: DICT_TYPE.REQUEST_STATUS,
- dictClass: 'string',
- isTable: true,
- isForm: false,
- sort: 'custom',
- table: {
- width: 150
- },
- isSearch: true,
- },
- {
- label: '客户代码',
- field: 'customerCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isSearch: true,
- form: {
- // labelMessage: '信息提示说明！！！',
- componentProps: {
- enterSearch: true,
- isSearchList: true, // 开启查询弹窗
- searchListPlaceholder: '请选择客户代码', // 输入框占位文本
- searchField: 'code', // 查询弹窗赋值字段
- searchTitle: '客户信息', // 查询弹窗标题
- searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类
- searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法
- searchCondition: [{
- key: 'available',
- value: 'TRUE',
- isMainValue: false
- }],
- verificationParams: [{
- key: 'code',
- action: '==',
- value: '',
- isMainValue: false,
- isSearch: true,
- isFormModel: true,
- }], // 失去焦点校验参数
+export const CustomerreturnRequestMain = useCrudSchemas(
+ reactive([
+ {
+ label: '单据号',
+ field: 'number',
+ sort: 'custom',
+ table: {
+ width: 180,
+ fixed: 'left'
+ },
+ isForm: false,
+ isSearch: true
+ },
+ {
+ label: '状态',
+ field: 'status',
+ dictType: DICT_TYPE.REQUEST_STATUS,
+ dictClass: 'string',
+ isTable: true,
+ isForm: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isSearch: true
+ },
+ {
+ label: '客户代码',
+ field: 'customerCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isSearch: true,
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择客户代码', // 输入框占位文本
+ searchField: 'code', // 查询弹窗赋值字段
+ searchTitle: '客户信息', // 查询弹窗标题
+ searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类
+ searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'code',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
}
- }
- },
- {
- label: '发货记录单号',
- field: 'deliverRecordNumber',
- sort: 'custom',
- table: {
- width: 180
},
- form: {
- // labelMessage: '信息提示说明！！！',
- componentProps: {
- enterSearch: true,
- isSearchList: true, // 开启查询弹窗
- searchListPlaceholder: '请选择发货记录单号', // 输入框占位文本
- searchField: 'number', // 查询弹窗赋值字段
- searchTitle: '发货记录信息', // 查询弹窗标题
- isConcatDetailSchemas:true, // 是否主子表合并
- searchAllSchemas: DeliverRecordMain.allSchemas, // 查询弹窗所需类
- searchDetailSchemas: DeliverRecordDetail.allSchemas, // 查询弹窗所需类
- searchPage: DeliverRecordDetailApi.getDeliverRecordDetailPage, // 查询弹窗所需分页方法
- searchCondition: [{
- key: 'available',
- value: 'TRUE',
- isMainValue: false
- },
- {
- key: 'createTime', // 查询列表中字段
- value: dateTime - 30 * 24 * 60 * 60 * 1000 + "," + dateTime, // 指查询具体值
- action: 'betweeen', // 查询拼接条件
- isSearch: true, // 使用自定义拼接条件
- isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
- },
- {
- key: 'customerCode', // 查询列表中字段
- value: 'customerCode', // 指查询具体值
- action: '==', // 查询拼接条件
- isSearch: true, // 使用自定义拼接条件
- isFormModel:true, // filters中添加筛选的数据--取于formModel
- required:true, // 前置添加必有
- message: '请选择客户代码！', // 前置添加没填的提示语
- isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
+ {
+ label: '发货记录单号',
+ field: 'deliverRecordNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择发货记录单号', // 输入框占位文本
+ searchField: 'number', // 查询弹窗赋值字段
+ searchTitle: '发货记录信息', // 查询弹窗标题
+ isConcatDetailSchemas: true, // 是否主子表合并
+ searchAllSchemas: DeliverRecordMain.allSchemas, // 查询弹窗所需类
+ searchDetailSchemas: DeliverRecordDetail.allSchemas, // 查询弹窗所需类
+ searchPage: DeliverRecordDetailApi.getDeliverRecordDetailPage, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'createTime', // 查询列表中字段
+ value: dateTime - 30 * 24 * 60 * 60 * 1000 + ',' + dateTime, // 指查询具体值
+ action: 'betweeen', // 查询拼接条件
+ isSearch: true, // 使用自定义拼接条件
+ isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
+ },
+ {
+ key: 'customerCode', // 查询列表中字段
+ value: 'customerCode', // 指查询具体值
+ action: '==', // 查询拼接条件
+ isSearch: true, // 使用自定义拼接条件
+ isFormModel: true, // filters中添加筛选的数据--取于formModel
+ required: true, // 前置添加必有
+ message: '请选择客户代码！', // 前置添加没填的提示语
+ isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'number',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
}
- ],
- verificationParams: [{
- key: 'number',
- action: '==',
- value: '',
- isMainValue: false,
- isSearch: true,
- isFormModel: true,
- }], // 失去焦点校验参数
}
- }
- },
-
- {
- label: '发货计划单号',
- field: 'deliverPlanNumber',
- sort: 'custom',
- table: {
- width: 150
},
- isTable:true,
- isSearch: true,
- form: {
- componentProps: {
- disabled: true
+
+ {
+ label: '发货计划单号',
+ field: 'deliverPlanNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: true,
+ isSearch: true,
+ form: {
+ componentProps: {
+ disabled: true
+ }
}
- }
- },
- {
- label: '客户月台代码',
- field: 'customerDockCode',
- sort: 'custom',
- table: {
- width: 150
},
- isTable:false,
- form: {
- // labelMessage: '信息提示说明！！！',
- componentProps: {
- enterSearch: true,
- isSearchList: true, // 开启查询弹窗
- searchListPlaceholder: '请选择客户月台代码', // 输入框占位文本
- searchField: 'code', // 查询弹窗赋值字段
- searchTitle: '客户月台信息', // 查询弹窗标题
- searchAllSchemas: Customerdock.allSchemas, // 查询弹窗所需类
- searchPage: CustomerdockApi.pageCustomerCodeToCustomerDockReceiving, // 查询弹窗所需分页方法
- searchCondition: [{
- key: 'available',
- value: 'TRUE',
- isMainValue: false
- },
- {
- key: 'customerCode',
- value: 'customerCode',
- message: '请填写客户代码！',
- isMainValue: true
- }],
- verificationParams: [{
- key: 'code',
- action: '==',
- value: '',
- isMainValue: false,
- isSearch: true,
- isFormModel: true,
- }], // 失去焦点校验参数
+ {
+ label: 'Q1通知单号',
+ field: 'q1Number',
+ sort: 'custom',
+ isSearch: false,
+ isDetail: true,
+ table: {
+ width: 150
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true,
+ // multiple: true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择Q1通知单号', // 输入框占位文本
+ searchField: 'number', // 查询弹窗赋值字段
+ searchTitle: 'Q1通知单号', // 查询弹窗标题
+ searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
+ searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'status',
+ value: '0',
+ isMainValue: false
+ },
+ {
+ key: 'customerCode',
+ value: 'customerCode',
+ isMainValue: true
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'number',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
}
- }
- },
- {
- label: '承运商',
- field: 'carrierCode',
- sort: 'custom',
- table: {
- width: 150
},
- isTable:false,
- form: {
- // labelMessage: '信息提示说明！！！',
- componentProps: {
- enterSearch: true,
- isSearchList: true, // 开启查询弹窗
- searchListPlaceholder: '请选择承运商', // 输入框占位文本
- searchField: 'code', // 查询弹窗赋值字段
- searchTitle: '承运商信息', // 查询弹窗标题
- searchAllSchemas: Carrier.allSchemas, // 查询弹窗所需类
- searchPage: CarrierApi.getCarrierPage, // 查询弹窗所需分页方法
- searchCondition: [{
- key: 'available',
- value: 'TRUE',
- isMainValue: false
- }],
- verificationParams: [{
- key: 'code',
- action: '==',
- value: '',
- isMainValue: false,
- isSearch: true,
- isFormModel: true,
- }], // 失去焦点校验参数
+ {
+ label: '客户月台代码',
+ field: 'customerDockCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择客户月台代码', // 输入框占位文本
+ searchField: 'code', // 查询弹窗赋值字段
+ searchTitle: '客户月台信息', // 查询弹窗标题
+ searchAllSchemas: Customerdock.allSchemas, // 查询弹窗所需类
+ searchPage: CustomerdockApi.pageCustomerCodeToCustomerDockReceiving, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'customerCode',
+ value: 'customerCode',
+ message: '请填写客户代码！',
+ isMainValue: true
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'code',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
}
- }
- },
- {
- label: '运输方式',
- field: 'transferMode',
- dictType: DICT_TYPE.TRANSFER_MODE,
- sort: 'custom',
- table: {
- width: 150
},
- isTable:false,
-
- },
- {
- label: '车牌号',
- field: 'vehiclePlateNumber',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable:false,
-
- },
- {
- label: '申请时间',
- field: 'requestTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable:false,
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width:'100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '承运商',
+ field: 'carrierCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择承运商', // 输入框占位文本
+ searchField: 'code', // 查询弹窗赋值字段
+ searchTitle: '承运商信息', // 查询弹窗标题
+ searchAllSchemas: Carrier.allSchemas, // 查询弹窗所需类
+ searchPage: CarrierApi.getCarrierPage, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'code',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
}
},
- isForm: false,
- },
- {
- label: '截止时间',
- field: 'dueTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable:false,
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width:'100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '运输方式',
+ field: 'transferMode',
+ dictType: DICT_TYPE.TRANSFER_MODE,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '车牌号',
+ field: 'vehiclePlateNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '申请时间',
+ field: 'requestTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ },
+ isForm: false
+ },
+ {
+ label: '截止时间',
+ field: 'dueTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
},
- },
- {
- label: '从仓库代码',
- field: 'fromWarehouseCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable:false,
- isForm: false,
- },
- {
- label: '到仓库代码',
- field: 'toWarehouseCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable:false,
- isForm: false,
- },
- {
- label: '到月台代码',
- field: 'toDockCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable:false,
- isForm: false,
- },
- {
- label: '从库区类型范围',
- field: 'fromAreaTypes',
- dictType: DICT_TYPE.AREA_TYPE,
- dictClass: 'string',
- isTable:false,
- sort: 'custom',
- table: {
- width: 150
- },
- isForm: false,
- },
- {
- label: '到库区类型范围',
- field: 'toAreaTypes',
- dictType: DICT_TYPE.AREA_TYPE,
- dictClass: 'string',
- isTable:false,
- sort: 'custom',
- table: {
- width: 150
- },
- isForm: false,
- },
- {
- label: '从库区代码范围',
- field: 'fromAreaCodes',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable:false,
- isForm: false,
- },
- {
- label: '到库区代码范围',
- field: 'toAreaCodes',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable:false,
- isForm: false,
- },
- {
- label: '业务类型',
- field: 'businessType',
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- value: 'CustomerReject',
- componentProps: {
- disabled: true
+ {
+ label: '从仓库代码',
+ field: 'fromWarehouseCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ isForm: false
+ },
+ {
+ label: '到仓库代码',
+ field: 'toWarehouseCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ isForm: false
+ },
+ {
+ label: '到月台代码',
+ field: 'toDockCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ isForm: false
+ },
+ {
+ label: '从库区类型范围',
+ field: 'fromAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isForm: false
+ },
+ {
+ label: '到库区类型范围',
+ field: 'toAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isForm: false
+ },
+ {
+ label: '从库区代码范围',
+ field: 'fromAreaCodes',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ isForm: false
+ },
+ {
+ label: '到库区代码范围',
+ field: 'toAreaCodes',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ isForm: false
+ },
+ {
+ label: '业务类型',
+ field: 'businessType',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ value: 'CustomerReject',
+ componentProps: {
+ disabled: true
+ }
+ },
+ isTable: false,
+ isForm: false
+ },
+ {
+ label: '部门',
+ field: 'departmentCode',
+ sort: 'custom',
+ isForm: false,
+ table: {
+ width: 150
+ },
+ isTable: false,
+ formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+ return userDeptArray.find((account) => account.id == cellValue)?.name
+ },
+ form: {
+ value: userDept.id,
+ component: 'Select',
+ api: () => userDeptArray,
+ componentProps: {
+ disabled: true,
+ optionsAlias: {
+ labelField: 'name',
+ valueField: 'id'
+ }
+ }
}
},
- isTable:false,
- isForm: false,
- },
- {
- label: '部门',
- field: 'departmentCode',
- sort: 'custom',
- isForm: false,
- table: {
- width: 150
- },
- isTable:false,
- formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
- return userDeptArray.find((account) => account.id == cellValue)?.name
- },
- form: {
- value: userDept.id,
- component: 'Select',
- api: () => userDeptArray,
- componentProps: {
- disabled: true,
- optionsAlias: {
- labelField: 'name',
- valueField: 'id'
+ {
+ label: '备注',
+ field: 'remark',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '自动提交',
+ field: 'autoCommit',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ isForm: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: requestsettingData.autoCommit,
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE',
+ disabled: true
}
}
- }
- },
- {
- label: '备注',
- field: 'remark',
- sort: 'custom',
- table: {
- width: 150
},
- isTable: false
- },
- {
- label: '自动提交',
- field: 'autoCommit',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable:false,
- isForm: false,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'Switch',
- value: requestsettingData.autoCommit,
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE',
- disabled: true
+ {
+ label: '自动通过',
+ field: 'autoAgree',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ isForm: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: requestsettingData.autoAgree,
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE',
+ disabled: true
+ }
}
- }
- },
- {
- label: '自动通过',
- field: 'autoAgree',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable:false,
- isForm: false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: requestsettingData.autoAgree,
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE',
- disabled: true
+ {
+ label: '自动执行',
+ field: 'autoExecute',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ isForm: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: requestsettingData.autoExecute,
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE',
+ disabled: true
+ }
}
- }
- },
- {
- label: '自动执行',
- field: 'autoExecute',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable:false,
- isForm: false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: requestsettingData.autoExecute,
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE',
- disabled: true
+ {
+ label: '直接生成记录',
+ field: 'directCreateRecord',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isForm: false,
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: requestsettingData.directCreateRecord,
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE',
+ disabled: true
+ }
}
- }
- },
- {
- label: '直接生成记录',
- field: 'directCreateRecord',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isForm: false,
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: requestsettingData.directCreateRecord,
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE',
- disabled: true
+ {
+ label: '创建时间',
+ field: 'createTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: true,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ },
+ isForm: false
+ },
+ {
+ label: '创建者',
+ field: 'creator',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: true,
+ isForm: false
+ },
+ {
+ label: '最后更新时间',
+ field: 'updateTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ },
+ isForm: false
+ },
+ {
+ label: '最后更新者',
+ field: 'updater',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ isForm: false
+ },
+ {
+ label: '操作',
+ field: 'action',
+ isDetail: false,
+ isForm: false,
+ table: {
+ width: 300,
+ fixed: 'right'
}
}
- },
- {
- label: '创建时间',
- field: 'createTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable:true,
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width:'100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
- }
- },
- isForm: false
- },
- {
- label: '创建者',
- field: 'creator',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable:true,
- isForm: false
- },
- {
- label: '最后更新时间',
- field: 'updateTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable:false,
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width:'100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
- }
- },
- isForm: false
- },
- {
- label: '最后更新者',
- field: 'updater',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable:false,
- isForm: false
- },
- {
- label: '操作',
- field: 'action',
- isDetail: false,
- isForm: false,
- table: {
- width: 300,
- fixed: 'right'
- },
- }
-]))
+ ])
+)
//表单校验
export const CustomerreturnRequestMainRules = reactive({
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
index 8d19bc9ea..6a8e0b2da 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@@ -200,6 +200,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
}
} else {
const setV = {}
+ if (formField == 'customerCode') {
+ setV['q1Number'] = ''
+ }
if(formField == 'deliverRecordNumber') {
setV['deliverRecordNumber'] = val[0]['number']
setV['deliverPlanNumber'] = val[0]['deliverPlanNumber']
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
index 58ccebc3f..7afec161a 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
@@ -2,510 +2,560 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
import { TableColumn } from '@/types/table'
+import * as InspectionQ3Api from '@/api/qms/inspectionQ3'
+import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data'
+
/**
* @returns {Array} 报废出库任务主表
*/
-export const ScrapJobMain = useCrudSchemas(reactive([
- {
- label: '单据号',
- field: 'number',
- sort: 'custom',
- table: {
- width: 180,
- fixed: 'left'
- },
- isSearch: true,
- },
- {
- label: '状态',
- field: 'status',
- dictType: DICT_TYPE.JOB_STATUS,
- dictClass: 'string',
- isSearch: true,
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '申请单号',
- field: 'requestNumber',
- sort: 'custom',
- table: {
- width: 180
- },
- isSearch: true,
- },
- {
- label: '申请时间',
- field: 'requestTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+export const ScrapJobMain = useCrudSchemas(
+ reactive([
+ {
+ label: '单据号',
+ field: 'number',
+ sort: 'custom',
+ table: {
+ width: 180,
+ fixed: 'left'
+ },
+ isSearch: true
+ },
+ {
+ label: '状态',
+ field: 'status',
+ dictType: DICT_TYPE.JOB_STATUS,
+ dictClass: 'string',
+ isSearch: true,
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
}
},
- },
- {
- label: '要求截止时间',
- field: 'requestDueTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '申请单号',
+ field: 'requestNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isSearch: true
+ },
+ {
+ label: 'Q3通知单号',
+ field: 'q3Number',
+ sort: 'custom',
+ isSearch: false,
+ isDetail: true,
+ table: {
+ width: 150
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true,
+ // multiple: true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
+ searchField: 'number', // 查询弹窗赋值字段
+ searchTitle: 'Q3通知单号', // 查询弹窗标题
+ searchAllSchemas: Q3.allSchemas, // 查询弹窗所需类
+ searchPage: InspectionQ3Api.getQ3Page, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'status',
+ value: '0',
+ isMainValue: false
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'number',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
}
},
- },
- {
- label: '过期时间',
- field: 'expiredTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '申请时间',
+ field: 'requestTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
},
- },
- {
- label: '从仓库代码',
- field: 'fromWarehouseCode',
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '从库区代码范围',
- field: 'fromAreaCodes',
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '从库区类型范围',
- field: 'fromAreaTypes',
- dictType: DICT_TYPE.AREA_TYPE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '到库区类型范围',
- field: 'toAreaTypes',
- dictType: DICT_TYPE.AREA_TYPE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- },
- // {
- // label: '状态',
- // field: 'jobStageStatus',
- // sort: 'custom',
- // table: {
- // width: 150
- // },
- // },
- {
- label: '优先级',
- field: 'priority',
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'InputNumber',
- }
- },
- {
- label: '优先级增量',
- field: 'priorityIncrement',
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'InputNumber',
- }
- },
- {
- label: '业务类型',
- field: 'businessType',
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '部门',
- field: 'departmentCode',
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '备注',
- field: 'remark',
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '自动完成',
- field: 'autoComplete',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '要求截止时间',
+ field: 'requestDueTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
},
- },
- {
- label: '允许修改库位',
- field: 'allowModifyLocation',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '过期时间',
+ field: 'expiredTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
},
- },
- {
- label: '允许修改数量',
- field: 'allowModifyQty',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '从仓库代码',
+ field: 'fromWarehouseCode',
+ sort: 'custom',
+ table: {
+ width: 150
}
},
- },
- {
- label: '允许大于推荐数量',
- field: 'allowBiggerQty',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '从库区代码范围',
+ field: 'fromAreaCodes',
+ sort: 'custom',
+ table: {
+ width: 150
}
},
- },
- {
- label: '允许小于推荐数量',
- field: 'allowSmallerQty',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '从库区类型范围',
+ field: 'fromAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
}
},
- },
- {
- label: '允许修改库存状态',
- field: 'allowModifyInventoryStatus',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '到库区类型范围',
+ field: 'toAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
}
},
- },
- {
- label: '允许连续扫描',
- field: 'allowContinuousScanning',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ // {
+ // label: '状态',
+ // field: 'jobStageStatus',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
+ {
+ label: '优先级',
+ field: 'priority',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'InputNumber'
}
},
- },
- {
- label: '允许部分完成',
- field: 'allowPartialComplete',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '优先级增量',
+ field: 'priorityIncrement',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'InputNumber'
}
},
- },
- {
- label: '允许修改批次',
- field: 'allowModifyBatch',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '业务类型',
+ field: 'businessType',
+ sort: 'custom',
+ table: {
+ width: 150
}
},
- },
- {
- label: '允许修改箱码',
- field: 'allowModifyPackingNumber',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '部门',
+ field: 'departmentCode',
+ sort: 'custom',
+ table: {
+ width: 150
}
},
- },
- {
- label: '承接时间',
- field: 'acceptTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
+ {
+ label: '备注',
+ field: 'remark',
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '自动完成',
+ field: 'autoComplete',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
},
- },
- {
- label: '承接人',
- field: 'acceptUserId',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '允许修改库位',
+ field: 'allowModifyLocation',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- },
- {
- label: '完成时间',
- field: 'completeTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ {
+ label: '允许修改数量',
+ field: 'allowModifyQty',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- sort: 'custom',
- table: {
- width: 180
+ {
+ label: '允许大于推荐数量',
+ field: 'allowBiggerQty',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '允许小于推荐数量',
+ field: 'allowSmallerQty',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
},
- },
- {
- label: '完成人',
- field: 'completeUserId',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '允许修改库存状态',
+ field: 'allowModifyInventoryStatus',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- },
- {
- label: '创建时间',
- field: 'createTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ {
+ label: '允许连续扫描',
+ field: 'allowContinuousScanning',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- sort: 'custom',
- table: {
- width: 180
+ {
+ label: '允许部分完成',
+ field: 'allowPartialComplete',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '允许修改批次',
+ field: 'allowModifyBatch',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
},
- isTable: false
- },
- {
- label: '创建者',
- field: 'creator',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '允许修改箱码',
+ field: 'allowModifyPackingNumber',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- isTable: false
- },
- {
- label: '最后更新时间',
- field: 'updateTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ {
+ label: '承接时间',
+ field: 'acceptTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- sort: 'custom',
- table: {
- width: 180
+ {
+ label: '承接人',
+ field: 'acceptUserId',
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '完成时间',
+ field: 'completeTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
},
- },
- {
- label: '最后更新者',
- field: 'updater',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '完成人',
+ field: 'completeUserId',
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- isTable: false,
- },
- {
- label: '操作',
- field: 'action',
- isDetail: false,
- isForm: false,
- table: {
- width: 120,
- fixed: 'right'
+ {
+ label: '创建时间',
+ field: 'createTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ },
+ isTable: false
+ },
+ {
+ label: '创建者',
+ field: 'creator',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '最后更新时间',
+ field: 'updateTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- }
-]))
+ {
+ label: '最后更新者',
+ field: 'updater',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '操作',
+ field: 'action',
+ isDetail: false,
+ isForm: false,
+ table: {
+ width: 120,
+ fixed: 'right'
+ }
+ }
+ ])
+)
//表单校验
export const ScrapJobMainRules = reactive({
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
index 2de4f4010..b2901d1a2 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
@@ -1,288 +1,338 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
import { TableColumn } from '@/types/table'
+import * as InspectionQ3Api from '@/api/qms/inspectionQ3'
+import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data'
+
/**
* @returns {Array} 报废出库记录主表
*/
-export const ScrapRecordMain = useCrudSchemas(reactive([
- {
- label: '单据号',
- field: 'number',
- sort: 'custom',
- table: {
- width: 180,
- fixed: 'left'
- },
- isSearch: true
- },
- {
- label: '申请单号',
- field: 'requestNumber',
- sort: 'custom',
- table: {
- width: 180
- },
- isSearch: true
- },
- {
- label: '任务单号',
- field: 'jobNumber',
- sort: 'custom',
- table: {
- width: 180
- },
- isSearch: true
- },
- {
- label: '申请时间',
- field: 'requestTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+export const ScrapRecordMain = useCrudSchemas(
+ reactive([
+ {
+ label: '单据号',
+ field: 'number',
+ sort: 'custom',
+ table: {
+ width: 180,
+ fixed: 'left'
+ },
+ isSearch: true
+ },
+ {
+ label: '申请单号',
+ field: 'requestNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isSearch: true
+ },
+ {
+ label: '任务单号',
+ field: 'jobNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isSearch: true
+ },
+ {
+ label: 'Q3通知单号',
+ field: 'q3Number',
+ sort: 'custom',
+ isSearch: false,
+ isDetail: true,
+ table: {
+ width: 150
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true,
+ // multiple: true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
+ searchField: 'number', // 查询弹窗赋值字段
+ searchTitle: 'Q3通知单号', // 查询弹窗标题
+ searchAllSchemas: Q3.allSchemas, // 查询弹窗所需类
+ searchPage: InspectionQ3Api.getQ3Page, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'status',
+ value: '0',
+ isMainValue: false
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'number',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
}
},
- },
- {
- label: '截止时间',
- field: 'dueTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '申请时间',
+ field: 'requestTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
},
- },
- {
- label: '执行时间',
- field: 'executeTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '截止时间',
+ field: 'dueTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
},
- },
- {
- label: '生效日期',
- field: 'activeDate',
- formatter: dateFormatter2,
- detail: {
- dateFormat: 'YYYY-MM-DD'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width: '100%'},
- type: 'date',
- dateFormat: 'YYYY-MM-DD',
- valueFormat: 'x',
+ {
+ label: '执行时间',
+ field: 'executeTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
},
- },
- {
- label: '从仓库代码',
- field: 'fromWarehouseCode',
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '从库区类型范围',
- field: 'fromAreaTypes',
- dictType: DICT_TYPE.AREA_TYPE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '生效日期',
+ field: 'activeDate',
+ formatter: dateFormatter2,
+ detail: {
+ dateFormat: 'YYYY-MM-DD'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'date',
+ dateFormat: 'YYYY-MM-DD',
+ valueFormat: 'x'
+ }
+ }
},
- },
- {
- label: '从库区代码范围',
- field: 'fromAreaCodes',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '从仓库代码',
+ field: 'fromWarehouseCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- },
- {
- label: '出库事务类型',
- field: 'outTransactionType',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '从库区类型范围',
+ field: 'fromAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- },
- {
- label: '入库事务类型',
- field: 'inTransactionType',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '从库区代码范围',
+ field: 'fromAreaCodes',
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- },
- {
- label: '业务类型',
- field: 'businessType',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '出库事务类型',
+ field: 'outTransactionType',
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- },
- {
- label: '部门',
- field: 'departmentCode',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '入库事务类型',
+ field: 'inTransactionType',
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- },
- {
- label: '接口类型',
- field: 'interfaceType',
- dictType: DICT_TYPE.INTERFACE_TYPE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '业务类型',
+ field: 'businessType',
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- },
- {
- label: '备注',
- field: 'remark',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '部门',
+ field: 'departmentCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- },
- {
- label: '创建时间',
- field: 'createTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ {
+ label: '接口类型',
+ field: 'interfaceType',
+ dictType: DICT_TYPE.INTERFACE_TYPE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- sort: 'custom',
- table: {
- width: 180
+ {
+ label: '备注',
+ field: 'remark',
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '创建时间',
+ field: 'createTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
},
- },
- {
- label: '创建者',
- field: 'creator',
- sort: 'custom',
- isTable: false,
- table: {
- width: 150
+ {
+ label: '创建者',
+ field: 'creator',
+ sort: 'custom',
+ isTable: false,
+ table: {
+ width: 150
+ }
},
- },
- {
- label: '最后更新时间',
- field: 'updateTime',
- sort: 'custom',
- isDetail: true,
- isForm: false,
- isTable: false,
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ {
+ label: '最后更新时间',
+ field: 'updateTime',
+ sort: 'custom',
+ isDetail: true,
+ isForm: false,
+ isTable: false,
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- table: {
- width: 180
+ {
+ label: '最后更新者',
+ field: 'updater',
+ isDetail: true,
+ isForm: false,
+ isTable: false,
+ table: {
+ width: 150
+ }
},
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width:'100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ // {
+ // label: '代码',
+ // field: 'code',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
+ {
+ label: '是否可用',
+ field: 'available',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isSearch: false,
+ isTable: true,
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
}
}
- },
- {
- label: '最后更新者',
- field: 'updater',
- isDetail: true,
- isForm: false,
- isTable: false,
- table: {
- width: 150
- }
- },
- // {
- // label: '代码',
- // field: 'code',
- // sort: 'custom',
- // table: {
- // width: 150
- // },
- // },
- {
- label: '是否可用',
- field: 'available',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isSearch: false,
- isTable: true,
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
- }
- },
- },
-]))
+ ])
+)
//表单校验
export const ScrapRecordMainRules = reactive({
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index 94793b6c1..8225d5bca 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -1,398 +1,456 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
-import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
+import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
-import * as BalanceApi from '@/api/wms/balance'
+import * as BalanceApi from '@/api/wms/balance'
import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
-import {Warehouse} from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data";
-import * as WarehouseApi from "@/api/wms/warehouse";
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+import * as WarehouseApi from '@/api/wms/warehouse'
+
+import * as InspectionQ3Api from '@/api/qms/inspectionQ3'
+import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data'
const { t } = useI18n() // 国际化
// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
const queryParams = {
- pageSize:10,
- pageNo:1,
- code:'ScrapRequest'
+ pageSize: 10,
+ pageNo: 1,
+ code: 'ScrapRequest'
}
- const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
- const requestsettingData =data?.list[0]||{}
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData = data?.list[0] || {}
- // 获取当前操作人的部门
+// 获取当前操作人的部门
import { useUserStore } from '@/store/modules/user'
import { TableColumn } from '@/types/table'
const userStore = useUserStore()
const userDept = userStore.userSelfInfo.dept
- // id 转str 否则form回显匹配不到
- userDept.id = userDept.id.toString()
-const userDeptArray:any = [userDept]
+// id 转str 否则form回显匹配不到
+userDept.id = userDept.id.toString()
+const userDeptArray: any = [userDept]
/**
* @returns {Array} 报废出库申请主表
*/
-export const ScrapRequestMain = useCrudSchemas(reactive([
- {
- label: '单据号',
- field: 'number',
- sort: 'custom',
- table: {
- width: 180,
- fixed: 'left'
- },
- isForm: false,
- isSearch: true,
- },
- {
- label: '状态',
- field: 'status',
- dictType: DICT_TYPE.REQUEST_STATUS,
- dictClass: 'string',
- isSearch: true,
- isForm: false,
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- value: '1',
- componentProps: {
- disabled: true
+export const ScrapRequestMain = useCrudSchemas(
+ reactive([
+ {
+ label: '单据号',
+ field: 'number',
+ sort: 'custom',
+ table: {
+ width: 180,
+ fixed: 'left'
+ },
+ isForm: false,
+ isSearch: true
+ },
+ {
+ label: 'Q3通知单号',
+ field: 'q3Number',
+ sort: 'custom',
+ isSearch: false,
+ isDetail: true,
+ table: {
+ width: 150
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true,
+ // multiple: true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
+ searchField: 'number', // 查询弹窗赋值字段
+ searchTitle: 'Q3通知单号', // 查询弹窗标题
+ searchAllSchemas: Q3.allSchemas, // 查询弹窗所需类
+ searchPage: InspectionQ3Api.getQ3Page, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'status',
+ value: '0',
+ isMainValue: false
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'number',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
}
- }
- },
- {
- label: '申请时间',
- field: 'requestTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
},
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width: '100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '状态',
+ field: 'status',
+ dictType: DICT_TYPE.REQUEST_STATUS,
+ dictClass: 'string',
+ isSearch: true,
+ isForm: false,
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ value: '1',
+ componentProps: {
+ disabled: true
+ }
}
},
- isForm: false,
- },
- {
- label: '截止时间',
- field: 'dueTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width: '100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '申请时间',
+ field: 'requestTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ },
+ isForm: false
+ },
+ {
+ label: '截止时间',
+ field: 'dueTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
},
- },
- {
- label: '从仓库代码',
- field: 'fromWarehouseCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isSearch: true,
- tableForm: {
- enterSearch: true,
- isInpuFocusShow: true, // 开启查询弹窗
- searchListPlaceholder: '请选择仓库代码',
- searchField: 'code',
- searchTitle: '仓库信息',
- searchAllSchemas: Warehouse.allSchemas,
- searchPage: WarehouseApi.getWarehousePage,
- searchCondition: [{
- key: 'available',
- value: 'TRUE',
- isMainValue: false
- }],
- verificationParams: [{
- key: 'code',
- action: '==',
- value: '',
- isMainValue: false,
- isSearch: true,
- isFormModel: true,
- }], // 失去焦点校验参数
- },
- form: {
- // labelMessage: '信息提示说明！！！',
- componentProps: {
+ {
+ label: '从仓库代码',
+ field: 'fromWarehouseCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isSearch: true,
+ tableForm: {
enterSearch: true,
- isSearchList: true, // 开启查询弹窗
- searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
- searchField: 'code', // 查询弹窗赋值字段
- searchTitle: '仓库信息', // 查询弹窗标题
- searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
- searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
- searchCondition: [{
- key: 'available',
- value: 'TRUE',
- isMainValue: false
- }],
- verificationParams: [{
- key: 'code',
- action: '==',
- value: '',
- isMainValue: false,
- isSearch: true,
- isFormModel: true,
- }], // 失去焦点校验参数
- }
- }
- },
- {
- label: '从库区类型范围',
- field: 'fromAreaTypes',
- dictType: DICT_TYPE.AREA_TYPE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- isSearch: true,
- isForm: false,
- },
- {
- label: '从库区代码范围',
- field: 'fromAreaCodes',
- sort: 'custom',
- table: {
- width: 150
- },
- isForm: false,
- },
- {
- label: '业务类型',
- field: 'businessType',
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- value: 'Scrap',
- componentProps: {
- disabled: true
+ isInpuFocusShow: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择仓库代码',
+ searchField: 'code',
+ searchTitle: '仓库信息',
+ searchAllSchemas: Warehouse.allSchemas,
+ searchPage: WarehouseApi.getWarehousePage,
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'code',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+ searchField: 'code', // 查询弹窗赋值字段
+ searchTitle: '仓库信息', // 查询弹窗标题
+ searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+ searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'code',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
}
},
- isForm: false,
- },
- {
- label: '部门',
- field: 'departmentCode',
- sort: 'custom',
- isForm: false,
- isTable:false,
- table: {
- width: 150
- },
- formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
- return userDeptArray.find((account) => account.id == cellValue)?.name
- },
- form: {
- value: userDept.id,
- component: 'Select',
- api: () => userDeptArray,
- componentProps: {
- disabled: true,
- optionsAlias: {
- labelField: 'name',
- valueField: 'id'
+ {
+ label: '从库区类型范围',
+ field: 'fromAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isSearch: true,
+ isForm: false
+ },
+ {
+ label: '从库区代码范围',
+ field: 'fromAreaCodes',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isForm: false
+ },
+ {
+ label: '业务类型',
+ field: 'businessType',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ value: 'Scrap',
+ componentProps: {
+ disabled: true
+ }
+ },
+ isForm: false
+ },
+ {
+ label: '部门',
+ field: 'departmentCode',
+ sort: 'custom',
+ isForm: false,
+ isTable: false,
+ table: {
+ width: 150
+ },
+ formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+ return userDeptArray.find((account) => account.id == cellValue)?.name
+ },
+ form: {
+ value: userDept.id,
+ component: 'Select',
+ api: () => userDeptArray,
+ componentProps: {
+ disabled: true,
+ optionsAlias: {
+ labelField: 'name',
+ valueField: 'id'
+ }
}
}
- }
- },
- {
- label: '备注',
- field: 'remark',
- sort: 'custom',
- isTable:false,
- table: {
- width: 150
- },
- },
- {
- label: '自动提交',
- field: 'autoCommit',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- isForm: false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: requestsettingData.autoCommit,
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE',
- disable: true
+ {
+ label: '备注',
+ field: 'remark',
+ sort: 'custom',
+ isTable: false,
+ table: {
+ width: 150
}
- }
- },
- {
- label: '自动通过',
- field: 'autoAgree',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- isForm: false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: requestsettingData.autoAgree,
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE',
- disable: true
+ {
+ label: '自动提交',
+ field: 'autoCommit',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ isForm: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: requestsettingData.autoCommit,
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE',
+ disable: true
+ }
}
- }
- },
- {
- label: '自动执行',
- field: 'autoExecute',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- isForm: false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: requestsettingData.autoExecute,
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE',
- disable: true
+ {
+ label: '自动通过',
+ field: 'autoAgree',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ isForm: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: requestsettingData.autoAgree,
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE',
+ disable: true
+ }
}
- }
- },
- {
- label: '直接生成记录',
- field: 'directCreateRecord',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isForm:false,
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: requestsettingData.directCreateRecord,
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE',
- disable: true
+ {
+ label: '自动执行',
+ field: 'autoExecute',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ isForm: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: requestsettingData.autoExecute,
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE',
+ disable: true
+ }
}
- }
- },
- {
- label: '创建时间',
- field: 'createTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
},
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width: '100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '直接生成记录',
+ field: 'directCreateRecord',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isForm: false,
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: requestsettingData.directCreateRecord,
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE',
+ disable: true
+ }
}
},
- isTable:false,
- isForm: false,
- },
- {
- label: '创建者',
- field: 'creator',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable:false,
- isForm: false,
- },
- {
- label: '最后更新时间',
- field: 'updateTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width: '100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '创建时间',
+ field: 'createTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ },
+ isTable: false,
+ isForm: false
+ },
+ {
+ label: '创建者',
+ field: 'creator',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ isForm: false
+ },
+ {
+ label: '最后更新时间',
+ field: 'updateTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ },
+ isTable: false,
+ isForm: false
+ },
+ {
+ label: '最后更新者',
+ field: 'updater',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ isForm: false
+ },
+ {
+ label: '操作',
+ field: 'action',
+ isDetail: false,
+ isForm: false,
+ table: {
+ width: 300,
+ fixed: 'right'
}
- },
- isTable:false,
- isForm: false,
- },
- {
- label: '最后更新者',
- field: 'updater',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable:false,
- isForm: false,
- },
- {
- label: '操作',
- field: 'action',
- isDetail: false,
- isForm: false,
- table: {
- width: 300,
- fixed: 'right'
- },
- }
-]))
+ }
+ ])
+)
//表单校验
export const ScrapRequestMainRules = reactive({
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
index ab6f84822..916c1c6ee 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@@ -279,15 +279,15 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive
isTable: false,
isForm: false,
},
- {
- label: '备注',
- field: 'remark',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false
- },
+ // {
+ // label: '备注',
+ // field: 'remark',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTable: false
+ // },
{
label: '业务类型',
field: 'businessType',
@@ -599,7 +599,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive
if(item.field == 'qty' && Number(val[0]['qty'])>item.tableForm.min) {
item.tableForm.max = Number(val[0]['qty'])
}
- if(item.field == 'batch') {
- item.tableForm.disabled = false
- }
+ // if(item.field == 'batch') {
+ // item.tableForm.disabled = false
+ // }
})
}
} else if(formField == 'workStationCode') {
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
index ac936bd64..8f808bc1f 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
@@ -1,16 +1,16 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
-import * as SupplieritemApi from '@/api/wms/supplieritem'
+import * as SupplieritemApi from '@/api/wms/supplieritem'
import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
-import * as ProductionlineApi from '@/api/wms/productionline'
+import * as ProductionlineApi from '@/api/wms/productionline'
import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
-import * as WorkstationApi from '@/api/wms/workstation'
+import * as WorkstationApi from '@/api/wms/workstation'
import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
-import * as BalanceApi from '@/api/wms/balance'
+import * as BalanceApi from '@/api/wms/balance'
import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
import * as ItempackagingApi from '@/api/wms/itempackage'
@@ -21,565 +21,593 @@ const { t } = useI18n() // 国际化
/**
* @returns {Array} 生产退料申请子表
*/
-export const ProductionreturnRequestDetail = useCrudSchemas(reactive([
- {
- label: '生产线代码',
- field: 'productionLineCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTableForm: false,
- hiddenInMain: true,
- form: {
- // labelMessage: '信息提示说明！！！',
- componentProps: {
- isSearchList: true, // 开启查询弹窗
+export const ProductionreturnRequestDetail = useCrudSchemas(
+ reactive([
+ {
+ label: '生产线代码',
+ field: 'productionLineCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTableForm: false,
+ hiddenInMain: true,
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+ searchField: 'code', // 查询弹窗赋值字段
+ searchTitle: '生产线信息', // 查询弹窗标题
+ searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+ searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'workshopCode',
+ value: 'workshopCode',
+ message: '请选择车间信息！', // 当前置条件为空时 弹出信息提示
+ isMainValue: true
+ }
+ ]
+ }
+ },
+ tableForm: {
+ isInpuFocusShow: true,
searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '生产线信息', // 查询弹窗标题
searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
- searchCondition:[{
- key: 'available',
- value: 'TRUE',
- isMainValue: false
- },{
- key: 'workshopCode',
- value: 'workshopCode',
- message: '请选择车间信息！', // 当前置条件为空时 弹出信息提示
- isMainValue: true
- }]
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'workshopCode',
+ value: 'workshopCode',
+ message: '请选择车间信息！', // 当前置条件为空时 弹出信息提示
+ isMainValue: true
+ }
+ ]
}
},
- tableForm:{
- isInpuFocusShow: true,
- searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
- searchField: 'code', // 查询弹窗赋值字段
- searchTitle: '生产线信息', // 查询弹窗标题
- searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
- searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
- searchCondition:[{
- key: 'available',
- value: 'TRUE',
- isMainValue: false
- },{
- key: 'workshopCode',
- value: 'workshopCode',
- message: '请选择车间信息！', // 当前置条件为空时 弹出信息提示
- isMainValue: true
- }]
- },
- },
- {
- label: '工位代码',
- field: 'workStationCode',
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- // labelMessage: '信息提示说明！！！',
- componentProps: {
- isSearchList: true, // 开启查询弹窗
+ {
+ label: '工位代码',
+ field: 'workStationCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择工位代码', // 输入框占位文本
+ searchField: 'code', // 查询弹窗赋值字段
+ searchTitle: '工位信息', // 查询弹窗标题
+ searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+ searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'workshopCode',
+ value: 'workshopCode',
+ message: '请选择车间信息！',
+ isMainValue: true
+ },
+ {
+ key: 'productionLineCode',
+ value: 'productionLineCode',
+ message: '请选择生产线信息！',
+ isMainValue: true
+ }
+ ]
+ }
+ },
+ tableForm: {
+ multiple: true,
+ disabled: true,
+ // isInpuFocusShow: true,
searchListPlaceholder: '请选择工位代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '工位信息', // 查询弹窗标题
searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
- searchCondition:[{
- key: 'available',
- value: 'TRUE',
- isMainValue: false
- },{
- key: 'workshopCode',
- value: 'workshopCode',
- message: '请选择车间信息！',
- isMainValue: true
- },{
- key: 'productionLineCode',
- value: 'productionLineCode',
- message: '请选择生产线信息！',
- isMainValue: true
- }]
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'workshopCode',
+ value: 'workshopCode',
+ message: '请选择车间信息！',
+ isMainValue: true
+ },
+ {
+ key: 'productionLineCode',
+ value: 'productionLineCode',
+ message: '请选择生产线信息！',
+ isMainValue: true
+ }
+ ],
+ verificationPage: WorkstationApi.getWorkstationByCodes, // 校验数去焦点输入是否正确的方法
+ isShowTableFormSearch: true,
+ isRepeat: true, //是否可以重复添加该条数据
+ verificationParams: [
+ {
+ key: 'code',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
}
},
- tableForm:{
- multiple: true,
- disabled:true,
- // isInpuFocusShow: true,
- searchListPlaceholder: '请选择工位代码', // 输入框占位文本
- searchField: 'code', // 查询弹窗赋值字段
- searchTitle: '工位信息', // 查询弹窗标题
- searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
- searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
- searchCondition:[{
- key: 'available',
- value: 'TRUE',
- isMainValue: false
- },{
- key: 'workshopCode',
- value: 'workshopCode',
- message: '请选择车间信息！',
- isMainValue: true
- },{
- key: 'productionLineCode',
- value: 'productionLineCode',
- message: '请选择生产线信息！',
- isMainValue: true
- }],
- verificationPage: WorkstationApi.getWorkstationByCodes, // 校验数去焦点输入是否正确的方法
- isShowTableFormSearch: true,
- isRepeat: true,//是否可以重复添加该条数据
- verificationParams: [{
- key: 'code',
- action: '==',
- value: '',
- isMainValue: false,
- isSearch: true,
- isFormModel: true,
- }], // 失去焦点校验参数
-
- },
- },
- {
- label: '物料代码',
- field: 'itemCode',
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- // labelMessage: '信息提示说明！！！',
- componentProps: {
- isSearchList: true, // 开启查询弹窗
+ {
+ label: '物料代码',
+ field: 'itemCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+ searchField: 'itemCode', // 查询弹窗赋值字段
+ searchTitle: '库存余额信息', // 查询弹窗标题
+ searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
+ searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'locationCode',
+ value: 'fromLocationCode',
+ message: '请填写从库位代码！',
+ isMainValue: true
+ },
+ {
+ key: 'inventoryStatus',
+ value: 'OK',
+ isMainValue: false
+ }
+ ]
+ }
+ },
+ tableForm: {
+ isInpuFocusShow: true,
searchListPlaceholder: '请选择物料代码', // 输入框占位文本
searchField: 'itemCode', // 查询弹窗赋值字段
searchTitle: '库存余额信息', // 查询弹窗标题
searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
- searchCondition:[{
- key: 'locationCode',
- value: 'fromLocationCode',
- message: '请填写从库位代码！',
- isMainValue: true
- },{
- key: 'inventoryStatus',
- value: 'OK',
- isMainValue: false
- }]
+ searchCondition: [
+ {
+ key: 'locationCode',
+ value: 'fromLocationCode',
+ message: '请填写从库位代码！',
+ isMainValue: true
+ },
+ {
+ key: 'inventoryStatus',
+ value: 'OK',
+ isMainValue: false
+ },
+ {
+ key: 'businessType',
+ value: 'ReturnToHold', // 隔离退料
+ isMainValue: false
+ }
+ ]
}
},
- tableForm:{
- isInpuFocusShow: true,
- searchListPlaceholder: '请选择物料代码', // 输入框占位文本
- searchField: 'itemCode', // 查询弹窗赋值字段
- searchTitle: '库存余额信息', // 查询弹窗标题
- searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
- searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
- searchCondition:[
- {
- key: 'locationCode',
- value: 'fromLocationCode',
- message: '请填写从库位代码！',
- isMainValue: true
+ // {
+ // label: '包装号',
+ // field: 'packingNumber',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // tableForm: {
+ // disabled: true
+ // },
+ // form: {
+ // componentProps: {
+ // disabled: true
+ // }
+ // }
+ // },
+ // {
+ // label: '器具号',
+ // field: 'containerNumber',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // tableForm: {
+ // disabled: true
+ // },
+ // form: {
+ // componentProps: {
+ // disabled: true
+ // }
+ // }
+ // },
+ {
+ label: '物料名称',
+ field: 'itemName',
+ sort: 'custom',
+ table: {
+ width: 150
},
- {
- key: 'inventoryStatus',
- value: 'OK',
- isMainValue: false
- },{
- key: 'businessType',
- value: 'ReturnToHold', // 隔离退料
- isMainValue: false
- }]
- },
- },
- // {
- // label: '包装号',
- // field: 'packingNumber',
- // sort: 'custom',
- // table: {
- // width: 150
- // },
- // tableForm: {
- // disabled: true
- // },
- // form: {
- // componentProps: {
- // disabled: true
- // }
- // }
- // },
- // {
- // label: '器具号',
- // field: 'containerNumber',
- // sort: 'custom',
- // table: {
- // width: 150
- // },
- // tableForm: {
- // disabled: true
- // },
- // form: {
- // componentProps: {
- // disabled: true
- // }
- // }
- // },
- {
- label: '物料名称',
- field: 'itemName',
- sort: 'custom',
- table: {
- width: 150
- },
- isTableForm: false,
- isForm: false,
- },
- {
- label: '物料描述1',
- field: 'itemDesc1',
- sort: 'custom',
- table: {
- width: 150
- },
- hiddenInMain: true,
- isTableForm: false,
- isForm: false,
- },
- {
- label: '物料描述2',
- field: 'itemDesc2',
- sort: 'custom',
- table: {
- width: 150
- },
- hiddenInMain: true,
- isTableForm: false,
- isForm: false,
- },
- {
- label: '批次',
- field: 'batch',
- sort: 'custom',
- table: {
- width: 150
- },
- tableForm: {
- disabled: false
- },
- form: {
- componentProps: {
- disabled: false
+ isTableForm: false,
+ isForm: false
+ },
+ {
+ label: '物料描述1',
+ field: 'itemDesc1',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ hiddenInMain: true,
+ isTableForm: false,
+ isForm: false
+ },
+ {
+ label: '物料描述2',
+ field: 'itemDesc2',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ hiddenInMain: true,
+ isTableForm: false,
+ isForm: false
+ },
+ {
+ label: '批次',
+ field: 'batch',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm: {
+ disabled: true
+ },
+ form: {
+ componentProps: {
+ disabled: true
+ }
}
- }
- },
- {
- label: '数量',
- field: 'qty',
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'InputNumber',
- componentProps: {
+ {
+ label: '数量',
+ field: 'qty',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'InputNumber',
+ componentProps: {
+ min: 0,
+ precision: 6
+ }
+ },
+ tableForm: {
+ type: 'InputNumber',
min: 0,
precision: 6
}
},
- tableForm: {
- type: 'InputNumber',
- min: 0,
- precision: 6
- }
- },
- {
- label: '计量单位',
- field: 'uom',
- dictType: DICT_TYPE.UOM,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- tableForm: {
- type: 'Select',
- disabled: true
- },
- form: {
- componentProps: {
+ {
+ label: '计量单位',
+ field: 'uom',
+ dictType: DICT_TYPE.UOM,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm: {
+ type: 'Select',
disabled: true
+ },
+ form: {
+ componentProps: {
+ disabled: true
+ }
}
- }
- },
- {
- label: '库存状态',
- field: 'inventoryStatus',
- dictType: DICT_TYPE.INVENTORY_STATUS,
- dictClass: 'string',
- isTable: true,
- isTableForm: false,
- sort: 'custom',
- table: {
- width: 150
- },
- tableForm: {
- type: 'Select',
- disabled: true
},
- form: {
- componentProps: {
- disabled: true
- }
- }
- },
- {
- label: '来源库位',
- field: 'fromLocationCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTableForm:false,
- tableForm: {
- disabled: true
- },
- form: {
- componentProps: {
+ {
+ label: '库存状态',
+ field: 'inventoryStatus',
+ dictType: DICT_TYPE.INVENTORY_STATUS,
+ dictClass: 'string',
+ isTable: true,
+ isTableForm: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm: {
+ type: 'Select',
disabled: true
+ },
+ form: {
+ componentProps: {
+ disabled: true
+ }
}
- }
- },
- {
- label: '从货主',
- field: 'fromOwnerCode',
- sort: 'custom',
- table: {
- width: 150
- },
- hiddenInMain: true,
- isTableForm: false,
- isForm: false,
- },
- {
- label: '到货主',
- field: 'toOwnerCode',
- sort: 'custom',
- table: {
- width: 150
- },
- hiddenInMain: true,
- isTableForm: false,
- isForm: false,
- },
- {
- label: '项目代码',
- field: 'projectCode',
- sort: 'custom',
- table: {
- width: 150
- },
- hiddenInMain: true,
- isTableForm: false,
- isForm: false,
- },
- {
- label: '单据号',
- field: 'number',
- sort: 'custom',
- table: {
- width: 180
},
- hiddenInMain: true,
- isTableForm: false,
- form: {
- componentProps: {
+ {
+ label: '来源库位',
+ field: 'fromLocationCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTableForm: false,
+ tableForm: {
disabled: true
+ },
+ form: {
+ componentProps: {
+ disabled: true
+ }
}
- }
- },
- {
- label: '备注',
- field: 'remark',
- sort: 'custom',
- table: {
- width: 150
- },
- hiddenInMain: true,
- },
- {
- label: '创建者',
- field: 'creator',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: true,
- hiddenInMain: true,
- isTableForm: false,
- isForm: false
- },
- {
- label: '创建时间',
- field: 'createTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
},
- hiddenInMain: true,
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width:'100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '从货主',
+ field: 'fromOwnerCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ hiddenInMain: true,
+ isTableForm: false,
+ isForm: false
+ },
+ {
+ label: '到货主',
+ field: 'toOwnerCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ hiddenInMain: true,
+ isTableForm: false,
+ isForm: false
+ },
+ {
+ label: '项目代码',
+ field: 'projectCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ hiddenInMain: true,
+ isTableForm: false,
+ isForm: false
+ },
+ {
+ label: '单据号',
+ field: 'number',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ hiddenInMain: true,
+ isTableForm: false,
+ form: {
+ componentProps: {
+ disabled: true
+ }
}
},
- isTableForm: false,
- isForm: false,
- isTable: true,
- },
- {
- label: '包装规格',
- field: 'packUnit',
- sort: 'custom',
- isSearch: true,
- table: {
- width: 120
- },
- isTable: false,
- tableForm:{
- isInpuFocusShow: true,
- isSearchList: true, // 开启查询弹窗
- searchListPlaceholder: '请选择包装规格', // 输入框占位文本
- searchField: 'packUnit', // 查询弹窗赋值字段
- searchTitle: '物料包装信息', // 查询弹窗标题
- searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
- searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
- searchCondition: [{
- key: 'available',
- value: 'TRUE',
- isMainValue: false
- },{
- key: 'itemCode',
- value: 'itemCode',
- message: '请先选择物料代码！',
- isMainValue: true
- }]
- },
- form: {
- // labelMessage: '信息提示说明！！！',
- componentProps: {
+ {
+ label: '备注',
+ field: 'remark',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ hiddenInMain: true
+ },
+ {
+ label: '创建者',
+ field: 'creator',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: true,
+ hiddenInMain: true,
+ isTableForm: false,
+ isForm: false
+ },
+ {
+ label: '创建时间',
+ field: 'createTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ hiddenInMain: true,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ },
+ isTableForm: false,
+ isForm: false,
+ isTable: true
+ },
+ {
+ label: '包装规格',
+ field: 'packUnit',
+ sort: 'custom',
+ isSearch: true,
+ table: {
+ width: 120
+ },
+ isTable: false,
+ tableForm: {
+ isInpuFocusShow: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择包装规格', // 输入框占位文本
searchField: 'packUnit', // 查询弹窗赋值字段
searchTitle: '物料包装信息', // 查询弹窗标题
searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
- searchCondition: [{
- key: 'available',
- value: 'TRUE',
- isMainValue: false
- },{
- key: 'itemCode',
- value: 'itemCode',
- message: '请先选择物料代码！', // 当前置条件为空时 弹出信息提示
- isMainValue: true
- }]
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'itemCode',
+ value: 'itemCode',
+ message: '请先选择物料代码！',
+ isMainValue: true
+ }
+ ]
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+ searchField: 'packUnit', // 查询弹窗赋值字段
+ searchTitle: '物料包装信息', // 查询弹窗标题
+ searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+ searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'itemCode',
+ value: 'itemCode',
+ message: '请先选择物料代码！', // 当前置条件为空时 弹出信息提示
+ isMainValue: true
+ }
+ ]
+ }
}
- }
- },
- {
- label: '标包数量',
- field: 'packQty',
- sort: 'custom',
- table: {
- width: 120
- },
- isTable: false,
- tableForm:{
- disabled: true
},
- form: {
- componentProps: {
+ {
+ label: '标包数量',
+ field: 'packQty',
+ sort: 'custom',
+ table: {
+ width: 120
+ },
+ isTable: false,
+ tableForm: {
disabled: true
+ },
+ form: {
+ componentProps: {
+ disabled: true
+ }
}
- }
- },
- {
- label: '包装号',
- field: 'packingNumber',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- isTableForm: false,
- tableForm: {
- disabled: true
},
- form: {
- componentProps: {
+ {
+ label: '包装号',
+ field: 'packingNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ isTableForm: false,
+ tableForm: {
disabled: true
- }
- }
- },
- {
- label: '最后更新时间',
- field: 'updateTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width:'100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ },
+ form: {
+ componentProps: {
+ disabled: true
+ }
}
},
- isTableForm: false,
- isForm: false
- },
- {
- label: '最后更新者',
- field: 'updater',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- isTableForm: false,
- isForm: false
- },
- {
- label: '操作',
- field: 'action',
- isDetail: false,
- isForm: false ,
- table: {
- width: 250,
- fixed: 'right'
- },
- isTableForm:false,
- }
-]))
+ {
+ label: '最后更新时间',
+ field: 'updateTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ },
+ isTableForm: false,
+ isForm: false
+ },
+ {
+ label: '最后更新者',
+ field: 'updater',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ isTableForm: false,
+ isForm: false
+ },
+ {
+ label: '操作',
+ field: 'action',
+ isDetail: false,
+ isForm: false,
+ table: {
+ width: 250,
+ fixed: 'right'
+ },
+ isTableForm: false
+ }
+ ])
+)
//表单校验
export const ProductionreturnRequestDetailRules = reactive({
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
index 20f93af4f..e95a4ca67 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
@@ -1,321 +1,371 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
+
+import * as InspectionQ3Api from '@/api/qms/inspectionQ3'
+import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data'
/**
* @returns {Array} 生产退料记录主表
*/
-export const ProductionscrapRecordMain = useCrudSchemas(reactive([
- {
- label: '单据号',
- field: 'number',
- sort: 'custom',
- table: {
- width: 180,
- fixed: 'left'
- },
- isSearch: true
- },
- {
- label: '申请单号',
- field: 'requestNumber',
- sort: 'custom',
- table: {
- width: 180
- },
- isSearch: true
- },
- {
- label: '车间代码',
- field: 'workshopCode',
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '出库事务类型',
- field: 'outTransactionType',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '入库事务类型',
- field: 'inTransactionType',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '执行时间',
- field: 'executeTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+export const ProductionscrapRecordMain = useCrudSchemas(
+ reactive([
+ {
+ label: '单据号',
+ field: 'number',
+ sort: 'custom',
+ table: {
+ width: 180,
+ fixed: 'left'
+ },
+ isSearch: true
+ },
+ {
+ label: '申请单号',
+ field: 'requestNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isSearch: true
+ },
+ {
+ label: 'Q3通知单号',
+ field: 'q3Number',
+ sort: 'custom',
+ isSearch: false,
+ isDetail: true,
+ table: {
+ width: 150
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true,
+ // multiple: true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
+ searchField: 'number', // 查询弹窗赋值字段
+ searchTitle: 'Q3通知单号', // 查询弹窗标题
+ searchAllSchemas: Q3.allSchemas, // 查询弹窗所需类
+ searchPage: InspectionQ3Api.getQ3Page, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'status',
+ value: '0',
+ isMainValue: false
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'number',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
}
},
- },
- {
- label: '生效日期',
- field: 'activeDate',
- formatter: dateFormatter2,
- detail: {
- dateFormat: 'YYYY-MM-DD'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width: '100%'},
- type: 'date',
- dateFormat: 'YYYY-MM-DD',
- valueFormat: 'x',
+ {
+ label: '车间代码',
+ field: 'workshopCode',
+ sort: 'custom',
+ table: {
+ width: 150
}
},
- },
- {
- label: '申请时间',
- field: 'requestTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '出库事务类型',
+ field: 'outTransactionType',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '入库事务类型',
+ field: 'inTransactionType',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '执行时间',
+ field: 'executeTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
},
- },
- {
- label: '截止时间',
- field: 'dueTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '生效日期',
+ field: 'activeDate',
+ formatter: dateFormatter2,
+ detail: {
+ dateFormat: 'YYYY-MM-DD'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'date',
+ dateFormat: 'YYYY-MM-DD',
+ valueFormat: 'x'
+ }
}
},
- },
- {
- label: '部门',
- field: 'departmentCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '接口类型',
- field: 'interfaceType',
- dictType: DICT_TYPE.INTERFACE_TYPE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '业务类型',
- field: 'businessType',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '备注',
- field: 'remark',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- // {
- // label: '创建者',
- // field: 'creator',
- // sort: 'custom',
- // table: {
- // width: 150
- // },
- // isTable: true,
- // },
- // {
- // label: '创建时间',
- // field: 'createTime',
- // formatter: dateFormatter,
- // detail: {
- // dateFormat: 'YYYY-MM-DD HH:mm:ss'
- // },
- // sort: 'custom',
- // table: {
- // width: 180
- // },
- // isTable: true,
- // form: {
- // component: 'DatePicker',
- // componentProps: {
- // type: 'datetime',
- // dateFormat: 'YYYY-MM-DD HH:mm:ss',
- // valueFormat: 'x',
- // }
- // },
- // },
- {
- label: '最后更新时间',
- field: 'updateTime',
- sort: 'custom',
- isDetail: true,
- isForm: false,
- isTable: false,
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width:'100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '申请时间',
+ field: 'requestTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
- }
- },
- {
- label: '最后更新者',
- field: 'updater',
- isDetail: true,
- isForm: false,
- isTable: false,
- table: {
- width: 150
- }
- },
- {
- label: '从仓库代码',
- field: 'fromWarehouseCode',
- sort: 'custom',
- table: {
- width: 150
},
- isTable: false,
- },
- {
- label: '从库区类型范围',
- field: 'fromAreaTypes',
- dictType: DICT_TYPE.AREA_TYPE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '截止时间',
+ field: 'dueTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- },
- {
- label: '从库区代码范围',
- field: 'fromAreaCodes',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '部门',
+ field: 'departmentCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '接口类型',
+ field: 'interfaceType',
+ dictType: DICT_TYPE.INTERFACE_TYPE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- isTable: false,
- },
- {
- label: '到仓库代码',
- field: 'toWarehouseCode',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '业务类型',
+ field: 'businessType',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '备注',
+ field: 'remark',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ // {
+ // label: '创建者',
+ // field: 'creator',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTable: true,
+ // },
+ // {
+ // label: '创建时间',
+ // field: 'createTime',
+ // formatter: dateFormatter,
+ // detail: {
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ // },
+ // sort: 'custom',
+ // table: {
+ // width: 180
+ // },
+ // isTable: true,
+ // form: {
+ // component: 'DatePicker',
+ // componentProps: {
+ // type: 'datetime',
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ // valueFormat: 'x',
+ // }
+ // },
+ // },
+ {
+ label: '最后更新时间',
+ field: 'updateTime',
+ sort: 'custom',
+ isDetail: true,
+ isForm: false,
+ isTable: false,
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- isTable: false,
- },
- {
- label: '到库区类型范围',
- field: 'toAreaTypes',
- dictType: DICT_TYPE.AREA_TYPE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '最后更新者',
+ field: 'updater',
+ isDetail: true,
+ isForm: false,
+ isTable: false,
+ table: {
+ width: 150
+ }
},
- },
- {
- label: '到库区代码范围',
- field: 'toAreaCodes',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '从仓库代码',
+ field: 'fromWarehouseCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '从库区类型范围',
+ field: 'fromAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- isTable: false,
- },
- {
- label: '是否可用',
- field: 'available',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isSearch: true,
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '从库区代码范围',
+ field: 'fromAreaCodes',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '到仓库代码',
+ field: 'toWarehouseCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '到库区类型范围',
+ field: 'toAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '到库区代码范围',
+ field: 'toAreaCodes',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '是否可用',
+ field: 'available',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isSearch: true,
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
}
}
- },
-]))
+ ])
+)
//表单校验
export const ProductionscrapRecordMainRules = reactive({
@@ -552,6 +602,7 @@ export const ProductionscrapRecordDetail = useCrudSchemas(reactive
table: {
width: 150
},
+ isTable:false,
hiddenInMain: true,
},
{
@@ -561,6 +612,7 @@ export const ProductionscrapRecordDetail = useCrudSchemas(reactive
table: {
width: 150
},
+ isTable:false,
hiddenInMain: true,
},
{
@@ -570,6 +622,7 @@ export const ProductionscrapRecordDetail = useCrudSchemas(reactive
table: {
width: 150
},
+ isTable:false,
hiddenInMain: true,
},
{
@@ -579,6 +632,7 @@ export const ProductionscrapRecordDetail = useCrudSchemas(reactive
table: {
width: 180
},
+ isTable:false,
hiddenInMain: true,
},
{
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
index 3bfbb2932..62e507ab1 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
@@ -1,486 +1,548 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
-import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
+import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
-import * as WorkshopApi from '@/api/wms/workshop'
+import * as WorkshopApi from '@/api/wms/workshop'
import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
-import * as ProductionlineApi from '@/api/wms/productionline'
+import * as ProductionlineApi from '@/api/wms/productionline'
import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
-import * as WorkstationApi from '@/api/wms/workstation'
+import * as WorkstationApi from '@/api/wms/workstation'
import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
-import * as BalanceApi from '@/api/wms/balance'
+import * as BalanceApi from '@/api/wms/balance'
import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
import * as ItempackagingApi from '@/api/wms/itempackage'
import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
-import * as SupplieritemApi from '@/api/wms/supplieritem'
+import * as SupplieritemApi from '@/api/wms/supplieritem'
import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
import { useUserStore } from '@/store/modules/user'
import { TableColumn } from '@/types/table'
+import * as InspectionQ3Api from '@/api/qms/inspectionQ3'
+import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data'
+
const { t } = useI18n() // 国际化
// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
const queryParams = {
- pageSize:10,
- pageNo:1,
- code:'MaterialReturnRequest'
+ pageSize: 10,
+ pageNo: 1,
+ code: 'MaterialReturnRequest'
}
- const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
- const requestsettingData =data?.list[0]||{}
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData = data?.list[0] || {}
- //console.log(34, requestsettingData)
- const userStore = useUserStore()
- const userDept = userStore.userSelfInfo.dept
- // id 转str 否则form回显匹配不到
- userDept.id = userDept.id.toString()
- const userDeptArray:any = [userDept]
+//console.log(34, requestsettingData)
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+// id 转str 否则form回显匹配不到
+userDept.id = userDept.id.toString()
+const userDeptArray: any = [userDept]
/**
* @returns {Array} 生产退料申请主表
*/
-export const ProductionscrapRequestMain = useCrudSchemas(reactive([
- {
- label: '单据号',
- field: 'number',
- sort: 'custom',
- table: {
- width: 180,
- fixed: 'left'
- },
- isForm: false,
- isSearch: true,
- },
- {
- label: '状态',
- field: 'status',
- dictType: DICT_TYPE.REQUEST_STATUS,
- dictClass: 'string',
- isSearch: true,
- isTable: true,
- isForm:false,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- value: '1',
- componentProps: {
- disabled: true
+export const ProductionscrapRequestMain = useCrudSchemas(
+ reactive([
+ {
+ label: '单据号',
+ field: 'number',
+ sort: 'custom',
+ table: {
+ width: 180,
+ fixed: 'left'
+ },
+ isForm: false,
+ isSearch: true
+ },
+ {
+ label: 'Q3通知单号',
+ field: 'q3Number',
+ sort: 'custom',
+ isSearch: false,
+ isDetail: true,
+ table: {
+ width: 150
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true,
+ // multiple: true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
+ searchField: 'number', // 查询弹窗赋值字段
+ searchTitle: 'Q3通知单号', // 查询弹窗标题
+ searchAllSchemas: Q3.allSchemas, // 查询弹窗所需类
+ searchPage: InspectionQ3Api.getQ3Page, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'status',
+ value: '0',
+ isMainValue: false
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'number',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
}
- }
- },
- {
- label: '车间',
- field: 'workshopCode',
- sort: 'custom',
- table: {
- width: 150
},
- isSearch: true,
- form: {
- // labelMessage: '信息提示说明！！！',
- componentProps: {
- enterSearch: true,
- isSearchList: true, // 开启查询弹窗
- searchListPlaceholder: '请选择车间代码', // 输入框占位文本
- searchField: 'code', // 查询弹窗赋值字段
- searchTitle: '车间信息', // 查询弹窗标题
- searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
- searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
- searchCondition:[{
- key: 'available',
- value: 'TRUE',
- isMainValue: false
- }],
- verificationParams: [{
- key: 'code',
- action: '==',
- value: '',
- isMainValue: false,
- isSearch: true,
- isFormModel: true,
- }], // 失去焦点校验参数
+ {
+ label: '状态',
+ field: 'status',
+ dictType: DICT_TYPE.REQUEST_STATUS,
+ dictClass: 'string',
+ isSearch: true,
+ isTable: true,
+ isForm: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ value: '1',
+ componentProps: {
+ disabled: true
+ }
}
},
- },
- {
- label: '生产线代码',
- field: 'productionLineCode',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '车间',
+ field: 'workshopCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isSearch: true,
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择车间代码', // 输入框占位文本
+ searchField: 'code', // 查询弹窗赋值字段
+ searchTitle: '车间信息', // 查询弹窗标题
+ searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
+ searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'code',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
+ }
},
- form: {
- // labelMessage: '信息提示说明！！！',
- componentProps: {
- enterSearch: true,
- isSearchList: true, // 开启查询弹窗
+ {
+ label: '生产线代码',
+ field: 'productionLineCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+ searchField: 'code', // 查询弹窗赋值字段
+ searchTitle: '生产线信息', // 查询弹窗标题
+ searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+ searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'workshopCode',
+ value: 'workshopCode',
+ message: '请选择车间信息！', // 当前置条件为空时 弹出信息提示
+ isMainValue: true
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'code',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
+ },
+ tableForm: {
+ isInpuFocusShow: true,
searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '生产线信息', // 查询弹窗标题
searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
- searchCondition:[{
- key: 'available',
- value: 'TRUE',
- isMainValue: false
- },{
- key: 'workshopCode',
- value: 'workshopCode',
- message: '请选择车间信息！', // 当前置条件为空时 弹出信息提示
- isMainValue: true
- }],
- verificationParams: [{
- key: 'code',
- action: '==',
- value: '',
- isMainValue: false,
- isSearch: true,
- isFormModel: true,
- }], // 失去焦点校验参数
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'workshopCode',
+ value: 'workshopCode',
+ message: '请选择车间信息！', // 当前置条件为空时 弹出信息提示
+ isMainValue: true
+ }
+ ]
}
},
- tableForm:{
- isInpuFocusShow: true,
- searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
- searchField: 'code', // 查询弹窗赋值字段
- searchTitle: '生产线信息', // 查询弹窗标题
- searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
- searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
- searchCondition:[{
- key: 'available',
- value: 'TRUE',
- isMainValue: false
- },{
- key: 'workshopCode',
- value: 'workshopCode',
- message: '请选择车间信息！', // 当前置条件为空时 弹出信息提示
- isMainValue: true
- }]
- },
- },
- {
- label: '申请时间',
- field: 'requestTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width:'100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '申请时间',
+ field: 'requestTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ },
+ isForm: false
+ },
+ {
+ label: '截止时间',
+ field: 'dueTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
},
- isForm: false,
- },
- {
- label: '截止时间',
- field: 'dueTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
+ {
+ label: '从库区类型范围',
+ field: 'fromAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isForm: false
},
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width:'100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '到库区类型范围',
+ field: 'toAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isSearch: true,
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isForm: false
+ },
+ {
+ label: '从库区代码范围',
+ field: 'fromAreaCodes',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ isForm: false
+ },
+ {
+ label: '到库区代码范围',
+ field: 'toAreaCodes',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ isForm: false
+ },
+ {
+ label: '从仓库代码',
+ field: 'fromWarehouseCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ isForm: false
+ },
+ {
+ label: '到仓库代码',
+ field: 'toWarehouseCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ isForm: false
+ },
+ {
+ label: '备注',
+ field: 'remark',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '业务类型',
+ field: 'businessType',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ isForm: false
+ },
+ {
+ label: '部门',
+ field: 'departmentCode',
+ sort: 'custom',
+ isForm: false,
+ table: {
+ width: 150
+ },
+ isTable: false,
+ formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+ return userDeptArray.find((account) => account.id == cellValue)?.name
+ },
+ form: {
+ value: userDept.id,
+ component: 'Select',
+ api: () => userDeptArray,
+ componentProps: {
+ disabled: true,
+ optionsAlias: {
+ labelField: 'name',
+ valueField: 'id'
+ }
+ }
}
},
- },
- {
- label: '从库区类型范围',
- field: 'fromAreaTypes',
- dictType: DICT_TYPE.AREA_TYPE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
- },
- isForm: false,
- },
- {
- label: '到库区类型范围',
- field: 'toAreaTypes',
- dictType: DICT_TYPE.AREA_TYPE,
- dictClass: 'string',
- isSearch: true,
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
- },
- isForm: false,
- },
- {
- label: '从库区代码范围',
- field: 'fromAreaCodes',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- isForm: false,
- },
- {
- label: '到库区代码范围',
- field: 'toAreaCodes',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- isForm: false,
- },
- {
- label: '从仓库代码',
- field: 'fromWarehouseCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- isForm: false,
- },
- {
- label: '到仓库代码',
- field: 'toWarehouseCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- isForm: false,
- },
- {
- label: '备注',
- field: 'remark',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false
- },
- {
- label: '业务类型',
- field: 'businessType',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- isForm: false,
- },
- {
- label: '部门',
- field: 'departmentCode',
- sort: 'custom',
- isForm:false,
- table: {
- width: 150
- },
- isTable: false,
- formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
- return userDeptArray.find((account) => account.id == cellValue)?.name
- },
- form: {
- value: userDept.id,
- component: 'Select',
- api: () => userDeptArray,
- componentProps: {
- disabled: true,
- optionsAlias: {
- labelField: 'name',
- valueField: 'id'
+ {
+ label: '自动提交',
+ field: 'autoCommit',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ isForm: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: requestsettingData.autoCommit,
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE',
+ disabled: true
}
}
- }
- },
- {
- label: '自动提交',
- field: 'autoCommit',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- isForm:false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: requestsettingData.autoCommit,
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE',
- disabled: true,
+ {
+ label: '自动通过',
+ field: 'autoAgree',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ isForm: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: requestsettingData.autoAgree,
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE',
+ disabled: true
+ }
}
- }
- },
- {
- label: '自动通过',
- field: 'autoAgree',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- isForm:false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: requestsettingData.autoAgree,
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE',
- disabled: true,
+ {
+ label: '自动执行',
+ field: 'autoExecute',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ isForm: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: requestsettingData.autoExecute,
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE',
+ disabled: true
+ }
}
- }
- },
- {
- label: '自动执行',
- field: 'autoExecute',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- isForm:false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: requestsettingData.autoExecute,
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE',
- disabled: true,
+ {
+ label: '直接生成记录',
+ field: 'directCreateRecord',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isForm: false,
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: requestsettingData.directCreateRecord,
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE',
+ disabled: true
+ }
}
- }
- },
- {
- label: '直接生成记录',
- field: 'directCreateRecord',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isForm: false,
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: requestsettingData.directCreateRecord,
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE',
- disabled: true,
- }
+ {
+ label: '创建时间',
+ field: 'createTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ },
+ isTable: false,
+ isForm: false
+ },
+ {
+ label: '创建者',
+ field: 'creator',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ isForm: false
+ },
+ {
+ label: '最后更新时间',
+ field: 'updateTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ },
+ isForm: false
+ },
+ {
+ label: '最后更新者',
+ field: 'updater',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ isForm: false
+ },
+ {
+ label: '操作',
+ field: 'action',
+ isDetail: false,
+ isForm: false,
+ table: {
+ width: 300,
+ fixed: 'right'
+ },
+ isTable: false
}
- },
- {
- label: '创建时间',
- field: 'createTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width:'100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
- }
- },
- isTable: false,
- isForm: false
- },
- {
- label: '创建者',
- field: 'creator',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- isForm: false
- },
- {
- label: '最后更新时间',
- field: 'updateTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width:'100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
- }
- },
- isForm: false
- },
- {
- label: '最后更新者',
- field: 'updater',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- isForm: false
- },
- {
- label: '操作',
- field: 'action',
- isDetail: false,
- isForm: false,
- table: {
- width: 300,
- fixed: 'right'
- },
- isTable: false,
- }
-]))
+ ])
+)
//表单校验
export const ProductionscrapRequestMainRules = reactive({
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
index 1b92ac602..a0398bac6 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
@@ -43,7 +43,7 @@
{
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
@@ -627,7 +627,7 @@ const handleImport = () => {
// 导入附件弹窗所需的参数
const importTemplateData = reactive({
templateUrl: '',
- templateTitle: '制品收货申请主导入模版.xlsx'
+ templateTitle: '隔离报工申请导入模版.xlsx'
})
// 导入成功之后
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
index 1181e21ae..a21f40e59 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
@@ -134,6 +134,74 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([
}
}
},
+ {
+ label: '生产线代码',
+ field: 'productionLineCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm:{
+ disabled:true,
+ multiple: true,
+ // isInpuFocusShow: true,
+ searchListPlaceholder: '请选择生产线代码',
+ searchField: 'code',
+ searchTitle: '生产线信息',
+ searchAllSchemas: Productionline.allSchemas,
+ searchPage: ProductionlineApi.getProductionlinePage,
+ searchCondition: [{
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },{
+ key: 'workshopCode',
+ value: 'workshopCode',
+ message: '请填写车间代码！',
+ isMainValue: true
+ }],
+ verificationPage: ProductionlineApi.getProductionlineByCodes, // 校验数去焦点输入是否正确的方法
+ isShowTableFormSearch: true,
+ verificationParams: [{
+ key: 'code',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true,
+ }], // 失去焦点校验参数
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch:true,
+ isSearchList: true,
+ searchListPlaceholder: '请选择生产线代码',
+ searchField: 'code',
+ searchTitle: '生产线信息',
+ searchAllSchemas: Productionline.allSchemas,
+ searchPage: ProductionlineApi.getProductionlinePage,
+ searchCondition: [{
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },{
+ key: 'workshopCode',
+ value: 'workshopCode',
+ message: '请填写车间代码！',
+ isMainValue: true
+ }],
+ verificationParams: [{
+ key: 'code',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true,
+ }], // 失去焦点校验参数
+ }
+ }
+ },
{
label: '班组',
field: 'team',
@@ -521,6 +589,9 @@ export const ProductreceiptRequestMainRules = reactive({
// shift: [
// { required: true, message: '请选择班次代码', trigger: 'change' }
// ],
+ productionLineCode: [
+ { required: true, message: '请选择生产线代码', trigger: 'change' }
+ ],
dueTime: [
{ required: true, message: '请选择截止时间', trigger: 'blur' }
],
@@ -552,6 +623,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive
table: {
width: 150
},
+ isTableForm: false,
tableForm:{
disabled:true,
multiple: true,
diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
index e797d3192..e9b7dabd9 100644
--- a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
@@ -240,6 +240,8 @@ export const ProductredressJobMain = useCrudSchemas(reactive([
{
label: '从库区类型范围',
field: 'fromAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
sort: 'custom',
isForm:false,
isTable:false,
@@ -247,6 +249,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive([
{
label: '到库区类型范围',
field: 'toAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
sort: 'custom',
isForm:false,
isTable:false,
@@ -358,6 +361,8 @@ export const ProductredressJobMain = useCrudSchemas(reactive([
{
label: '入库库存状态范围',
field: 'inInventoryStatuses',
+ dictType: DICT_TYPE.INVENTORY_STATUS,
+ dictClass: 'string',
sort: 'custom',
isForm:false,
isTable:false,
@@ -365,6 +370,8 @@ export const ProductredressJobMain = useCrudSchemas(reactive([
{
label: '出库库存状态范围',
field: 'outInventoryStatuses',
+ dictType: DICT_TYPE.INVENTORY_STATUS,
+ dictClass: 'string',
sort: 'custom',
isForm:false,
isTable:false,
diff --git a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
index 43672b0b5..d1919b684 100644
--- a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
@@ -143,6 +143,8 @@ export const ProductredressRecordMain = useCrudSchemas(reactive([
{
label: '是否可用',
field: 'available',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
sort: 'custom',
isForm:false,
isTable:false
@@ -249,6 +251,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive([
{
label: '到库区类型范围',
field: 'toAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
sort: 'custom',
table: {
width: 150
diff --git a/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts
index 957602e4f..7238ce579 100644
--- a/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts
@@ -1,506 +1,556 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
+import * as InspectionQ3Api from '@/api/qms/inspectionQ3'
+import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data'
+
/**
* @returns {Array} 制品报废任务主表
*/
-export const ProductscrapJobMain = useCrudSchemas(reactive([
- {
- label: '单据号',
- field: 'number',
- sort: 'custom',
- table: {
- width: 180,
- fixed: 'left'
- },
- isSearch: true,
- },
- {
- label: '申请单号',
- field: 'requestNumber',
- sort: 'custom',
- table: {
- width: 180
- },
- isSearch: true,
- },
- {
- label: '从仓库代码',
- field: 'fromWarehouseCode',
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '申请时间',
- field: 'requestTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+export const ProductscrapJobMain = useCrudSchemas(
+ reactive([
+ {
+ label: '单据号',
+ field: 'number',
+ sort: 'custom',
+ table: {
+ width: 180,
+ fixed: 'left'
+ },
+ isSearch: true
+ },
+ {
+ label: '申请单号',
+ field: 'requestNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isSearch: true
+ },
+ {
+ label: 'Q3通知单号',
+ field: 'q3Number',
+ sort: 'custom',
+ isSearch: false,
+ isDetail: true,
+ table: {
+ width: 150
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true,
+ // multiple: true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
+ searchField: 'number', // 查询弹窗赋值字段
+ searchTitle: 'Q3通知单号', // 查询弹窗标题
+ searchAllSchemas: Q3.allSchemas, // 查询弹窗所需类
+ searchPage: InspectionQ3Api.getQ3Page, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'status',
+ value: '0',
+ isMainValue: false
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'number',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
}
},
- },
- {
- label: '要求截止时间',
- field: 'requestDueTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '从仓库代码',
+ field: 'fromWarehouseCode',
+ sort: 'custom',
+ table: {
+ width: 150
}
},
- },
- {
- label: '状态',
- field: 'status',
- dictType: DICT_TYPE.JOB_STATUS,
- dictClass: 'string',
- isSearch: true,
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '过期时间',
- field: 'expiredTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '申请时间',
+ field: 'requestTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
},
- },
- {
- label: '最后更新时间',
- field: 'updateTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '要求截止时间',
+ field: 'requestDueTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
},
- },
- {
- label: '最后更新者',
- field: 'updater',
- sort: 'custom',
- table: {
- width: 150
- },
- },
- // {
- // label: '状态',
- // field: 'jobStageStatus',
- // sort: 'custom',
- // table: {
- // width: 150
- // },
- // },
- {
- label: '优先级',
- field: 'priority',
- form: {
- component: 'InputNumber',
- },
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '优先级增量',
- field: 'priorityIncrement',
- form: {
- component: 'InputNumber',
- },
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '部门',
- field: 'departmentCode',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '状态',
+ field: 'status',
+ dictType: DICT_TYPE.JOB_STATUS,
+ dictClass: 'string',
+ isSearch: true,
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- },
- {
- label: '承接人',
- field: 'acceptUserId',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '过期时间',
+ field: 'expiredTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- },
- {
- label: '承接时间',
- field: 'acceptTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ {
+ label: '最后更新时间',
+ field: 'updateTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- sort: 'custom',
- table: {
- width: 180
+ {
+ label: '最后更新者',
+ field: 'updater',
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ // {
+ // label: '状态',
+ // field: 'jobStageStatus',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
+ {
+ label: '优先级',
+ field: 'priority',
+ form: {
+ component: 'InputNumber'
+ },
+ sort: 'custom',
+ table: {
+ width: 150
}
},
- },
- {
- label: '完成人',
- field: 'completeUserId',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '优先级增量',
+ field: 'priorityIncrement',
+ form: {
+ component: 'InputNumber'
+ },
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- },
- {
- label: '完成时间',
- field: 'completeTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ {
+ label: '部门',
+ field: 'departmentCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- sort: 'custom',
- table: {
- width: 180
+ {
+ label: '承接人',
+ field: 'acceptUserId',
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '承接时间',
+ field: 'acceptTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
},
- },
- {
- label: '从库区类型范围',
- field: 'fromAreaTypes',
- dictType: DICT_TYPE.AREA_TYPE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '完成人',
+ field: 'completeUserId',
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- },
- {
- label: '到库区类型范围',
- field: 'toAreaTypes',
- dictType: DICT_TYPE.AREA_TYPE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '完成时间',
+ field: 'completeTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- },
- {
- label: '业务类型',
- field: 'businessType',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '从库区类型范围',
+ field: 'fromAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- },
- {
- label: '备注',
- field: 'remark',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '到库区类型范围',
+ field: 'toAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- },
- {
- label: '创建时间',
- field: 'createTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ {
+ label: '业务类型',
+ field: 'businessType',
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- sort: 'custom',
- table: {
- width: 180
+ {
+ label: '备注',
+ field: 'remark',
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '创建时间',
+ field: 'createTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
},
- },
- {
- label: '创建者',
- field: 'creator',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '创建者',
+ field: 'creator',
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- },
- {
- label: '从库区代码范围',
- field: 'fromAreaCodes',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '从库区代码范围',
+ field: 'fromAreaCodes',
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- },
- {
- label: '自动完成',
- field: 'autoComplete',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '自动完成',
+ field: 'autoComplete',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
+ }
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '允许修改库位',
+ field: 'allowModifyLocation',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
}
- }
- },
- {
- label: '允许修改库位',
- field: 'allowModifyLocation',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '允许修改数量',
+ field: 'allowModifyQty',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
}
- }
- },
- {
- label: '允许修改数量',
- field: 'allowModifyQty',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '允许大于推荐数量',
+ field: 'allowBiggerQty',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
}
- }
- },
- {
- label: '允许大于推荐数量',
- field: 'allowBiggerQty',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '允许小于推荐数量',
+ field: 'allowSmallerQty',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
}
- }
- },
- {
- label: '允许小于推荐数量',
- field: 'allowSmallerQty',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '允许修改库存状态',
+ field: 'allowModifyInventoryStatus',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
}
- }
- },
- {
- label: '允许修改库存状态',
- field: 'allowModifyInventoryStatus',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '允许连续扫描',
+ field: 'allowContinuousScanning',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
}
- }
- },
- {
- label: '允许连续扫描',
- field: 'allowContinuousScanning',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '允许部分完成',
+ field: 'allowPartialComplete',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
}
- }
- },
- {
- label: '允许部分完成',
- field: 'allowPartialComplete',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '允许修改批次',
+ field: 'allowModifyBatch',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
}
- }
- },
- {
- label: '允许修改批次',
- field: 'allowModifyBatch',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '允许修改箱码',
+ field: 'allowModifyPackingNumber',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
}
- }
- },
- {
- label: '允许修改箱码',
- field: 'allowModifyPackingNumber',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '操作',
+ field: 'action',
+ isDetail: false,
+ isForm: false,
+ table: {
+ width: 120,
+ fixed: 'right'
}
}
- },
- {
- label: '操作',
- field: 'action',
- isDetail: false,
- isForm: false,
- table: {
- width: 120,
- fixed: 'right'
- },
- }
-]))
+ ])
+)
//表单校验
export const ProductscrapJobMainRules = reactive({
diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
index 7685a6bda..fe3d913bd 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
@@ -1,348 +1,397 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
+import * as InspectionQ3Api from '@/api/qms/inspectionQ3'
+import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data'
/**
* @returns {Array} 制品报废记录主表
*/
-export const ProductscrapRecordMain = useCrudSchemas(reactive([
- {
- label: '单据号',
- field: 'number',
- sort: 'custom',
- table: {
- width: 180,
- fixed: 'left'
- },
- isSearch: true
- },
- {
- label: '申请单号',
- field: 'requestNumber',
- sort: 'custom',
- table: {
- width: 180
- },
- isSearch: true
- },
- {
- label: '状态',
- field: 'status',
- dictType: DICT_TYPE.REQUEST_STATUS,
- dictClass: 'string',
- isForm:false,
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '车间',
- field: 'workshopCode',
- sort: 'custom',
- table: {
- width: 150
- }
- },
- {
- label: '生产线',
- field: 'productionLineCode',
- sort: 'custom',
- table: {
- width: 150
- }
- },
- {
- label: '班组',
- field: 'team',
- sort: 'custom',
- table: {
- width: 150
- }
- },
- {
- label: '班次',
- field: 'shift',
- sort: 'custom',
- table: {
- width: 150
- }
- },
- {
- label: '任务单号',
- field: 'jobNumber',
- sort: 'custom',
- table: {
- width: 180,
- show:false
- },
- isTable: false,
- },
- {
- label: '出库事务类型',
- field: 'outTransactionType',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '入库事务类型',
- field: 'inTransactionType',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '执行时间',
- field: 'executeTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+export const ProductscrapRecordMain = useCrudSchemas(
+ reactive([
+ {
+ label: '单据号',
+ field: 'number',
+ sort: 'custom',
+ table: {
+ width: 180,
+ fixed: 'left'
+ },
+ isSearch: true
+ },
+ {
+ label: '申请单号',
+ field: 'requestNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isSearch: true
+ },
+ {
+ label: 'Q3通知单号',
+ field: 'q3Number',
+ sort: 'custom',
+ isSearch: false,
+ isDetail: true,
+ table: {
+ width: 150
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true,
+ // multiple: true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
+ searchField: 'number', // 查询弹窗赋值字段
+ searchTitle: 'Q3通知单号', // 查询弹窗标题
+ searchAllSchemas: Q3.allSchemas, // 查询弹窗所需类
+ searchPage: InspectionQ3Api.getQ3Page, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'status',
+ value: '0',
+ isMainValue: false
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'number',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
}
},
- },
- {
- label: '生效日期',
- field: 'activeDate',
- formatter: dateFormatter2,
- detail: {
- dateFormat: 'YYYY-MM-DD'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width: '100%'},
- type: 'date',
- dateFormat: 'YYYY-MM-DD',
- valueFormat: 'x',
+ {
+ label: '状态',
+ field: 'status',
+ dictType: DICT_TYPE.REQUEST_STATUS,
+ dictClass: 'string',
+ isForm: false,
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
}
},
- },
- {
- label: '申请时间',
- field: 'requestTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '车间',
+ field: 'workshopCode',
+ sort: 'custom',
+ table: {
+ width: 150
}
},
- },
- {
- label: '截止时间',
- field: 'dueTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '生产线',
+ field: 'productionLineCode',
+ sort: 'custom',
+ table: {
+ width: 150
}
},
- },
- {
- label: '部门',
- field: 'departmentCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '接口类型',
- field: 'interfaceType',
- dictType: DICT_TYPE.INTERFACE_TYPE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '业务类型',
- field: 'businessType',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '备注',
- field: 'remark',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '班组',
+ field: 'team',
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- isTable: false,
- },
- {
- label: '创建者',
- field: 'creator',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '班次',
+ field: 'shift',
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- isTable: true,
- },
- {
- label: '创建时间',
- field: 'createTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ {
+ label: '任务单号',
+ field: 'jobNumber',
+ sort: 'custom',
+ table: {
+ width: 180,
+ show: false
+ },
+ isTable: false
+ },
+ {
+ label: '出库事务类型',
+ field: 'outTransactionType',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '入库事务类型',
+ field: 'inTransactionType',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '执行时间',
+ field: 'executeTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- sort: 'custom',
- table: {
- width: 180
+ {
+ label: '生效日期',
+ field: 'activeDate',
+ formatter: dateFormatter2,
+ detail: {
+ dateFormat: 'YYYY-MM-DD'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'date',
+ dateFormat: 'YYYY-MM-DD',
+ valueFormat: 'x'
+ }
+ }
},
- isTable: true,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '申请时间',
+ field: 'requestTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
},
- },
- {
- label: '最后更新时间',
- field: 'updateTime',
- sort: 'custom',
- isDetail: true,
- isForm: false,
- isTable: false,
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ {
+ label: '截止时间',
+ field: 'dueTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- table: {
- width: 180
+ {
+ label: '部门',
+ field: 'departmentCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '接口类型',
+ field: 'interfaceType',
+ dictType: DICT_TYPE.INTERFACE_TYPE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width:'100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '业务类型',
+ field: 'businessType',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '备注',
+ field: 'remark',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '创建者',
+ field: 'creator',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: true
+ },
+ {
+ label: '创建时间',
+ field: 'createTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: true,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
- }
- },
- {
- label: '最后更新者',
- field: 'updater',
- isDetail: true,
- isForm: false,
- isTable: false,
- table: {
- width: 150
- }
- },
- // {
- // label: '代码',
- // field: 'code',
- // sort: 'custom',
- // table: {
- // width: 150
- // },
- // },
- {
- label: '从仓库代码',
- field: 'fromWarehouseCode',
- sort: 'custom',
- table: {
- width: 150,
- show: false
},
- isTable: false,
- },
- {
- label: '从库区类型范围',
- field: 'fromAreaTypes',
- dictType: DICT_TYPE.AREA_TYPE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '最后更新时间',
+ field: 'updateTime',
+ sort: 'custom',
+ isDetail: true,
+ isForm: false,
+ isTable: false,
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- },
- {
- label: '从库区代码范围',
- field: 'fromAreaCodes',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '最后更新者',
+ field: 'updater',
+ isDetail: true,
+ isForm: false,
+ isTable: false,
+ table: {
+ width: 150
+ }
},
- isTable: false,
- },
- {
- label: '是否可用',
- field: 'available',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isSearch: true,
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
+ // {
+ // label: '代码',
+ // field: 'code',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
+ {
+ label: '从仓库代码',
+ field: 'fromWarehouseCode',
+ sort: 'custom',
+ table: {
+ width: 150,
+ show: false
+ },
+ isTable: false
+ },
+ {
+ label: '从库区类型范围',
+ field: 'fromAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '从库区代码范围',
+ field: 'fromAreaCodes',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '是否可用',
+ field: 'available',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isSearch: true,
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
}
}
- },
-]))
+ ])
+)
//表单校验
export const ProductscrapRecordMainRules = reactive({
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index 6f4d808c1..310ab5d88 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -97,6 +97,8 @@
@searchTableSuccess="searchTableBomSuccess"
:footButttondata="footButttondata"
@footButtonClick="buttonBaseClickBom"
+ @inputNumberChange="inputNumberChange"
+
/>
@@ -229,13 +231,18 @@ const banchBomPage = async (fromLocationCode,item) => {
}
// 新增 tableform 按钮
-const buttonOperationClick = async (row, label, index)=> {
+const buttonOperationClick = async (row, label, index,isSave = false)=> {
+ console.log('buttonOperationClick',row, label, index)
if (row.itemCode == '') {
- message.warning('请选择物料代码！')
+ if(!isSave){
+ message.warning('请选择物料代码！')
+ }
return
}
if(row.qty <= 0){
- message.warning('数量需要大于0！')
+ if(!isSave){
+ message.warning('数量需要大于0！')
+ }
return
}
detatableDataBom.params.itemCode = row.itemCode
@@ -244,7 +251,7 @@ const buttonOperationClick = async (row, label, index)=> {
bomModelVisible.value = true
await getDetailListBom()
console.log(row.fromLocationCode);
- detatableDataBom.tableList.forEach(async item => {
+ detatableDataBom.tableList.forEach(async (item) => {
console.log(333,item)
ProdcutscrapBomScrap.allSchemas.tableFormColumns.map((bomItem) => {
if (bomItem.field == 'batch') {
@@ -277,7 +284,11 @@ const buttonOperationClick = async (row, label, index)=> {
const obj = await banchBomPage(row.fromLocationCode, item)
item.batch = obj.batch
})
- detailBomRef.value.open('create', row, null,'viewDetail')//查看明细数据
+ if(isSave){
+ buttonBaseClickBom('save')
+ }else{
+ detailBomRef.value.open('create', row, null,'viewDetail')//查看明细数据
+ }
}
// 查询页面返回
@@ -358,10 +369,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
console.log(res)
if(res?.list?.length>0){
row['bomVersion'] = res.list[0].version
+ buttonOperationClick(row,'Bom',tableData.value.indexOf(row),true)
}
})
}else if(formField == 'bomVersion'){
row['bomVersion'] = val[0]['version']
+ buttonOperationClick(row,'Bom',tableData.value.indexOf(row),true)
+
} else {
row[formField] = val[0][searchField]
}
@@ -699,12 +713,14 @@ const submitForm = async (formType, submitData) => {
if(data.masterId){
data.id = data.masterId
}
+
+ console.log('tableData.value',tableData.value)
data.subList = tableData.value // 拼接子表数据参数
// 判断 bom 是否添加
let childListRs = true
// 根据 填写的数量 为基准 不填写数量的忽略
tableData.value.forEach((item) => {
- if (!item.childList) {
+ if (!item.childList||item.childList.length==0) {
childListRs = false
}
item.productionLineCode = data.productionLineCode
@@ -763,6 +779,9 @@ const inputNumberChange = (field, index, row, val) => {
if(field == 'qty' || field == 'singlePrice'){
row.amount = row.qty * row.singlePrice
}
+ if(field == 'qty'){
+ buttonOperationClick(row,'Bom',index,true)
+ }
}
const qtyOnChange = (field,val) =>{
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index 33d66900f..ea7e4fc5b 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -1,541 +1,608 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
-import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
+import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
import * as BalanceApi from '@/api/wms/balance'
import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
-import {Workshop} from "@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data";
-import * as WorkshopApi from "@/api/wms/workshop";
-import {Team} from "@/views/wms/basicDataManage/orderManage/team/team.data";
-import * as TeamApi from "@/api/wms/team";
-import {Shift} from "@/views/wms/basicDataManage/orderManage/shift/shift.data";
-import * as ShiftApi from "@/api/wms/shift";
-import {
- Productionline
-} from "@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data";
-import * as ProductionlineApi from "@/api/wms/productionline";
-import {
- Workstation
-} from "@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data";
-import * as WorkstationApi from "@/api/wms/workstation";
-import {Process} from "@/views/wms/basicDataManage/factoryModeling/process/process.data";
-import * as ProcessApi from "@/api/wms/process";
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data'
+import * as TeamApi from '@/api/wms/team'
+import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
+import * as ShiftApi from '@/api/wms/shift'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+import * as ProductionlineApi from '@/api/wms/productionline'
+import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
+import * as WorkstationApi from '@/api/wms/workstation'
+import { Process } from '@/views/wms/basicDataManage/factoryModeling/process/process.data'
+import * as ProcessApi from '@/api/wms/process'
import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
-import {Bom} from "@/views/wms/basicDataManage/itemManage/bom/bom.data";
-import * as BomApi from "@/api/wms/bom";
+import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
+import * as BomApi from '@/api/wms/bom'
+
+import * as InspectionQ3Api from '@/api/qms/inspectionQ3'
+import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data'
const { t } = useI18n() // 国际化
// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
const queryParams = {
- pageSize:10,
- pageNo:1,
- code:'ProductScrapRequest'
+ pageSize: 10,
+ pageNo: 1,
+ code: 'ProductScrapRequest'
}
- const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
- const requestsettingData =data?.list[0]||{}
-
- // 获取当前操作人的部门
- import { useUserStore } from '@/store/modules/user'
- import { TableColumn } from '@/types/table'
- const userStore = useUserStore()
- const userDept = userStore.userSelfInfo.dept
- // id 转str 否则form回显匹配不到
- userDept.id = userDept.id.toString()
- const userDeptArray:any = [userDept]
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData = data?.list[0] || {}
+// 获取当前操作人的部门
+import { useUserStore } from '@/store/modules/user'
+import { TableColumn } from '@/types/table'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+// id 转str 否则form回显匹配不到
+userDept.id = userDept.id.toString()
+const userDeptArray: any = [userDept]
/**
* @returns {Array} 制品报废申请主表
*/
-export const ProductscrapRequestMain = useCrudSchemas(reactive([
- {
- label: '单据号',
- field: 'number',
- sort: 'custom',
- table: {
- width: 180,
- fixed: 'left'
- },
- isForm: false,
- isSearch: true,
- },
- {
- label: '状态',
- field: 'status',
- dictType: DICT_TYPE.REQUEST_STATUS,
- dictClass: 'string',
- isSearch: true,
- isForm:false,
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- value: '1',
- componentProps: {
- disabled: true
+export const ProductscrapRequestMain = useCrudSchemas(
+ reactive([
+ {
+ label: '单据号',
+ field: 'number',
+ sort: 'custom',
+ table: {
+ width: 180,
+ fixed: 'left'
+ },
+ isForm: false,
+ isSearch: true
+ },
+ {
+ label: 'Q3通知单号',
+ field: 'q3Number',
+ sort: 'custom',
+ isSearch: false,
+ isDetail: true,
+ table: {
+ width: 150
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true,
+ // multiple: true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
+ searchField: 'number', // 查询弹窗赋值字段
+ searchTitle: 'Q3通知单号', // 查询弹窗标题
+ searchAllSchemas: Q3.allSchemas, // 查询弹窗所需类
+ searchPage: InspectionQ3Api.getQ3Page, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'status',
+ value: '0',
+ isMainValue: false
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'number',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
}
- }
- },
- {
- label: '车间',
- field: 'workshopCode',
- sort: 'custom',
- table: {
- width: 150
},
- isSearch: true,
- form: {
- // labelMessage: '信息提示说明！！！',
- componentProps: {
- enterSearch: true,
- isSearchList: true,
- searchListPlaceholder: '请选择车间',
- searchField: 'code',
- searchTitle: '车间信息',
- searchAllSchemas: Workshop.allSchemas,
- searchPage: WorkshopApi.getWorkshopPage,
- searchCondition: [{
- key: 'available',
- value: 'TRUE',
- isMainValue: false
- }],
- verificationParams: [{
- key: 'code',
- action: '==',
- value: '',
- isMainValue: false,
- isSearch: true,
- isFormModel: true,
- }], // 失去焦点校验参数
+ {
+ label: '状态',
+ field: 'status',
+ dictType: DICT_TYPE.REQUEST_STATUS,
+ dictClass: 'string',
+ isSearch: true,
+ isForm: false,
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ value: '1',
+ componentProps: {
+ disabled: true
+ }
}
- }
- },
- {
- label: '生产线',
- field: 'productionLineCode',
- sort: 'custom',
- table: {
- width: 150
},
- tableForm: {
- enterSearch: true,
- isInpuFocusShow: true,
- searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
- searchField: 'code', // 查询弹窗赋值字段
- searchTitle: '生产线信息', // 查询弹窗标题
- searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
- searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
- searchCondition: [{
- key: 'available',
- value: 'TRUE',
- isMainValue: false
- },{
- key: 'workshopCode',
- value: 'workshopCode',
- message: '请填写车间代码！',
- isMainValue: true
- }],
- verificationParams: [{
- key: 'code',
- action: '==',
- value: '',
- isMainValue: false,
- isSearch: true,
- isFormModel: true,
- }], // 失去焦点校验参数
+ {
+ label: '车间',
+ field: 'workshopCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isSearch: true,
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true,
+ isSearchList: true,
+ searchListPlaceholder: '请选择车间',
+ searchField: 'code',
+ searchTitle: '车间信息',
+ searchAllSchemas: Workshop.allSchemas,
+ searchPage: WorkshopApi.getWorkshopPage,
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'code',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
+ }
},
- form: {
- // labelMessage: '信息提示说明！！！',
- componentProps: {
+ {
+ label: '生产线',
+ field: 'productionLineCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm: {
enterSearch: true,
- isSearchList: true, // 开启查询弹窗
+ isInpuFocusShow: true,
searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '生产线信息', // 查询弹窗标题
searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
- searchCondition: [{
- key: 'available',
- value: 'TRUE',
- isMainValue: false
- },{
- key: 'workshopCode',
- value: 'workshopCode',
- message: '请填写车间代码！',
- isMainValue: true
- }],
- verificationParams: [{
- key: 'code',
- action: '==',
- value: '',
- isMainValue: false,
- isSearch: true,
- isFormModel: true,
- }], // 失去焦点校验参数
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'workshopCode',
+ value: 'workshopCode',
+ message: '请填写车间代码！',
+ isMainValue: true
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'code',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+ searchField: 'code', // 查询弹窗赋值字段
+ searchTitle: '生产线信息', // 查询弹窗标题
+ searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+ searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'workshopCode',
+ value: 'workshopCode',
+ message: '请填写车间代码！',
+ isMainValue: true
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'code',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
}
- }
- },
- {
- label: '班组',
- field: 'team',
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- // labelMessage: '信息提示说明！！！',
- componentProps: {
- enterSearch: true,
- isSearchList: true,
- searchListPlaceholder: '请选择班组',
- searchField: 'code',
- searchTitle: '班组信息',
- searchAllSchemas: Team.allSchemas,
- searchPage: TeamApi.getTeamPage,
- searchCondition: [{
- key: 'available',
- value: 'TRUE',
- isMainValue: false
- }],
- verificationParams: [{
- key: 'code',
- action: '==',
- value: '',
- isMainValue: false,
- isSearch: true,
- isFormModel: true,
- }], // 失去焦点校验参数
+ {
+ label: '班组',
+ field: 'team',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true,
+ isSearchList: true,
+ searchListPlaceholder: '请选择班组',
+ searchField: 'code',
+ searchTitle: '班组信息',
+ searchAllSchemas: Team.allSchemas,
+ searchPage: TeamApi.getTeamPage,
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'code',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
}
- }
- },
- {
- label: '班次',
- field: 'shift',
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- // labelMessage: '信息提示说明！！！',
- componentProps: {
- enterSearch: true,
- isSearchList: true,
- searchListPlaceholder: '请选择班次',
- searchField: 'code',
- searchTitle: '班次信息',
- searchAllSchemas: Shift.allSchemas,
- searchPage: ShiftApi.getShiftPage,
- searchCondition: [{
- key: 'available',
- value: 'TRUE',
- isMainValue: false
- }],
- verificationParams: [{
- key: 'code',
- action: '==',
- value: '',
- isMainValue: false,
- isSearch: true,
- isFormModel: true,
- }], // 失去焦点校验参数
+ {
+ label: '班次',
+ field: 'shift',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true,
+ isSearchList: true,
+ searchListPlaceholder: '请选择班次',
+ searchField: 'code',
+ searchTitle: '班次信息',
+ searchAllSchemas: Shift.allSchemas,
+ searchPage: ShiftApi.getShiftPage,
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'code',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
}
- }
- },
- {
- label: '从仓库代码',
- field: 'fromWarehouseCode',
- sort: 'custom',
- table: {
- width: 150,
- show: false
- },
- isForm: false,
- isTable: false
- },
- {
- label: '从库区类型范围',
- field: 'fromAreaTypes',
- dictType: DICT_TYPE.AREA_TYPE,
- dictClass: 'string',
- isTable:false,
- sort: 'custom',
- table: {
- width: 150
},
- isForm: false,
- },
- {
- label: '从库区代码范围',
- field: 'fromAreaCodes',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable:false,
- isSearch: true,
- isForm: false,
- },
- {
- label: '业务类型',
- field: 'businessType',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable:false,
- form: {
- value: 'ProductScrap',
- componentProps: {
- disabled: true
- }
+ {
+ label: '从仓库代码',
+ field: 'fromWarehouseCode',
+ sort: 'custom',
+ table: {
+ width: 150,
+ show: false
+ },
+ isForm: false,
+ isTable: false
+ },
+ {
+ label: '从库区类型范围',
+ field: 'fromAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isForm: false
+ },
+ {
+ label: '从库区代码范围',
+ field: 'fromAreaCodes',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ isSearch: true,
+ isForm: false
+ },
+ {
+ label: '业务类型',
+ field: 'businessType',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ form: {
+ value: 'ProductScrap',
+ componentProps: {
+ disabled: true
+ }
+ },
+ isForm: false
},
- isForm: false,
- },
- {
- label: '创建时间',
- field: 'createTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable:false,
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width:'100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
- }
- },
- isForm: false,
- },
- {
- label: '创建者',
- field: 'creator',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable:false,
- isForm: false,
- },
- {
- label: '申请时间',
- field: 'requestTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- isTable:false,
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width:'100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
- }
- },
- isForm: false,
- },
- // {
- // label: '截止时间',
- // field: 'dueTime',
- // formatter: dateFormatter,
- // detail: {
- // dateFormat: 'YYYY-MM-DD HH:mm:ss'
- // },
- // sort: 'custom',
- // table: {
- // width: 180
- // },
- // isTable:false,
- // form: {
- // component: 'DatePicker',
- // componentProps: {
- // style: {width:'100%'},
- // type: 'datetime',
- // dateFormat: 'YYYY-MM-DD HH:mm:ss',
- // valueFormat: 'x',
- // }
- // },
- // },
- // {
- // label: '备注',
- // field: 'remark',
- // sort: 'custom',
- // table: {
- // width: 150
- // },
- // isTable: false,
- // },
- {
- label: '部门',
- field: 'departmentCode',
- sort: 'custom',
- isForm:false,
- table: {
- width: 150
- },
- isTable:false,
- formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
- return userDeptArray.find((account) => account.id == cellValue)?.name
- },
- form: {
- value: userDept.id,
- component: 'Select',
- api: () => userDeptArray,
- componentProps: {
- disabled: true,
- optionsAlias: {
- labelField: 'name',
- valueField: 'id'
+ {
+ label: '创建时间',
+ field: 'createTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ },
+ isForm: false
+ },
+ {
+ label: '创建者',
+ field: 'creator',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ isForm: false
+ },
+ {
+ label: '申请时间',
+ field: 'requestTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ },
+ isForm: false
+ },
+ // {
+ // label: '截止时间',
+ // field: 'dueTime',
+ // formatter: dateFormatter,
+ // detail: {
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ // },
+ // sort: 'custom',
+ // table: {
+ // width: 180
+ // },
+ // isTable:false,
+ // form: {
+ // component: 'DatePicker',
+ // componentProps: {
+ // style: {width:'100%'},
+ // type: 'datetime',
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ // valueFormat: 'x',
+ // }
+ // },
+ // },
+ // {
+ // label: '备注',
+ // field: 'remark',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTable: false,
+ // },
+ {
+ label: '部门',
+ field: 'departmentCode',
+ sort: 'custom',
+ isForm: false,
+ table: {
+ width: 150
+ },
+ isTable: false,
+ formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+ return userDeptArray.find((account) => account.id == cellValue)?.name
+ },
+ form: {
+ value: userDept.id,
+ component: 'Select',
+ api: () => userDeptArray,
+ componentProps: {
+ disabled: true,
+ optionsAlias: {
+ labelField: 'name',
+ valueField: 'id'
+ }
}
}
- }
- },
- {
- label: '最后更新时间',
- field: 'updateTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
- sort: 'custom',
- table: {
- width: 180
- },
- isTable:false,
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width:'100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '最后更新时间',
+ field: 'updateTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ },
+ isForm: false
+ },
+ {
+ label: '最后更新者',
+ field: 'updater',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ isForm: false
+ },
+ {
+ label: '自动提交',
+ field: 'autoCommit',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ isForm: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: requestsettingData.autoCommit,
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE',
+ disabled: true
+ }
}
},
- isForm: false
- },
- {
- label: '最后更新者',
- field: 'updater',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable:false,
- isForm: false
- },
- {
- label: '自动提交',
- field: 'autoCommit',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable:false,
- isForm:false,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'Switch',
- value: requestsettingData.autoCommit,
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE',
- disabled: true
+ {
+ label: '自动通过',
+ field: 'autoAgree',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ isForm: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: requestsettingData.autoAgree,
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE',
+ disabled: true
+ }
}
- }
- },
- {
- label: '自动通过',
- field: 'autoAgree',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable:false,
- isForm:false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: requestsettingData.autoAgree,
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE',
- disabled: true
+ {
+ label: '自动执行',
+ field: 'autoExecute',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ isForm: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: requestsettingData.autoExecute,
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE',
+ disabled: true
+ }
}
- }
- },
- {
- label: '自动执行',
- field: 'autoExecute',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable:false,
- isForm:false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: requestsettingData.autoExecute,
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE',
- disabled: true
+ {
+ label: '直接生成记录',
+ field: 'directCreateRecord',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isForm: false,
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: requestsettingData.directCreateRecord,
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE',
+ disabled: true
+ }
}
- }
- },
- {
- label: '直接生成记录',
- field: 'directCreateRecord',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isForm: false,
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: requestsettingData.directCreateRecord,
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE',
- disabled: true
+ {
+ label: '操作',
+ field: 'action',
+ isDetail: false,
+ isForm: false,
+ table: {
+ width: 300,
+ fixed: 'right'
}
}
- },
- {
- label: '操作',
- field: 'action',
- isDetail: false,
- isForm: false,
- table: {
- width: 300,
- fixed: 'right'
- },
- }
-]))
+ ])
+)
//表单校验
export const ProductscrapRequestMainRules = reactive({
@@ -858,6 +925,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([
},
tableForm: {
type: 'InputNumber',
+ default:1,
min: 0,
precision: 6
}
@@ -1176,6 +1244,14 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([
}
},
]))
+function validateQty(rule, value, callback) {
+ if (value>0) {
+ callback()
+ }else{
+ callback(new Error('数量必须大于0'))
+ }
+}
+
//表单校验
export const ProductscrapRequestDetailRules = reactive({
@@ -1185,6 +1261,9 @@ export const ProductscrapRequestDetailRules = reactive({
workStationCode: [
{ required: true, message: '请选择工位代码', trigger: 'change' }
],
+ qty:[
+ { validator:validateQty, message: '数量必须大于0', trigger: 'blur'}
+ ],
// processCode: [
// { required: true, message: '请选择工序代码', trigger: 'change' }
// ],
@@ -1371,5 +1450,5 @@ export const ProdcutscrapBomScrap = useCrudSchemas(reactive([
//表单校验
export const ProdcutscrapBomScrapRules = reactive({
-
+
})
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
index c38e328b5..1463bf747 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
@@ -1,601 +1,654 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
+import * as InspectionQ2Api from '@/api/qms/inspectionQ2'
+import { Q2 } from '@/views/qms/inspectionQ2/inspectionQ2.data'
+
/**
* @returns {Array} 采购退货任务主表
*/
-export const PurchasereturnJobMain = useCrudSchemas(reactive([
- {
- label: '单据号',
- field: 'number',
- sort: 'custom',
- table: {
- width: 180,
- fixed: 'left'
- },
- isSearch: true,
- sortSearchDefault: 1,
- },
- {
- label: '申请单号',
- field: 'requestNumber',
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- },
- {
- label: '采购收货记录单号',
- field: 'purchaseReceiptRecordNumber',
- sort: 'custom',
- isSearch: true,
- table: {
- width: 180
- },
- sortTableDefault: 4,
- sortSearchDefault: 4
- },
- {
- label: '发货单号',
- field: 'asnNumber',
- sort: 'custom',
- table: {
- width: 180
- },
- isSearch: true,
- sortTableDefault: 3,
- sortSearchDefault: 3
- },
- {
- label: '要货计划单号',
- field: 'ppNumber',
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- },
- {
- label: '供应商代码',
- field: 'supplierCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isSearch: true,
- sortTableDefault: 2,
- sortSearchDefault: 2
- },
- {
- label: '发货月台',
- field: 'deliverDock',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '承运商',
- field: 'carrierCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '运输方式',
- field: 'transferMode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '车牌号',
- field: 'vehiclePlateNumber',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '从仓库代码',
- field: 'fromWarehouseCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '到仓库代码',
- field: 'toWarehouseCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '从库区类型范围',
- field: 'fromAreaTypes',
- dictType: DICT_TYPE.AREA_TYPE,
- dictClass: 'string',
- isSearch: false,
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '到库区类型范围',
- field: 'toAreaTypes',
- dictType: DICT_TYPE.AREA_TYPE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '从库区代码范围',
- field: 'fromAreaCodes',
- sort: 'custom',
- isTable: false,
- table: {
- width: 150
- },
- },
- {
- label: '到库区代码范围',
- field: 'toAreaCodes',
- sort: 'custom',
- isTable: false,
- table: {
- width: 150
- },
- },
- {
- label: '从月台代码',
- field: 'fromDockCode',
- sort: 'custom',
- isTable: false,
- table: {
- width: 150
- },
- },
- {
- label: '申请时间',
- field: 'requestTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+export const PurchasereturnJobMain = useCrudSchemas(
+ reactive([
+ {
+ label: '单据号',
+ field: 'number',
+ sort: 'custom',
+ table: {
+ width: 180,
+ fixed: 'left'
+ },
+ isSearch: true,
+ sortSearchDefault: 1
+ },
+ {
+ label: '申请单号',
+ field: 'requestNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false
+ },
+ {
+ label: '采购收货记录单号',
+ field: 'purchaseReceiptRecordNumber',
+ sort: 'custom',
+ isSearch: true,
+ table: {
+ width: 180
+ },
+ sortTableDefault: 4,
+ sortSearchDefault: 4
+ },
+ {
+ label: '发货单号',
+ field: 'asnNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isSearch: true,
+ sortTableDefault: 3,
+ sortSearchDefault: 3
+ },
+ {
+ label: '要货计划单号',
+ field: 'ppNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false
+ },
+ {
+ label: 'Q2通知单号',
+ field: 'q2Number',
+ sort: 'custom',
+ isSearch: false,
+ isDetail: true,
+ sortTableDefault: 5,
+ sortSearchDefault: 5,
+ table: {
+ width: 150
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true,
+ // multiple: true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本
+ searchField: 'number', // 查询弹窗赋值字段
+ searchTitle: 'Q2通知单号', // 查询弹窗标题
+ searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类
+ searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'status',
+ value: '0',
+ isMainValue: false
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'number',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
}
},
- },
- {
- label: '要求截止时间',
- field: 'requestDueTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+
+ {
+ label: '供应商代码',
+ field: 'supplierCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isSearch: true,
+ sortTableDefault: 2,
+ sortSearchDefault: 2
+ },
+ {
+ label: '发货月台',
+ field: 'deliverDock',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '承运商',
+ field: 'carrierCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '运输方式',
+ field: 'transferMode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '车牌号',
+ field: 'vehiclePlateNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '从仓库代码',
+ field: 'fromWarehouseCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '到仓库代码',
+ field: 'toWarehouseCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '从库区类型范围',
+ field: 'fromAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isSearch: false,
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
}
},
- },
- {
- label: '业务类型',
- field: 'businessType',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '状态',
- field: 'status',
- dictType: DICT_TYPE.JOB_STATUS,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- sortTableDefault: 1
- },
- // {
- // label: '状态',
- // field: 'jobStageStatus',
- // sort: 'custom',
- // table: {
- // width: 150
- // },
- // },
- {
- label: '过期时间',
- field: 'expiredTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '到库区类型范围',
+ field: 'toAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
}
},
- },
- {
- label: '优先级',
- field: 'priority',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- form: {
- component: 'InputNumber',
- }
- },
- {
- label: '优先级增量',
- field: 'priorityIncrement',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- form: {
- component: 'InputNumber',
- }
- },
- {
- label: '部门',
- field: 'departmentCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '承接人',
- field: 'acceptUserName',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '承接时间',
- field: 'acceptTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '从库区代码范围',
+ field: 'fromAreaCodes',
+ sort: 'custom',
+ isTable: false,
+ table: {
+ width: 150
}
},
- },
- {
- label: '完成人',
- field: 'completeUserName',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '到库区代码范围',
+ field: 'toAreaCodes',
+ sort: 'custom',
+ isTable: false,
+ table: {
+ width: 150
+ }
},
- isTable: false,
- },
- {
- label: '完成时间',
- field: 'completeTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ {
+ label: '从月台代码',
+ field: 'fromDockCode',
+ sort: 'custom',
+ isTable: false,
+ table: {
+ width: 150
+ }
},
- sort: 'custom',
- table: {
- width: 180
+ {
+ label: '申请时间',
+ field: 'requestTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '要求截止时间',
+ field: 'requestDueTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
},
- },
- {
- label: '自动完成',
- field: 'autoComplete',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '业务类型',
+ field: 'businessType',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '状态',
+ field: 'status',
+ dictType: DICT_TYPE.JOB_STATUS,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault: 1
+ },
+ // {
+ // label: '状态',
+ // field: 'jobStageStatus',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
+ {
+ label: '过期时间',
+ field: 'expiredTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- isTable: false,
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '优先级',
+ field: 'priority',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ form: {
+ component: 'InputNumber'
}
- }
- },
- {
- label: '允许修改库位',
- field: 'allowModifyLocation',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '优先级增量',
+ field: 'priorityIncrement',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ form: {
+ component: 'InputNumber'
}
- }
- },
- {
- label: '允许修改数量',
- field: 'allowModifyQty',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '部门',
+ field: 'departmentCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '承接人',
+ field: 'acceptUserName',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '承接时间',
+ field: 'acceptTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
- }
- },
- {
- label: '允许大于推荐数量',
- field: 'allowBiggerQty',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '完成人',
+ field: 'completeUserName',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '完成时间',
+ field: 'completeTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
- }
- },
- {
- label: '允许小于推荐数量',
- field: 'allowSmallerQty',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '自动完成',
+ field: 'autoComplete',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
}
- }
- },
- {
- label: '允许修改库存状态',
- field: 'allowModifyInventoryStatus',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '允许修改库位',
+ field: 'allowModifyLocation',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
}
- }
- },
- {
- label: '允许连续扫描',
- field: 'allowContinuousScanning',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '允许修改数量',
+ field: 'allowModifyQty',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
}
- }
- },
- {
- label: '允许部分完成',
- field: 'allowPartialComplete',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '允许大于推荐数量',
+ field: 'allowBiggerQty',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
}
- }
- },
- {
- label: '允许修改批次',
- field: 'allowModifyBatch',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '允许小于推荐数量',
+ field: 'allowSmallerQty',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
}
- }
- },
- {
- label: '允许修改箱码',
- field: 'allowModifyPackingNumber',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
+ {
+ label: '允许修改库存状态',
+ field: 'allowModifyInventoryStatus',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
}
- }
- },
- {
- label: '备注',
- field: 'remark',
- sort: 'custom',
- table: {
- width: 150
},
- isTable: false,
- },
- {
- label: '创建者',
- field: 'creator',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '允许连续扫描',
+ field: 'allowContinuousScanning',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
+ }
},
- isTable: true,
- },
- {
- label: '创建时间',
- field: 'createTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ {
+ label: '允许部分完成',
+ field: 'allowPartialComplete',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
+ }
},
- sort: 'custom',
- table: {
- width: 180
+ {
+ label: '允许修改批次',
+ field: 'allowModifyBatch',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
+ }
},
- isTable: true,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '允许修改箱码',
+ field: 'allowModifyPackingNumber',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
}
},
- },
- {
- label: '操作',
- field: 'action',
- isDetail: false,
- isForm: false,
- table: {
- width: 120,
- fixed: 'right'
+ {
+ label: '备注',
+ field: 'remark',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '创建者',
+ field: 'creator',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: true
+ },
+ {
+ label: '创建时间',
+ field: 'createTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: true,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- }
-]))
+ {
+ label: '操作',
+ field: 'action',
+ isDetail: false,
+ isForm: false,
+ table: {
+ width: 120,
+ fixed: 'right'
+ }
+ }
+ ])
+)
//表单校验
export const PurchasereturnJobMainRules = reactive({
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
index 27f5921b8..292b32b4e 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
@@ -1,387 +1,439 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
+
+import * as InspectionQ2Api from '@/api/qms/inspectionQ2'
+import { Q2 } from '@/views/qms/inspectionQ2/inspectionQ2.data'
/**
* @returns {Array} 采购退货记录主表
*/
-export const PurchasereturnRecordMain = useCrudSchemas(reactive([
- {
- label: '单据号',
- field: 'number',
- sort: 'custom',
- table: {
- width: 180,
- fixed: 'left'
- },
- sortTableDefault: 1012,
- sortSearchDefault:1,
- isSearch: true
- },
- {
- label: '申请单号',
- field: 'requestNumber',
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false
- },
- {
- label: '任务单号',
- field: 'jobNumber',
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false
- },
- {
- label: '采购收货记录单号',
- field: 'purchaseReceiptRecordNumber',
- sort: 'custom',
- table: {
- width: 180
- },
- isSearch: true,
- sortTableDefault: 3,
- sortSearchDefault: 5,
- }, {
- label: 'qad采购退货记录单号',
- field: 'qadPurchaseReturnRecordCode',
- sort: 'custom',
- table: {
- width: 180
- },
- sortSearchDefault:3,
- sortTableDefault: 4,
- isTable: true
- },
- {
- label: '发货单号',
- field: 'asnNumber',
- sort: 'custom',
- table: {
- width: 180
- },
- sortSearchDefault:3,
- isSearch: true,
- sortTableDefault: 2
- },
- {
- label: '要货计划单号',
- field: 'ppNumber',
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false
- },
- {
- label: '供应商代码',
- field: 'supplierCode',
- sort: 'custom',
- table: {
- width: 150
- },
- sortTableDefault: 1,
- sortSearchDefault:2,
- isSearch: true
- },
- {
- label: '从月台代码',
- field: 'fromDockCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false
- },
- {
- label: '承运商',
- field: 'carrierCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false
- },
- {
- label: '运输方式',
- field: 'transferMode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false
- },
- {
- label: '车牌号',
- field: 'vehiclePlateNumber',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false
- },
- {
- label: '从仓库代码',
- field: 'fromWarehouseCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false
- },
- {
- label: '到仓库代码',
- field: 'toWarehouseCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false
- },
- {
- label: '出库事务类型',
- field: 'outTransactionType',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false
- },
- {
- label: '入库事务类型',
- field: 'inTransactionType',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false
- },
- {
- label: '从库区类型范围',
- field: 'fromAreaTypes',
- dictType: DICT_TYPE.AREA_TYPE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '到库区类型范围',
- field: 'toAreaTypes',
- dictType: DICT_TYPE.AREA_TYPE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '从库区代码范围',
- field: 'fromAreaCodes',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '到库区代码范围',
- field: 'toAreaCodes',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '执行时间',
- field: 'executeTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+export const PurchasereturnRecordMain = useCrudSchemas(
+ reactive([
+ {
+ label: '单据号',
+ field: 'number',
+ sort: 'custom',
+ table: {
+ width: 180,
+ fixed: 'left'
+ },
+ sortTableDefault: 1012,
+ sortSearchDefault: 1,
+ isSearch: true
+ },
+ {
+ label: '申请单号',
+ field: 'requestNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false
+ },
+ {
+ label: '任务单号',
+ field: 'jobNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false
+ },
+ {
+ label: '采购收货记录单号',
+ field: 'purchaseReceiptRecordNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isSearch: true,
+ sortTableDefault: 3,
+ sortSearchDefault: 5
+ },
+ {
+ label: 'qad采购退货记录单号',
+ field: 'qadPurchaseReturnRecordCode',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ sortSearchDefault: 3,
+ sortTableDefault: 4,
+ isTable: true
+ },
+ {
+ label: '发货单号',
+ field: 'asnNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ sortSearchDefault: 3,
+ isSearch: true,
+ sortTableDefault: 2
+ },
+ {
+ label: '要货计划单号',
+ field: 'ppNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false
+ },
+ {
+ label: 'Q2通知单号',
+ field: 'q2Number',
+ sort: 'custom',
+ isSearch: false,
+ isDetail: true,
+ sortTableDefault: 4,
+ table: {
+ width: 150
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true,
+ // multiple: true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本
+ searchField: 'number', // 查询弹窗赋值字段
+ searchTitle: 'Q2通知单号', // 查询弹窗标题
+ searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类
+ searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'status',
+ value: '0',
+ isMainValue: false
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'number',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
}
},
- },
- {
- label: '生效日期',
- field: 'activeDate',
- formatter: dateFormatter2,
- detail: {
- dateFormat: 'YYYY-MM-DD'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width: '100%'},
- type: 'date',
- dateFormat: 'YYYY-MM-DD',
- valueFormat: 'x',
+ {
+ label: '供应商代码',
+ field: 'supplierCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault: 1,
+ sortSearchDefault: 2,
+ isSearch: true
+ },
+ {
+ label: '从月台代码',
+ field: 'fromDockCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '承运商',
+ field: 'carrierCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '运输方式',
+ field: 'transferMode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '车牌号',
+ field: 'vehiclePlateNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '从仓库代码',
+ field: 'fromWarehouseCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '到仓库代码',
+ field: 'toWarehouseCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '出库事务类型',
+ field: 'outTransactionType',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '入库事务类型',
+ field: 'inTransactionType',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '从库区类型范围',
+ field: 'fromAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
}
},
- },
- {
- label: '申请时间',
- field: 'requestTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '到库区类型范围',
+ field: 'toAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
}
},
- },
- {
- label: '截止时间',
- field: 'dueTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '从库区代码范围',
+ field: 'fromAreaCodes',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '到库区代码范围',
+ field: 'toAreaCodes',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '执行时间',
+ field: 'executeTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
},
- },
- {
- label: '部门',
- field: 'departmentCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- // {
- // label: '代码',
- // field: 'code',
- // sort: 'custom',
- // table: {
- // width: 150
- // },
- // },
- {
- label: '接口类型',
- field: 'interfaceType',
- dictType: DICT_TYPE.INTERFACE_TYPE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '业务类型',
- field: 'businessType',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '是否可用',
- field: 'available',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '生效日期',
+ field: 'activeDate',
+ formatter: dateFormatter2,
+ detail: {
+ dateFormat: 'YYYY-MM-DD'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'date',
+ dateFormat: 'YYYY-MM-DD',
+ valueFormat: 'x'
+ }
+ }
},
- },
- // {
- // label: '原因',
- // field: 'available',
- // sort: 'custom',
- // table: {
- // width: 150
- // },
- // isTable: true,
- // },
- {
- label: '创建时间',
- field: 'createTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ {
+ label: '申请时间',
+ field: 'requestTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- sort: 'custom',
- table: {
- width: 180
+ {
+ label: '截止时间',
+ field: 'dueTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- isTable: true,
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '部门',
+ field: 'departmentCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ // {
+ // label: '代码',
+ // field: 'code',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
+ {
+ label: '接口类型',
+ field: 'interfaceType',
+ dictType: DICT_TYPE.INTERFACE_TYPE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
}
},
- },
- {
- label: '创建者',
- field: 'creator',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '业务类型',
+ field: 'businessType',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '是否可用',
+ field: 'available',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- isTable: false,
- },
- {
- label: '操作',
- field: 'action',
- isDetail: false,
- isForm: false,
- table: {
- width: 150,
- fixed: 'right'
+ // {
+ // label: '原因',
+ // field: 'available',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTable: true,
+ // },
+ {
+ label: '创建时间',
+ field: 'createTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: true,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ }
},
- }
-]))
+ {
+ label: '创建者',
+ field: 'creator',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '操作',
+ field: 'action',
+ isDetail: false,
+ isForm: false,
+ table: {
+ width: 150,
+ fixed: 'right'
+ }
+ }
+ ])
+)
//表单校验
export const PurchasereturnRecordMainRules = reactive({
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index 1b4de0f24..d7a4c93c3 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -308,6 +308,12 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
}
} else {
const setV = {}
+ if (formField == 'supplierCode') {
+ setV['q2Number'] = ''
+ }
+ if (formField == 'q2Number') {
+ setV['q2Number'] = val[0]['number']
+ }
if (formField == 'purchaseReceiptRecordNumber') {
// isShowButton.value = false
setV[formField] = val[0][searchField]
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index 861ff32fd..5f751f458 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -1,629 +1,688 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
const { t } = useI18n() // 国际化
-import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
-import { PurchasereceiptRecordDetail,PurchasereceiptRecordMain } from '../../purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data'
+import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
+import {
+ PurchasereceiptRecordDetail,
+ PurchasereceiptRecordMain
+} from '../../purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data'
import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
-import { Supplier } from "@/views/wms/basicDataManage/supplierManage/supplier/supplier.data";
-import * as SupplierApi from "@/api/wms/supplier";
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+import * as SupplierApi from '@/api/wms/supplier'
import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
import * as ItemPackageApi from '@/api/wms/itempackage/index'
-import * as LocationApi from "@/api/wms/location";
-import {Location} from "@/views/wms/basicDataManage/factoryModeling/location/location.data";
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
import * as BalanceApi from '@/api/wms/balance'
import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
-
+import * as InspectionQ2Api from '@/api/qms/inspectionQ2'
+import { Q2 } from '@/views/qms/inspectionQ2/inspectionQ2.data'
// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
const queryParams = {
- pageSize:10,
- pageNo:1,
- code:'PurchaseReturnRequest'
+ pageSize: 10,
+ pageNo: 1,
+ code: 'PurchaseReturnRequest'
}
- const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
- const requestsettingData =data?.list[0]||{}
-
- // 获取当前操作人的部门
- import { useUserStore } from '@/store/modules/user'
- import { TableColumn } from '@/types/table'
- const userStore = useUserStore()
- const userDept = userStore.userSelfInfo.dept
- // id 转str 否则form回显匹配不到
- userDept.id = userDept.id.toString()
- const userDeptArray:any = [userDept]
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData = data?.list[0] || {}
+// 获取当前操作人的部门
+import { useUserStore } from '@/store/modules/user'
+import { TableColumn } from '@/types/table'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+// id 转str 否则form回显匹配不到
+userDept.id = userDept.id.toString()
+const userDeptArray: any = [userDept]
// 采购收货记录展示列
-export const PurchasereceiptRecordMain1 = useCrudSchemas(reactive([
- {
- label: '物料代码',
- field: 'itemCode',
- fixed: 'left',
- sort: 'custom',
- table: {
- width: 150
- },
- isSearch: true
- },
- {
- label: '采购收货记录单号',
- field: 'number',
- fixed: 'left',
- sort: 'custom',
- table: {
- width: 200
- },
- isSearch: true
- },
- {
- label: '发货单号',
- field: 'asnNumber',
- sort: 'custom',
- table: {
- width: 180
- },
- isSearch: true
- },
- {
- label: '采购订单号',
- field: 'poNumber',
- sort: 'custom',
- table: {
- width: 150
- },
- isSearch: true
- },
- {
- label: '订单行',
- field: 'poLine',
- sort: 'custom',
- table: {
- width: 150
+export const PurchasereceiptRecordMain1 = useCrudSchemas(
+ reactive([
+ {
+ label: '物料代码',
+ field: 'itemCode',
+ fixed: 'left',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isSearch: true
+ },
+ {
+ label: '采购收货记录单号',
+ field: 'number',
+ fixed: 'left',
+ sort: 'custom',
+ table: {
+ width: 200
+ },
+ isSearch: true
+ },
+ {
+ label: '发货单号',
+ field: 'asnNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isSearch: true
+ },
+ {
+ label: '采购订单号',
+ field: 'poNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isSearch: true
+ },
+ {
+ label: '订单行',
+ field: 'poLine',
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- },
- {
- label: '物料名称',
- field: 'itemName',
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面
- field: 'fromBatch',
- sort: 'custom',
- isForm:false,
- isTableForm:false,
- table: {
- width: 150
+ {
+ label: '物料名称',
+ field: 'itemName',
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- },
- {
- label: '计量单位',
- field: 'uom',
- dictType: DICT_TYPE.UOM,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面
+ field: 'fromBatch',
+ sort: 'custom',
+ isForm: false,
+ isTableForm: false,
+ table: {
+ width: 150
+ }
},
- },
- // {
- // label: '包装规格',
- // field: 'packUnit',
- // dictClass: 'string',
- // isTable: true,
- // sort: 'custom',
- // table: {
- // width: 150
- // },
- // },
- // {
- // label: '从库位代码',
- // field: 'fromLocationCode',
- // sort: 'custom',
- // table: {
- // width: 150
- // },
- //
- // },
- {
- label: '到库位代码',
- field: 'toLocationCode',
- sort: 'custom',
- table: {
- width: 150
+ {
+ label: '计量单位',
+ field: 'uom',
+ dictType: DICT_TYPE.UOM,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ }
},
- },
-
-
-]))
+ // {
+ // label: '包装规格',
+ // field: 'packUnit',
+ // dictClass: 'string',
+ // isTable: true,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
+ // {
+ // label: '从库位代码',
+ // field: 'fromLocationCode',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ //
+ // },
+ {
+ label: '到库位代码',
+ field: 'toLocationCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ }
+ }
+ ])
+)
/**
* @returns {Array} 采购退货申请主表
*/
-export const PurchasereturnRequestMain = useCrudSchemas(reactive([
- {
- label: '单据号',
- field: 'number',
- sort: 'custom',
- table: {
- width: 180,
- fixed: 'left'
- },
- isForm: false,
- isSearch: true,
- },
- {
- label: '状态',
- field: 'status',
- dictType: DICT_TYPE.REQUEST_STATUS,
- dictClass: 'string',
- isSearch: true,
- isTable: true,
- isForm:false,
- sort: 'custom',
- table: {
- width: 150
- },
- sortTableDefault:1,
- form: {
- value: '1',
- componentProps: {
- disabled: true
+export const PurchasereturnRequestMain = useCrudSchemas(
+ reactive([
+ {
+ label: '单据号',
+ field: 'number',
+ sort: 'custom',
+ table: {
+ width: 180,
+ fixed: 'left'
+ },
+ isForm: false,
+ isSearch: true
+ },
+ {
+ label: '状态',
+ field: 'status',
+ dictType: DICT_TYPE.REQUEST_STATUS,
+ dictClass: 'string',
+ isSearch: true,
+ isTable: true,
+ isForm: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault: 1,
+ form: {
+ value: '1',
+ componentProps: {
+ disabled: true
+ }
}
- }
- },
- {
- label: '供应商代码',
- field: 'supplierCode',
- sort: 'custom',
- table: {
- width: 150
},
- sortTableDefault:1,
- isSearch: true,
- form:{
- componentProps:{
- enterSearch: true,
- isSearchList: true, // 开启查询弹窗
- searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
- searchField: 'code', // 查询弹窗赋值字段
- searchTitle: '供应商信息', // 查询弹窗标题
- searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
- searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
- verificationParams: [{
- key: 'code',
- action: '==',
- value: '',
- isMainValue: false,
- isSearch: true,
- isFormModel: true,
- }], // 失去焦点校验参数
+ {
+ label: '供应商代码',
+ field: 'supplierCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault: 1,
+ isSearch: true,
+ form: {
+ componentProps: {
+ enterSearch: true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+ searchField: 'code', // 查询弹窗赋值字段
+ searchTitle: '供应商信息', // 查询弹窗标题
+ searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+ searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
+ verificationParams: [
+ {
+ key: 'code',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
}
- }
- },
- {
- label: '采购收货记录单号',
- field: 'purchaseReceiptRecordNumber',
- sort: 'custom',
- table: {
- width: 180
},
- form: {
- // labelMessage: '信息提示说明！！！',
- componentProps: {
- enterSearch: true,
- disabled:true,
- isSearchList: true, // 开启查询弹窗
- searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本
- searchField: 'number', // 查询弹窗赋值字段
- searchTitle: '采购收货记录', // 查询弹窗标题
- searchAllSchemas: PurchasereceiptRecordMain1.allSchemas, // 查询弹窗所需类
- searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageReturn, // 查询弹窗所需分页方法
- searchCondition: [
- {
- key: 'supplierCode',
- value: 'supplierCode',
- isMainValue: true
- }],
- verificationParams: [{
- key: 'number',
- action: '==',
- value: '',
- isMainValue: false,
- isSearch: true,
- isFormModel: true,
- }], // 失去焦点校验参数
+ {
+ label: '采购收货记录单号',
+ field: 'purchaseReceiptRecordNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true,
+ disabled: true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本
+ searchField: 'number', // 查询弹窗赋值字段
+ searchTitle: '采购收货记录', // 查询弹窗标题
+ searchAllSchemas: PurchasereceiptRecordMain1.allSchemas, // 查询弹窗所需类
+ searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageReturn, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'supplierCode',
+ value: 'supplierCode',
+ isMainValue: true
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'number',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
}
- }
- },
- {
- label: '发货单号',
- field: 'asnNumber',
- sort: 'custom',
- table: {
- width: 180
- },
- isForm: false,
- sortTableDefault:2
- },
- {
- label: '要货计划单号',
- field: 'ppNumber',
- sort: 'custom',
- table: {
- width: 180
- },
- isForm: false,
- isTable: false,
- },
- {
- label: '承运商',
- field: 'carrierCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '运输方式',
- field: 'transferMode',
- sort: 'custom',
- dictType: DICT_TYPE.TRANSFER_MODE,
- dictClass: 'string',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '车牌号',
- field: 'vehiclePlateNumber',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '从仓库代码',
- field: 'fromWarehouseCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isForm: false,
- isTable: false,
- },
- {
- label: '到仓库代码',
- field: 'toWarehouseCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTableForm:false,
- isForm: false,
- isTable: false,
- },
- {
- label: '从库区类型范围',
- field: 'fromAreaTypes',
- dictType: DICT_TYPE.AREA_TYPE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
- },
- isForm: false,
- },
- {
- label: '到库区类型范围',
- field: 'toAreaTypes',
- dictType: DICT_TYPE.AREA_TYPE,
- dictClass: 'string',
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
- },
- isTableForm:false,
- isForm: false,
- },
- {
- label: '从库区代码范围',
- field: 'fromAreaCodes',
- sort: 'custom',
- table: {
- width: 150
- },
- isForm: false,
- isTable: false,
- },
- {
- label: '到库区代码范围',
- field: 'toAreaCodes',
- sort: 'custom',
- table: {
- width: 150
},
- isForm: false,
- isTable: false,
- isTableForm:false,
- },
- {
- label: '从月台代码',
- field: 'fromDockCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isForm: false,
- isTable: false,
-
- },
- {
- label: '业务类型',
- field: 'businessType',
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- value: 'PurchaseReturn',
- componentProps: {
- disabled: true
+ {
+ label: '发货单号',
+ field: 'asnNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isForm: false,
+ sortTableDefault: 2
+ },
+ {
+ label: '要货计划单号',
+ field: 'ppNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isForm: false,
+ isTable: false
+ },
+ {
+ label: 'Q2通知单号',
+ field: 'q2Number',
+ sort: 'custom',
+ isSearch: false,
+ isDetail: true,
+ table: {
+ width: 150
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true,
+ // multiple: true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本
+ searchField: 'number', // 查询弹窗赋值字段
+ searchTitle: 'Q2通知单号', // 查询弹窗标题
+ searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类
+ searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'status',
+ value: '0',
+ isMainValue: false
+ },
+ {
+ key: 'supplierCode',
+ value: 'supplierCode',
+ isMainValue: true
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'number',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
}
},
- isForm: false,
- isTable: false,
- },
- {
- label: '申请时间',
- field: 'requestTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width:'100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '承运商',
+ field: 'carrierCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '运输方式',
+ field: 'transferMode',
+ sort: 'custom',
+ dictType: DICT_TYPE.TRANSFER_MODE,
+ dictClass: 'string',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '车牌号',
+ field: 'vehiclePlateNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '从仓库代码',
+ field: 'fromWarehouseCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isForm: false,
+ isTable: false
+ },
+ {
+ label: '到仓库代码',
+ field: 'toWarehouseCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTableForm: false,
+ isForm: false,
+ isTable: false
+ },
+ {
+ label: '从库区类型范围',
+ field: 'fromAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isForm: false
+ },
+ {
+ label: '到库区类型范围',
+ field: 'toAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTableForm: false,
+ isForm: false
+ },
+ {
+ label: '从库区代码范围',
+ field: 'fromAreaCodes',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isForm: false,
+ isTable: false
+ },
+ {
+ label: '到库区代码范围',
+ field: 'toAreaCodes',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isForm: false,
+ isTable: false,
+ isTableForm: false
+ },
+ {
+ label: '从月台代码',
+ field: 'fromDockCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isForm: false,
+ isTable: false
+ },
+ {
+ label: '业务类型',
+ field: 'businessType',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ value: 'PurchaseReturn',
+ componentProps: {
+ disabled: true
+ }
+ },
+ isForm: false,
+ isTable: false
+ },
+ {
+ label: '申请时间',
+ field: 'requestTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ },
+ isForm: false,
+ isTable: false
+ },
+ {
+ label: '截止时间',
+ field: 'dueTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
},
- isForm: false,
- isTable: false,
- },
- {
- label: '截止时间',
- field: 'dueTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- isTable: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width:'100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '部门',
+ field: 'departmentCode',
+ sort: 'custom',
+ isForm: false,
+ table: {
+ width: 150
+ },
+ isTable: false,
+ formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+ return userDeptArray.find((account) => account.id == cellValue)?.name
+ },
+ form: {
+ value: userDept.id,
+ component: 'Select',
+ api: () => userDeptArray,
+ componentProps: {
+ disabled: true,
+ optionsAlias: {
+ labelField: 'name',
+ valueField: 'id'
+ }
+ }
}
},
- },
- {
- label: '部门',
- field: 'departmentCode',
- sort: 'custom',
- isForm:false,
- table: {
- width: 150
- },
- isTable: false,
- formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
- return userDeptArray.find((account) => account.id == cellValue)?.name
- },
- form: {
- value: userDept.id,
- component: 'Select',
- api: () => userDeptArray,
- componentProps: {
- disabled: true,
- optionsAlias: {
- labelField: 'name',
- valueField: 'id'
+
+ {
+ label: '原因',
+ field: 'remark',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '创建时间',
+ field: 'createTime',
+ isForm: false,
+ table: {
+ width: 180
+ },
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
}
}
- }
- },
-
- {
- label: '原因',
- field: 'remark',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '创建时间',
- field: 'createTime',
- isForm: false,
- table: {
- width: 180
- },
- formatter: dateFormatter,
- detail: {
- dateFormat : 'YYYY-MM-DD HH:mm:ss'
},
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width:'100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '创建者',
+ field: 'creator',
+ table: {
+ width: 130
+ },
+ isForm: false,
+ isTable: true
+ },
+ {
+ label: '最后更新时间',
+ field: 'updateTime',
+ sort: 'custom',
+ isDetail: true,
+ isForm: false,
+ isTable: false,
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
}
- }
- },
- {
- label: '创建者',
- field: 'creator',
- table: {
- width: 130
},
- isForm: false,
- isTable: true
- },
- {
- label: '最后更新时间',
- field: 'updateTime',
- sort: 'custom',
- isDetail: true,
- isForm: false,
- isTable: false,
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- table: {
- width: 180
+ {
+ label: '最后更新者',
+ field: 'updater',
+ isDetail: true,
+ isForm: false,
+ isTable: false,
+ table: {
+ width: 150
+ }
},
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width:'100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ {
+ label: '自动提交',
+ field: 'autoCommit',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ isForm: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: requestsettingData.autoCommit,
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE',
+ disabled: true
+ }
}
- }
- },
- {
- label: '最后更新者',
- field: 'updater',
- isDetail: true,
- isForm: false,
- isTable: false,
- table: {
- width: 150
- }
- },
- {
- label: '自动提交',
- field: 'autoCommit',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- isForm:false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: requestsettingData.autoCommit,
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE',
- disabled: true
+ {
+ label: '自动通过',
+ field: 'autoAgree',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ isForm: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: requestsettingData.autoAgree,
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE',
+ disabled: true
+ }
}
- }
- },
- {
- label: '自动通过',
- field: 'autoAgree',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- isForm:false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: requestsettingData.autoAgree,
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE',
- disabled: true
+ {
+ label: '自动执行',
+ field: 'autoExecute',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ isForm: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: requestsettingData.autoExecute,
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE',
+ disabled: true
+ }
}
- }
- },
- {
- label: '自动执行',
- field: 'autoExecute',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: false,
- isForm:false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: requestsettingData.autoExecute,
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE',
- disabled: true
+ {
+ label: '直接生成记录',
+ field: 'directCreateRecord',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isForm: false,
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: requestsettingData.directCreateRecord,
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE',
+ disabled: true
+ }
}
- }
- },
- {
- label: '直接生成记录',
- field: 'directCreateRecord',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isForm: false,
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
},
- form: {
- component: 'Switch',
- value: requestsettingData.directCreateRecord,
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE',
- disabled: true
+ {
+ label: '操作',
+ field: 'action',
+ isDetail: false,
+ isForm: false,
+ table: {
+ width: 300,
+ fixed: 'right'
}
}
- },
- {
- label: '操作',
- field: 'action',
- isDetail: false,
- isForm: false,
- table: {
- width: 300,
- fixed: 'right'
- },
- }
-]))
+ ])
+)
//表单校验
export const PurchasereturnRequestMainRules = reactive({
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 42a030cd9..0eee88838 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -577,6 +577,9 @@ const handleImport = () => {
/** 添加/修改操作 */
const formRef = ref()
const openForm = async (type : string, row ?: number) => {
+ // 合同金额 采购金额 总差额 :只在详情里展示
+ SupplierinvoiceRequestDetail.allSchemas.tableFormColumns = SupplierinvoiceRequestDetail.allSchemas.tableFormColumns.filter(item=>item.field!='contractAmountTotal'&&item.field!='purchaseAmontTotal'&&item.field!='differencePriceTotal')
+
if(type=='update'){
//编辑
SupplierinvoiceRequestMain.allSchemas.formSchema.forEach((item) => {
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index b2eb7c153..874fb4d99 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -1240,8 +1240,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive
+ 
{{ t(`ts.${underlineToHump(appStore.getTitle)}`) }}