Browse Source

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

hella_online_20240829
赵雪冰 6 months ago
parent
commit
845b1b2387
  1. 5
      src/api/wms/purchaseMain/index.ts
  2. 5
      src/views/login/login.vue
  3. 2
      src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts
  4. 6
      src/views/wms/basicDataManage/documentSetting/businesstype/index.vue
  5. 3
      src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
  6. 5
      src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
  7. 5
      src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
  8. 5
      src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
  9. 3
      src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
  10. 150
      src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
  11. 100
      src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
  12. 116
      src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
  13. 18
      src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
  14. 6
      src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
  15. 122
      src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
  16. 100
      src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
  17. 134
      src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
  18. 1
      src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
  19. 118
      src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts
  20. 101
      src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
  21. 25
      src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
  22. 195
      src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
  23. 11
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
  24. 4
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
  25. 12
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
  26. 2
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
  27. 127
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
  28. 100
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
  29. 6
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
  30. 155
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts

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

@ -72,8 +72,13 @@ export const witPurchaseMain = async (id: number) => {
}
// 导出采购订单主 Excel
export const exportPurchaseMain = async (params) => {
if (params.isSearch) {
const data = {...params}
return await request.downloadPost({ url: `/wms/purchase-main/export-excel-senior`, data })
} else {
return await request.download({ url: `/wms/purchase-main/export-excel`, params })
}
}
// 下载用户导入模板
export const importTemplate = () => {

5
src/views/login/login.vue

@ -9,7 +9,7 @@
>
<!-- 左上角的 logo + 系统标题 -->
<div class="relative flex items-center ">
<img alt="" class="mr-10px w-144px h-36px" src="@/assets/imgs/logo_white_blue.png" />
<img alt="" class="mr-10px w-36px h-36px" src="@/assets/imgs/logo_white.png" />
<span class="text-20px font-bold">{{ t(`ts.${underlineToHump(appStore.getTitle)}`) }}</span>
</div>
<!-- 左边的背景图 + 欢迎语 -->
@ -33,7 +33,7 @@
class="flex items-center justify-between at-2xl:justify-end at-xl:justify-end"
>
<div class="flex items-center at-2xl:hidden at-xl:hidden">
<img alt="" class="mr-10px w-144px h-36px" src="@/assets/imgs/logo_white_blue.png" />
<img alt="" class="mr-10px w-36px h-36px" src="@/assets/imgs/logo_white.png" />
<span class="text-20px font-bold">{{ t(`ts.${underlineToHump(appStore.getTitle)}`) }}</span>
</div>
<div class="flex items-center justify-end space-x-10px">
@ -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;

2
src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts

@ -119,6 +119,7 @@ export const Businesstype = useCrudSchemas(reactive<CrudSchema[]>([
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
multiple: true,
enterSearch: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择库区代码', // 输入框占位文本
@ -147,6 +148,7 @@ export const Businesstype = useCrudSchemas(reactive<CrudSchema[]>([
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
multiple: true,
enterSearch: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择库区代码', // 输入框占位文本

6
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 = {}
if(formField == 'outAreaCodes'||formField == 'inAreaCodes'){
//
setV[formField] = val.map(item=>(item[searchField])).join(',')
}else{
setV[formField] = val[0][searchField]
}
formRef.setValues(setV)
})
}

3
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)
}

5
src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts

@ -88,6 +88,11 @@ export const CustomerreturnJobMain = useCrudSchemas(
key: 'status',
value: '0',
isMainValue: false
},
{
key: 'customerCode',
value: 'customerCode',
isMainValue: true
}
],
verificationParams: [

5
src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts

@ -99,6 +99,11 @@ export const CustomerreturnRecordMain = useCrudSchemas(
key: 'status',
value: '0',
isMainValue: false
},
{
key: 'customerCode',
value: 'customerCode',
isMainValue: true
}
],
verificationParams: [

5
src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts

@ -226,6 +226,11 @@ export const CustomerreturnRequestMain = useCrudSchemas(
key: 'status',
value: '0',
isMainValue: false
},
{
key: 'customerCode',
value: 'customerCode',
isMainValue: true
}
],
verificationParams: [

3
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']

150
src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts

@ -2,10 +2,14 @@ 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<CrudSchema[]>([
export const ScrapJobMain = useCrudSchemas(
reactive<CrudSchema[]>([
{
label: '单据号',
field: 'number',
@ -14,7 +18,7 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 180,
fixed: 'left'
},
isSearch: true,
isSearch: true
},
{
label: '状态',
@ -26,7 +30,7 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '申请单号',
@ -35,7 +39,52 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
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: '申请时间',
@ -53,9 +102,9 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '要求截止时间',
@ -73,9 +122,9 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '过期时间',
@ -93,9 +142,9 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '从仓库代码',
@ -103,7 +152,7 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '从库区代码范围',
@ -111,7 +160,7 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '从库区类型范围',
@ -122,7 +171,7 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '到库区类型范围',
@ -133,7 +182,7 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
// {
// label: '状态',
@ -151,7 +200,7 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
form: {
component: 'InputNumber',
component: 'InputNumber'
}
},
{
@ -162,7 +211,7 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
form: {
component: 'InputNumber',
component: 'InputNumber'
}
},
{
@ -171,7 +220,7 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '部门',
@ -179,7 +228,7 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '备注',
@ -187,7 +236,7 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '自动完成',
@ -204,9 +253,9 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '允许修改库位',
@ -223,9 +272,9 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '允许修改数量',
@ -242,9 +291,9 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '允许大于推荐数量',
@ -261,9 +310,9 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '允许小于推荐数量',
@ -280,9 +329,9 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '允许修改库存状态',
@ -299,9 +348,9 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '允许连续扫描',
@ -318,9 +367,9 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '允许部分完成',
@ -337,9 +386,9 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '允许修改批次',
@ -356,9 +405,9 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '允许修改箱码',
@ -375,9 +424,9 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '承接时间',
@ -395,9 +444,9 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '承接人',
@ -405,7 +454,7 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '完成时间',
@ -423,9 +472,9 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '完成人',
@ -433,7 +482,7 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '创建时间',
@ -451,7 +500,7 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
},
isTable: false
@ -482,9 +531,9 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '最后更新者',
@ -493,7 +542,7 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '操作',
@ -503,9 +552,10 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 120,
fixed: 'right'
},
}
]))
}
])
)
//表单校验
export const ScrapJobMainRules = reactive({

100
src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts

@ -2,10 +2,14 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
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<CrudSchema[]>([
export const ScrapRecordMain = useCrudSchemas(
reactive<CrudSchema[]>([
{
label: '单据号',
field: 'number',
@ -34,6 +38,51 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
},
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',
@ -50,9 +99,9 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '截止时间',
@ -70,9 +119,9 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '执行时间',
@ -90,9 +139,9 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '生效日期',
@ -111,9 +160,9 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' },
type: 'date',
dateFormat: 'YYYY-MM-DD',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '从仓库代码',
@ -121,7 +170,7 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '从库区类型范围',
@ -132,7 +181,7 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '从库区代码范围',
@ -140,7 +189,7 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '出库事务类型',
@ -148,7 +197,7 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '入库事务类型',
@ -156,7 +205,7 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '业务类型',
@ -164,7 +213,7 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '部门',
@ -172,7 +221,7 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '接口类型',
@ -183,7 +232,7 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '备注',
@ -191,7 +240,7 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '创建时间',
@ -210,9 +259,9 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '创建者',
@ -221,7 +270,7 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
isTable: false,
table: {
width: 150
},
}
},
{
@ -244,7 +293,7 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
@ -280,9 +329,10 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
inactiveValue: 'FALSE',
activeValue: 'TRUE'
}
},
},
]))
}
}
])
)
//表单校验
export const ScrapRecordMainRules = reactive({

116
src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts

@ -5,8 +5,11 @@ 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 {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() // 国际化
@ -31,7 +34,8 @@ const userDeptArray:any = [userDept]
/**
* @returns {Array}
*/
export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
export const ScrapRequestMain = useCrudSchemas(
reactive<CrudSchema[]>([
{
label: '单据号',
field: 'number',
@ -41,7 +45,52 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
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: '状态',
@ -79,10 +128,10 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
},
isForm: false,
isForm: false
},
{
label: '截止时间',
@ -101,9 +150,9 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '从仓库代码',
@ -121,19 +170,23 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
searchTitle: '仓库信息',
searchAllSchemas: Warehouse.allSchemas,
searchPage: WarehouseApi.getWarehousePage,
searchCondition: [{
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
}],
verificationParams: [{
}
],
verificationParams: [
{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
isFormModel: true
}
] // 失去焦点校验参数
},
form: {
// labelMessage: '信息提示说明!!!',
@ -145,19 +198,23 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
searchTitle: '仓库信息', // 查询弹窗标题
searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
searchCondition: [{
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
}],
verificationParams: [{
}
],
verificationParams: [
{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
isFormModel: true
}
] // 失去焦点校验参数
}
}
},
@ -172,7 +229,7 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
isSearch: true,
isForm: false,
isForm: false
},
{
label: '从库区代码范围',
@ -181,7 +238,7 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isForm: false,
isForm: false
},
{
label: '业务类型',
@ -196,7 +253,7 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
disabled: true
}
},
isForm: false,
isForm: false
},
{
label: '部门',
@ -230,7 +287,7 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
isTable: false,
table: {
width: 150
},
}
},
{
label: '自动提交',
@ -333,11 +390,11 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
},
isTable: false,
isForm: false,
isForm: false
},
{
label: '创建者',
@ -347,7 +404,7 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
isTable: false,
isForm: false,
isForm: false
},
{
label: '最后更新时间',
@ -366,11 +423,11 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
},
isTable: false,
isForm: false,
isForm: false
},
{
label: '最后更新者',
@ -380,7 +437,7 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
isTable: false,
isForm: false,
isForm: false
},
{
label: '操作',
@ -390,9 +447,10 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 300,
fixed: 'right'
},
}
]))
}
])
)
//表单校验
export const ScrapRequestMainRules = reactive({

18
src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts

@ -279,15 +279,15 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
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',

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

@ -197,9 +197,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
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') {

122
src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts

@ -21,7 +21,8 @@ const { t } = useI18n() // 国际化
/**
* @returns {Array} 退
*/
export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
export const ProductionreturnRequestDetail = useCrudSchemas(
reactive<CrudSchema[]>([
{
label: '生产线代码',
field: 'productionLineCode',
@ -40,16 +41,19 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
searchTitle: '生产线信息', // 查询弹窗标题
searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
searchCondition:[{
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
},
{
key: 'workshopCode',
value: 'workshopCode',
message: '请选择车间信息!', // 当前置条件为空时 弹出信息提示
isMainValue: true
}]
}
]
}
},
tableForm: {
@ -59,17 +63,20 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
searchTitle: '生产线信息', // 查询弹窗标题
searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
searchCondition:[{
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
},
{
key: 'workshopCode',
value: 'workshopCode',
message: '请选择车间信息!', // 当前置条件为空时 弹出信息提示
isMainValue: true
}]
},
}
]
}
},
{
label: '工位代码',
@ -87,21 +94,25 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
searchTitle: '工位信息', // 查询弹窗标题
searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
searchCondition:[{
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
},
{
key: 'workshopCode',
value: 'workshopCode',
message: '请选择车间信息!',
isMainValue: true
},{
},
{
key: 'productionLineCode',
value: 'productionLineCode',
message: '请选择生产线信息!',
isMainValue: true
}]
}
]
}
},
tableForm: {
@ -113,34 +124,39 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
searchTitle: '工位信息', // 查询弹窗标题
searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
searchCondition:[{
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: [{
verificationParams: [
{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
},
isFormModel: true
}
] // 失去焦点校验参数
}
},
{
@ -159,16 +175,19 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
searchTitle: '库存余额信息', // 查询弹窗标题
searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
searchCondition:[{
searchCondition: [
{
key: 'locationCode',
value: 'fromLocationCode',
message: '请填写从库位代码!',
isMainValue: true
},{
},
{
key: 'inventoryStatus',
value: 'OK',
isMainValue: false
}]
}
]
}
},
tableForm: {
@ -189,12 +208,14 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
key: 'inventoryStatus',
value: 'OK',
isMainValue: false
},{
},
{
key: 'businessType',
value: 'ReturnToHold', // 隔离退料
isMainValue: false
}]
},
}
]
}
},
// {
// label: '包装号',
@ -236,7 +257,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
width: 150
},
isTableForm: false,
isForm: false,
isForm: false
},
{
label: '物料描述1',
@ -247,7 +268,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
},
hiddenInMain: true,
isTableForm: false,
isForm: false,
isForm: false
},
{
label: '物料描述2',
@ -258,7 +279,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
},
hiddenInMain: true,
isTableForm: false,
isForm: false,
isForm: false
},
{
label: '批次',
@ -268,11 +289,11 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
width: 150
},
tableForm: {
disabled: false
disabled: true
},
form: {
componentProps: {
disabled: false
disabled: true
}
}
},
@ -363,7 +384,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
},
hiddenInMain: true,
isTableForm: false,
isForm: false,
isForm: false
},
{
label: '到货主',
@ -374,7 +395,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
},
hiddenInMain: true,
isTableForm: false,
isForm: false,
isForm: false
},
{
label: '项目代码',
@ -385,7 +406,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
},
hiddenInMain: true,
isTableForm: false,
isForm: false,
isForm: false
},
{
label: '单据号',
@ -409,7 +430,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 150
},
hiddenInMain: true,
hiddenInMain: true
},
{
label: '创建者',
@ -441,12 +462,12 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
},
isTableForm: false,
isForm: false,
isTable: true,
isTable: true
},
{
label: '包装规格',
@ -465,16 +486,19 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
searchTitle: '物料包装信息', // 查询弹窗标题
searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
searchCondition: [{
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
},
{
key: 'itemCode',
value: 'itemCode',
message: '请先选择物料代码!',
isMainValue: true
}]
}
]
},
form: {
// labelMessage: '信息提示说明!!!',
@ -485,16 +509,19 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
searchTitle: '物料包装信息', // 查询弹窗标题
searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
searchCondition: [{
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
},
{
key: 'itemCode',
value: 'itemCode',
message: '请先选择物料代码!', // 当前置条件为空时 弹出信息提示
isMainValue: true
}]
}
]
}
}
},
@ -551,7 +578,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
},
isTableForm: false,
@ -577,9 +604,10 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
width: 250,
fixed: 'right'
},
isTableForm:false,
isTableForm: false
}
]))
])
)
//表单校验
export const ProductionreturnRequestDetailRules = reactive({

100
src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts

@ -1,10 +1,14 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
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<CrudSchema[]>([
export const ProductionscrapRecordMain = useCrudSchemas(
reactive<CrudSchema[]>([
{
label: '单据号',
field: 'number',
@ -24,13 +28,58 @@ export const ProductionscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
},
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
},
}
},
{
label: '出库事务类型',
@ -39,7 +88,7 @@ export const ProductionscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '入库事务类型',
@ -48,7 +97,7 @@ export const ProductionscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '执行时间',
@ -67,9 +116,9 @@ export const ProductionscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '生效日期',
@ -89,9 +138,9 @@ export const ProductionscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' },
type: 'date',
dateFormat: 'YYYY-MM-DD',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '申请时间',
@ -110,9 +159,9 @@ export const ProductionscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '截止时间',
@ -131,9 +180,9 @@ export const ProductionscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '部门',
@ -142,7 +191,7 @@ export const ProductionscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '接口类型',
@ -153,7 +202,7 @@ export const ProductionscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '业务类型',
@ -162,7 +211,7 @@ export const ProductionscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '备注',
@ -171,7 +220,7 @@ export const ProductionscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
// {
// label: '创建者',
@ -223,7 +272,7 @@ export const ProductionscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
@ -244,7 +293,7 @@ export const ProductionscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '从库区类型范围',
@ -255,7 +304,7 @@ export const ProductionscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '从库区代码范围',
@ -264,7 +313,7 @@ export const ProductionscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '到仓库代码',
@ -273,7 +322,7 @@ export const ProductionscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '到库区类型范围',
@ -284,7 +333,7 @@ export const ProductionscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '到库区代码范围',
@ -293,7 +342,7 @@ export const ProductionscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '是否可用',
@ -314,8 +363,9 @@ export const ProductionscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
activeValue: 'TRUE'
}
}
},
]))
}
])
)
//表单校验
export const ProductionscrapRecordMainRules = reactive({

134
src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts

@ -23,6 +23,9 @@ import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplie
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() // 国际化
// 获取自动提交自动通过自动执行,跳过任务直接删生成记录的默认值
@ -44,7 +47,8 @@ const queryParams = {
/**
* @returns {Array} 退
*/
export const ProductionscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
export const ProductionscrapRequestMain = useCrudSchemas(
reactive<CrudSchema[]>([
{
label: '单据号',
field: 'number',
@ -54,7 +58,52 @@ export const ProductionscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
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: '状态',
@ -93,21 +142,25 @@ export const ProductionscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
searchTitle: '车间信息', // 查询弹窗标题
searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
searchCondition:[{
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
}],
verificationParams: [{
}
],
verificationParams: [
{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
isFormModel: true
}
] // 失去焦点校验参数
}
}
},
},
{
label: '生产线代码',
@ -126,24 +179,29 @@ export const ProductionscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
searchTitle: '生产线信息', // 查询弹窗标题
searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
searchCondition:[{
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
},
{
key: 'workshopCode',
value: 'workshopCode',
message: '请选择车间信息!', // 当前置条件为空时 弹出信息提示
isMainValue: true
}],
verificationParams: [{
}
],
verificationParams: [
{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
isFormModel: true
}
] // 失去焦点校验参数
}
},
tableForm: {
@ -153,17 +211,20 @@ export const ProductionscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
searchTitle: '生产线信息', // 查询弹窗标题
searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
searchCondition:[{
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
},
{
key: 'workshopCode',
value: 'workshopCode',
message: '请选择车间信息!', // 当前置条件为空时 弹出信息提示
isMainValue: true
}]
},
}
]
}
},
{
label: '申请时间',
@ -183,10 +244,10 @@ export const ProductionscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
},
isForm: false,
isForm: false
},
{
label: '截止时间',
@ -206,9 +267,9 @@ export const ProductionscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '从库区类型范围',
@ -220,7 +281,7 @@ export const ProductionscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
table: {
width: 150
},
isForm: false,
isForm: false
},
{
label: '到库区类型范围',
@ -233,7 +294,7 @@ export const ProductionscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
table: {
width: 150
},
isForm: false,
isForm: false
},
{
label: '从库区代码范围',
@ -243,7 +304,7 @@ export const ProductionscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
width: 150
},
isTable: false,
isForm: false,
isForm: false
},
{
label: '到库区代码范围',
@ -253,7 +314,7 @@ export const ProductionscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
width: 150
},
isTable: false,
isForm: false,
isForm: false
},
{
label: '从仓库代码',
@ -263,7 +324,7 @@ export const ProductionscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
width: 150
},
isTable: false,
isForm: false,
isForm: false
},
{
label: '到仓库代码',
@ -273,7 +334,7 @@ export const ProductionscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
width: 150
},
isTable: false,
isForm: false,
isForm: false
},
{
label: '备注',
@ -292,7 +353,7 @@ export const ProductionscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
width: 150
},
isTable: false,
isForm: false,
isForm: false
},
{
label: '部门',
@ -336,7 +397,7 @@ export const ProductionscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
componentProps: {
inactiveValue: 'FALSE',
activeValue: 'TRUE',
disabled: true,
disabled: true
}
}
},
@ -357,7 +418,7 @@ export const ProductionscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
componentProps: {
inactiveValue: 'FALSE',
activeValue: 'TRUE',
disabled: true,
disabled: true
}
}
},
@ -378,7 +439,7 @@ export const ProductionscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
componentProps: {
inactiveValue: 'FALSE',
activeValue: 'TRUE',
disabled: true,
disabled: true
}
}
},
@ -399,7 +460,7 @@ export const ProductionscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
componentProps: {
inactiveValue: 'FALSE',
activeValue: 'TRUE',
disabled: true,
disabled: true
}
}
},
@ -420,7 +481,7 @@ export const ProductionscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
},
isTable: false,
@ -454,7 +515,7 @@ export const ProductionscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
},
isForm: false
@ -478,9 +539,10 @@ export const ProductionscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
width: 300,
fixed: 'right'
},
isTable: false,
isTable: false
}
]))
])
)
//表单校验
export const ProductionscrapRequestMainRules = reactive({

1
src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts

@ -174,6 +174,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
enterSearch:true,
isSearchList: true,
searchListPlaceholder: '请选择生产线代码',
searchField: 'code',

118
src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts

@ -1,10 +1,14 @@
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<CrudSchema[]>([
export const ProductscrapJobMain = useCrudSchemas(
reactive<CrudSchema[]>([
{
label: '单据号',
field: 'number',
@ -13,7 +17,7 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 180,
fixed: 'left'
},
isSearch: true,
isSearch: true
},
{
label: '申请单号',
@ -22,7 +26,52 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
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: '从仓库代码',
@ -30,7 +79,7 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '申请时间',
@ -48,9 +97,9 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '要求截止时间',
@ -68,9 +117,9 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '状态',
@ -82,7 +131,7 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '过期时间',
@ -100,9 +149,9 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '最后更新时间',
@ -120,9 +169,9 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '最后更新者',
@ -130,7 +179,7 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
// {
// label: '状态',
@ -144,23 +193,23 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '优先级',
field: 'priority',
form: {
component: 'InputNumber',
component: 'InputNumber'
},
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '优先级增量',
field: 'priorityIncrement',
form: {
component: 'InputNumber',
component: 'InputNumber'
},
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '部门',
@ -168,7 +217,7 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '承接人',
@ -176,7 +225,7 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '承接时间',
@ -194,9 +243,9 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '完成人',
@ -204,7 +253,7 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '完成时间',
@ -222,9 +271,9 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '从库区类型范围',
@ -235,7 +284,7 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '到库区类型范围',
@ -246,7 +295,7 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '业务类型',
@ -254,7 +303,7 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '备注',
@ -262,7 +311,7 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '创建时间',
@ -280,9 +329,9 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '创建者',
@ -290,7 +339,7 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '从库区代码范围',
@ -298,7 +347,7 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '自动完成',
@ -498,9 +547,10 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 120,
fixed: 'right'
},
}
]))
}
])
)
//表单校验
export const ProductscrapJobMainRules = reactive({

101
src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts

@ -1,11 +1,14 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
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<CrudSchema[]>([
export const ProductscrapRecordMain = useCrudSchemas(
reactive<CrudSchema[]>([
{
label: '单据号',
field: 'number',
@ -25,6 +28,51 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
},
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: 'status',
@ -35,7 +83,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '车间',
@ -77,7 +125,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 180,
show: false
},
isTable: false,
isTable: false
},
{
label: '出库事务类型',
@ -86,7 +134,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '入库事务类型',
@ -95,7 +143,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '执行时间',
@ -114,9 +162,9 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '生效日期',
@ -136,9 +184,9 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' },
type: 'date',
dateFormat: 'YYYY-MM-DD',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '申请时间',
@ -157,9 +205,9 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '截止时间',
@ -178,9 +226,9 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '部门',
@ -189,7 +237,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '接口类型',
@ -200,7 +248,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '业务类型',
@ -209,7 +257,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '备注',
@ -218,7 +266,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '创建者',
@ -227,7 +275,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: true,
isTable: true
},
{
label: '创建时间',
@ -246,9 +294,9 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '最后更新时间',
@ -270,7 +318,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
@ -300,7 +348,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150,
show: false
},
isTable: false,
isTable: false
},
{
label: '从库区类型范围',
@ -311,7 +359,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '从库区代码范围',
@ -320,7 +368,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '是否可用',
@ -341,8 +389,9 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
activeValue: 'TRUE'
}
}
},
]))
}
])
)
//表单校验
export const ProductscrapRecordMainRules = reactive({

25
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 == '') {
if(!isSave){
message.warning('请选择物料代码!')
}
return
}
if(row.qty <= 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,8 +284,12 @@ const buttonOperationClick = async (row, label, index)=> {
const obj = await banchBomPage(row.fromLocationCode, item)
item.batch = obj.batch
})
if(isSave){
buttonBaseClickBom('save')
}else{
detailBomRef.value.open('create', row, null,'viewDetail')//
}
}
//
const searchTableBomSuccess = (formField, searchField, val, formRef, type, row ) => {
@ -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) =>{

195
src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts

@ -4,26 +4,25 @@ 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() // 国际化
@ -45,11 +44,11 @@ const queryParams = {
userDept.id = userDept.id.toString()
const userDeptArray: any = [userDept]
/**
* @returns {Array}
*/
export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
export const ProductscrapRequestMain = useCrudSchemas(
reactive<CrudSchema[]>([
{
label: '单据号',
field: 'number',
@ -59,7 +58,52 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
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: '状态',
@ -98,19 +142,23 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
searchTitle: '车间信息',
searchAllSchemas: Workshop.allSchemas,
searchPage: WorkshopApi.getWorkshopPage,
searchCondition: [{
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
}],
verificationParams: [{
}
],
verificationParams: [
{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
isFormModel: true
}
] // 失去焦点校验参数
}
}
},
@ -129,24 +177,29 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
searchTitle: '生产线信息', // 查询弹窗标题
searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
searchCondition: [{
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
},
{
key: 'workshopCode',
value: 'workshopCode',
message: '请填写车间代码!',
isMainValue: true
}],
verificationParams: [{
}
],
verificationParams: [
{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
isFormModel: true
}
] // 失去焦点校验参数
},
form: {
// labelMessage: '信息提示说明!!!',
@ -158,24 +211,29 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
searchTitle: '生产线信息', // 查询弹窗标题
searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
searchCondition: [{
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
},
{
key: 'workshopCode',
value: 'workshopCode',
message: '请填写车间代码!',
isMainValue: true
}],
verificationParams: [{
}
],
verificationParams: [
{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
isFormModel: true
}
] // 失去焦点校验参数
}
}
},
@ -196,19 +254,23 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
searchTitle: '班组信息',
searchAllSchemas: Team.allSchemas,
searchPage: TeamApi.getTeamPage,
searchCondition: [{
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
}],
verificationParams: [{
}
],
verificationParams: [
{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
isFormModel: true
}
] // 失去焦点校验参数
}
}
},
@ -229,19 +291,23 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
searchTitle: '班次信息',
searchAllSchemas: Shift.allSchemas,
searchPage: ShiftApi.getShiftPage,
searchCondition: [{
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
}],
verificationParams: [{
}
],
verificationParams: [
{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
isFormModel: true
}
] // 失去焦点校验参数
}
}
},
@ -266,7 +332,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isForm: false,
isForm: false
},
{
label: '从库区代码范围',
@ -277,7 +343,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
},
isTable: false,
isSearch: true,
isForm: false,
isForm: false
},
{
label: '业务类型',
@ -293,7 +359,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
disabled: true
}
},
isForm: false,
isForm: false
},
{
@ -314,10 +380,10 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
},
isForm: false,
isForm: false
},
{
label: '创建者',
@ -327,7 +393,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
isTable: false,
isForm: false,
isForm: false
},
{
label: '申请时间',
@ -347,10 +413,10 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
},
isForm: false,
isForm: false
},
// {
// label: '截止时间',
@ -426,7 +492,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
},
isForm: false
@ -533,9 +599,10 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 300,
fixed: 'right'
},
}
]))
}
])
)
//表单校验
export const ProductscrapRequestMainRules = reactive({
@ -858,6 +925,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
tableForm: {
type: 'InputNumber',
default:1,
min: 0,
precision: 6
}
@ -1176,6 +1244,14 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
}
},
]))
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' }
// ],

11
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue

@ -206,6 +206,15 @@ const isShowMainButton = (row,val) => {
}
}
//
const isShowSourceTypeButton = (row) => {
if (row.sourceType == 'EDI' || row.sourceType == 'ASN_ExternalReceipt') {
return true
} else {
return false
}
}
// -
const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
@ -227,7 +236,7 @@ const butttondata = (row,$index) => {
hasPermi: 'wms:purchasereceipt-job-main:refusal',
link: true //
},
defaultButtons.mainListPlanCheckQualityReportBtn({}), //
defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), //
]
}

4
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts

@ -86,12 +86,12 @@ export const PurchasereceiptJobMain = useCrudSchemas(
width: 150
},
form: {
value: 'ASN_ExternalReceipt',
componentProps: {
disabled: true
}
},
isSearch: false,
sortTableDefault: 5
isSearch: true,
},
{
label: '运输方式',

12
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue

@ -164,6 +164,15 @@ const buttonBaseClick = (val, item) => {
}
}
//
const isShowSourceTypeButton = (row) => {
if (row.sourceType == 'EDI' || row.sourceType == 'ASN_ExternalReceipt') {
return true
} else {
return false
}
}
// -
const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
@ -173,7 +182,8 @@ const butttondata = (row,$index) => {
return [
defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),//
defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),//
defaultButtons.mainListPlanCheckQualityReportBtn({hide:row.orderTypeM == "2"}), //
//defaultButtons.mainListPlanCheckQualityReportBtn({hide:row.orderTypeM == "2"}), //
defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), //
]
}

2
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@ -124,12 +124,12 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
form: {
value: 'ASN_ExternalReceipt',
componentProps: {
disabled: true
}
},
isSearch: false,
isTable:false
},
{
label: '车牌号',

127
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts

@ -1,10 +1,14 @@
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<CrudSchema[]>([
export const PurchasereturnJobMain = useCrudSchemas(
reactive<CrudSchema[]>([
{
label: '单据号',
field: 'number',
@ -14,7 +18,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
fixed: 'left'
},
isSearch: true,
sortSearchDefault: 1,
sortSearchDefault: 1
},
{
label: '申请单号',
@ -23,7 +27,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
isTable: false
},
{
label: '采购收货记录单号',
@ -54,8 +58,56 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
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: 'supplierCode',
@ -74,7 +126,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '承运商',
@ -83,7 +135,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '运输方式',
@ -92,7 +144,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '车牌号',
@ -101,7 +153,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '从仓库代码',
@ -110,7 +162,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '到仓库代码',
@ -119,7 +171,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '从库区类型范围',
@ -131,7 +183,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '到库区类型范围',
@ -142,7 +194,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '从库区代码范围',
@ -151,7 +203,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
isTable: false,
table: {
width: 150
},
}
},
{
label: '到库区代码范围',
@ -160,7 +212,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
isTable: false,
table: {
width: 150
},
}
},
{
label: '从月台代码',
@ -169,7 +221,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
isTable: false,
table: {
width: 150
},
}
},
{
label: '申请时间',
@ -188,9 +240,9 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '要求截止时间',
@ -209,9 +261,9 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '业务类型',
@ -220,7 +272,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '状态',
@ -259,9 +311,9 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '优先级',
@ -272,7 +324,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
},
isTable: false,
form: {
component: 'InputNumber',
component: 'InputNumber'
}
},
{
@ -284,7 +336,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
},
isTable: false,
form: {
component: 'InputNumber',
component: 'InputNumber'
}
},
{
@ -294,7 +346,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '承接人',
@ -303,7 +355,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '承接时间',
@ -322,9 +374,9 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '完成人',
@ -333,7 +385,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '完成时间',
@ -352,9 +404,9 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '自动完成',
@ -553,7 +605,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '创建者',
@ -562,7 +614,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: true,
isTable: true
},
{
label: '创建时间',
@ -581,9 +633,9 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '操作',
@ -593,9 +645,10 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 120,
fixed: 'right'
},
}
]))
}
])
)
//表单校验
export const PurchasereturnJobMainRules = reactive({

100
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts

@ -1,10 +1,14 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
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<CrudSchema[]>([
export const PurchasereturnRecordMain = useCrudSchemas(
reactive<CrudSchema[]>([
{
label: '单据号',
field: 'number',
@ -44,8 +48,9 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
},
isSearch: true,
sortTableDefault: 3,
sortSearchDefault: 5,
}, {
sortSearchDefault: 5
},
{
label: 'qad采购退货记录单号',
field: 'qadPurchaseReturnRecordCode',
sort: 'custom',
@ -76,6 +81,52 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
},
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: 'supplierCode',
@ -168,7 +219,7 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '到库区类型范围',
@ -179,7 +230,7 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '从库区代码范围',
@ -188,7 +239,7 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '到库区代码范围',
@ -197,7 +248,7 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '执行时间',
@ -216,9 +267,9 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '生效日期',
@ -238,9 +289,9 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' },
type: 'date',
dateFormat: 'YYYY-MM-DD',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '申请时间',
@ -259,9 +310,9 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '截止时间',
@ -280,9 +331,9 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '部门',
@ -291,7 +342,7 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
// {
// label: '代码',
@ -310,7 +361,7 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '业务类型',
@ -319,7 +370,7 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '是否可用',
@ -330,7 +381,7 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
// {
// label: '原因',
@ -358,9 +409,9 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '创建者',
@ -369,7 +420,7 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '操作',
@ -379,9 +430,10 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150,
fixed: 'right'
},
}
]))
}
])
)
//表单校验
export const PurchasereturnRecordMainRules = reactive({

6
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]

155
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts

@ -2,18 +2,22 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
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 {
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 = {
@ -33,9 +37,9 @@ const queryParams = {
userDept.id = userDept.id.toString()
const userDeptArray: any = [userDept]
// 采购收货记录展示列
export const PurchasereceiptRecordMain1 = useCrudSchemas(reactive<CrudSchema[]>([
export const PurchasereceiptRecordMain1 = useCrudSchemas(
reactive<CrudSchema[]>([
{
label: '物料代码',
field: 'itemCode',
@ -80,7 +84,7 @@ export const PurchasereceiptRecordMain1 = useCrudSchemas(reactive<CrudSchema[]>(
sort: 'custom',
table: {
width: 150
},
}
},
{
@ -89,7 +93,7 @@ export const PurchasereceiptRecordMain1 = useCrudSchemas(reactive<CrudSchema[]>(
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '批次', // 实际是子表的从批次,为了不影响页面,单独放上面
@ -99,7 +103,7 @@ export const PurchasereceiptRecordMain1 = useCrudSchemas(reactive<CrudSchema[]>(
isTableForm: false,
table: {
width: 150
},
}
},
{
label: '计量单位',
@ -110,7 +114,7 @@ export const PurchasereceiptRecordMain1 = useCrudSchemas(reactive<CrudSchema[]>(
sort: 'custom',
table: {
width: 150
},
}
},
// {
// label: '包装规格',
@ -137,16 +141,16 @@ export const PurchasereceiptRecordMain1 = useCrudSchemas(reactive<CrudSchema[]>(
sort: 'custom',
table: {
width: 150
},
},
]))
}
}
])
)
/**
* @returns {Array} 退
*/
export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
export const PurchasereturnRequestMain = useCrudSchemas(
reactive<CrudSchema[]>([
{
label: '单据号',
field: 'number',
@ -156,7 +160,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
fixed: 'left'
},
isForm: false,
isSearch: true,
isSearch: true
},
{
label: '状态',
@ -196,14 +200,16 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
searchTitle: '供应商信息', // 查询弹窗标题
searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
verificationParams: [{
verificationParams: [
{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
isFormModel: true
}
] // 失去焦点校验参数
}
}
},
@ -230,15 +236,18 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
key: 'supplierCode',
value: 'supplierCode',
isMainValue: true
}],
verificationParams: [{
}
],
verificationParams: [
{
key: 'number',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
isFormModel: true
}
] // 失去焦点校验参数
}
}
},
@ -260,7 +269,57 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 180
},
isForm: false,
isTable: 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
}
] // 失去焦点校验参数
}
}
},
{
label: '承运商',
@ -269,7 +328,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '运输方式',
@ -280,7 +339,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '车牌号',
@ -289,7 +348,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '从仓库代码',
@ -299,7 +358,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
isForm: false,
isTable: false,
isTable: false
},
{
label: '到仓库代码',
@ -310,7 +369,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
},
isTableForm: false,
isForm: false,
isTable: false,
isTable: false
},
{
label: '从库区类型范围',
@ -322,7 +381,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isForm: false,
isForm: false
},
{
label: '到库区类型范围',
@ -335,7 +394,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
isTableForm: false,
isForm: false,
isForm: false
},
{
label: '从库区代码范围',
@ -345,7 +404,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
isForm: false,
isTable: false,
isTable: false
},
{
label: '到库区代码范围',
@ -356,7 +415,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
},
isForm: false,
isTable: false,
isTableForm:false,
isTableForm: false
},
{
label: '从月台代码',
@ -366,8 +425,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
isForm: false,
isTable: false,
isTable: false
},
{
label: '业务类型',
@ -383,7 +441,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
}
},
isForm: false,
isTable: false,
isTable: false
},
{
label: '申请时间',
@ -402,11 +460,11 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
},
isForm: false,
isTable: false,
isTable: false
},
{
label: '截止时间',
@ -426,9 +484,9 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '部门',
@ -463,7 +521,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '创建时间',
@ -482,7 +540,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
@ -515,7 +573,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
@ -621,9 +679,10 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 300,
fixed: 'right'
},
}
]))
}
])
)
//表单校验
export const PurchasereturnRequestMainRules = reactive({

Loading…
Cancel
Save