Browse Source

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

master_hella_20240701
chenfang 7 months ago
parent
commit
45cf076870
  1. 8
      .env.wyf
  2. 8
      src/components/BasicForm/src/BasicForm.vue
  3. 7
      src/components/Detail/src/Detail.vue
  4. 7
      src/components/Form/src/Form.vue
  5. 15
      src/components/Search/src/Search.vue
  6. 10
      src/components/Table/src/Table.vue
  7. 2
      src/components/TableForm/src/TableForm.vue
  8. 10
      src/components/rowDrop/index.vue
  9. 3
      src/hooks/web/useCrudSchemas.ts
  10. 2
      src/layout/components/CategoryHeader.vue
  11. 3
      src/views/qms/aql/aql.data.ts
  12. 39
      src/views/qms/basicDataManage/counter/counter.data.ts
  13. 3
      src/views/qms/basicDataManage/inspectionScheme/addForm.vue
  14. 17
      src/views/qms/basicDataManage/inspectionScheme/inspectionScheme.data.ts
  15. 3
      src/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data.ts
  16. 9
      src/views/qms/inspection/inspectionJob/addForm.vue
  17. 16
      src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
  18. 34
      src/views/qms/inspection/inspectionRecord/addForm.vue
  19. 54
      src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts
  20. 26
      src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts
  21. 20
      src/views/qms/qualityNotice/qualityNoticeMain.data.ts
  22. 3
      src/views/qms/sampleCode/sampleCode.data.ts
  23. 24
      src/views/qms/samplingProcess/samplingProcess.data.ts
  24. 10
      src/views/wms/agvManage/interfaceInfo/index.vue
  25. 31
      src/views/wms/agvManage/interfaceInfo/interfaceInfo.data.ts
  26. 2
      src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
  27. 18
      src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
  28. 15
      src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue
  29. 31
      src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
  30. 21
      src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue
  31. 22
      src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue
  32. 29
      src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
  33. 15
      src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue
  34. 29
      src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue
  35. 21
      src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
  36. 22
      src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
  37. 29
      src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
  38. 31
      src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
  39. 21
      src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
  40. 15
      src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue
  41. 29
      src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
  42. 1
      src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
  43. 127
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
  44. 140
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
  45. 67
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
  46. 23
      src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
  47. 41
      src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
  48. 23
      src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
  49. 37
      src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
  50. 84
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
  51. 330
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
  52. 49
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
  53. 12
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
  54. 6
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
  55. 12
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
  56. 4
      src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue

8
.env.wyf

@ -6,7 +6,7 @@ VITE_DEV=false
# 请求路径
VITE_BASE_URL='http://192.168.0.108:12080'
# 上传路径
VITE_UPLOAD_URL='http://192.168.0.108:12080/api/admin-api/infra/file/upload'
VITE_UPLOAD_URL='http://192.168.0.108:12080/admin-api/infra/file/upload'
# # 请求路径
# VITE_BASE_URL='http://dev.ccwin-in.com:25300/api'
@ -40,3 +40,9 @@ VITE_INTERFACE_URL='http://192.168.0.108:12080/magic/web/index.html'
# 积木报表请求路径
VITE_JMREPORT_BASE_URL='http://192.168.0.108:12080'
# # 自定义接口路径
# VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html'
# # 积木报表请求路径
# VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310'

8
src/components/BasicForm/src/BasicForm.vue

@ -15,6 +15,7 @@
:schema="formSchema"
:is-col="true"
@opensearchTable="opensearchTable"
@clearSearchInput="clearSearchInput"
@onChange="onChange"
@onBlur="onBlur"
@onEnter="onEnter"
@ -413,7 +414,9 @@ const opensearchTable = (
)
}
const clearSearchInput = (field)=>{
emit('clearSearchInput',field)
}
const sumFormDataByTable = () => {
if(props.sumFormDataField){
const sumObject = {}
@ -603,7 +606,8 @@ const emit = defineEmits([
'onEnter',
'inputNumberChange',
'formFormDateChange',
'footButtonClick'
'footButtonClick',
'clearSearchInput'
])
//
const formSelectChange = (field, val, row) => {

7
src/components/Detail/src/Detail.vue

@ -409,10 +409,13 @@ if (!tabsList.value || tabsList.value && tabsList.value.length == otherList.leng
prop: 'Detail'
})
}
tabsList.value.unshift({
if(!props.isBasic){
tabsList.value.unshift({
label: '主数据',
prop: 'Descriptions'
})
})
}
// Tabs
const tabRef = ref()

7
src/components/Form/src/Form.vue

@ -54,7 +54,7 @@ export default defineComponent({
vLoading: propTypes.bool.def(false),
labelPosition: propTypes.string.def('left'),
},
emits: ['register','opensearchTable', 'onChange', 'onBlur','onEnter'],
emits: ['register','opensearchTable','clearSearchInput', 'onChange', 'onBlur','onEnter'],
setup(props, { slots, expose, emit }) {
// element form
const elFormRef = ref<ComponentRef<typeof ElForm>>()
@ -124,6 +124,9 @@ export default defineComponent({
emit('opensearchTable',field, searchField, searchTitle, searchAllSchemas, searchPage, searchCondition,multiple)
}
const clearSearchInput = (field) => {
emit('clearSearchInput')
}
expose({
setValues,
formModel,
@ -258,6 +261,7 @@ export default defineComponent({
}else{
formModel.value[item.field] = ''
}
clearSearchInput(item.field)
}}>
</ElButton>
)
@ -292,6 +296,7 @@ export default defineComponent({
}else{
formModel.value[item.field] = ''
}
clearSearchInput(item.field)
}}>
</ElButton>
)

15
src/components/Search/src/Search.vue

@ -66,8 +66,23 @@ const newSchema = computed(() => {
}
])
}
updateSort(schema)
return schema
})
const updateSort= (val)=>{
val.forEach(item=>{
if(!item.sortSearchDefault){
if(item.field=="action"){
item.sortSearchDefault = 9999 //
}else{
item.sortSearchDefault = 999 // 999
}
}
})
val.sort((column1,column2)=>{
return column1.sortSearchDefault - column2.sortSearchDefault
})
}
const { register, elFormRef, methods } = useForm({
model: props.model || {}

10
src/components/Table/src/Table.vue

@ -250,18 +250,18 @@ export default defineComponent({
//
const updateSort= (val)=>{
val.forEach(item=>{
if(!item.sortDefault){
if(!item.sortTableDefault){
if(item.fixed=='left'){
item.sortDefault = 0
item.sortTableDefault = 0
}else if(item.fixed=='right'){
item.sortDefault = 9999
item.sortTableDefault = 9999
}else{
item.sortDefault = 999 // 999
item.sortTableDefault = 999 // 999
}
}
})
val.sort((column1,column2)=>{
return column1.sortDefault - column2.sortDefault
return column1.sortTableDefault - column2.sortTableDefault
})
}

2
src/components/TableForm/src/TableForm.vue

@ -65,7 +65,7 @@
:placeholder="headerItem?.tableForm?.placeholder || '请输入' + headerItem.label"
:disabled="headerItem?.tableForm?.disabled ? true: headerItem?.tableForm?.isInpuFocusShow ? true : false"
style="flex:1"
@blur="inputStringBlur(headerItem.field, $event, row)"
@blur="inputStringBlur(headerItem.field, row[headerItem.field], row)"
/>
<el-button :key="headerItem.field+$index+'button'" v-if="headerItem?.tableForm?.isInpuFocusShow" @click="inpuFocus(headerItem,row,index)"><Icon icon="ep:search" size="14"/></el-button>
</el-form-item>

10
src/components/rowDrop/index.vue

@ -202,18 +202,18 @@ const initSelectSta = () => {
}
const updateSort= (val)=>{
val.forEach(item=>{
if(!item.sortDefault){
if(!item.sortTableDefault){
if(item.fixed=='left'){
item.sortDefault = 0
item.sortTableDefault = 0
}else if(item.fixed=='right'){
item.sortDefault = 9999
item.sortTableDefault = 9999
}else{
item.sortDefault = 999 // 999
item.sortTableDefault = 999 // 999
}
}
})
val.sort((column1,column2)=>{
return column1.sortDefault - column2.sortDefault
return column1.sortTableDefault - column2.sortTableDefault
})
}
//

3
src/hooks/web/useCrudSchemas.ts

@ -140,7 +140,8 @@ const filterSearchSchema = (crudSchema: CrudSchema[], allSchemas: AllSchemas): F
component,
...schemaItem.search,
field: schemaItem.field,
label: schemaItem.search?.label || schemaItem.label
label: schemaItem.search?.label || schemaItem.label,
sortSearchDefault: schemaItem.sortSearchDefault || 999,
},
{ componentProps: comonentProps }
)

2
src/layout/components/CategoryHeader.vue

@ -60,7 +60,7 @@ export default defineComponent({
return appStore.getCategoryRoutePath
})
return () => (
<div class="category-container">
<div class="category-container" style="width:100%">
<div class="line"></div>
<ElMenu
defaultActive={unref(activeMenu)}

3
src/views/qms/aql/aql.data.ts

@ -549,6 +549,9 @@ export const Aql = useCrudSchemas(reactive<CrudSchema[]>([
valueFormat: 'x',
}
},
table: {
width: 175
}
},
{
label: '是否可用',

39
src/views/qms/basicDataManage/counter/counter.data.ts

@ -19,31 +19,47 @@ export const Counter = useCrudSchemas(reactive<CrudSchema[]>([
field: 'itemCode',
sort: 'custom',
isSearch: true,
fixed: 'left'
fixed: 'left',
table: {
fixed: 'left',
width: 175
}
},
{
label: '检验类型编码',
field: 'inspectionType',
sort: 'custom',
isSearch: true
isSearch: true,
table: {
width: 175
}
},
{
label: '供应商编码',
field: 'supplierCode',
sort: 'custom',
isSearch: true
isSearch: true,
table: {
width: 175
}
},
{
label: '连续合格次数',
field: 'qualifiedTimes',
sort: 'custom',
isSearch: false,
table: {
width: 140
}
},
{
label: '最后合格批次',
field: 'lastQualifiedBatch',
sort: 'custom',
isSearch: false
isSearch: false,
table: {
width: 140
}
},
{
label: '最后合格时间',
@ -65,6 +81,9 @@ export const Counter = useCrudSchemas(reactive<CrudSchema[]>([
type: 'datetime',
valueFormat: 'x'
}
},
table: {
width: 175
}
},
{
@ -75,6 +94,9 @@ export const Counter = useCrudSchemas(reactive<CrudSchema[]>([
form: {
component: 'InputNumber',
value: 0
},
table: {
width: 140
}
},
{
@ -85,6 +107,9 @@ export const Counter = useCrudSchemas(reactive<CrudSchema[]>([
form: {
component: 'InputNumber',
value: 0
},
table: {
width: 175
}
},
{
@ -107,6 +132,9 @@ export const Counter = useCrudSchemas(reactive<CrudSchema[]>([
type: 'datetime',
valueFormat: 'x'
}
},
table: {
width: 175
}
},
{
@ -114,6 +142,9 @@ export const Counter = useCrudSchemas(reactive<CrudSchema[]>([
field: 'nextStage',
sort: 'custom',
isSearch: false,
table: {
width: 140
}
},
// {
// label: '操作',

3
src/views/qms/basicDataManage/inspectionScheme/addForm.vue

@ -18,7 +18,7 @@
<el-col :span="12">
<el-form-item label="物料编码" prop="itemCode">
<div style="display: flex; width: 100%">
<el-input v-model="data.itemName" disabled placeholder="请选择物料" />
<el-input v-model="data.itemCode" disabled placeholder="请选择物料编码" />
<el-button
type="info"
plain
@ -1088,6 +1088,7 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
data.value.programmeTemplateName = val[0].description
data.value['dynamicUpdateCode'] = val[0].dynamicUpdateCode
data.value.dynamicUpdateName = val[0].dynamicUpdateName
console.log(val[0])
}
if (formField == 'programmeTemplateCode') {

17
src/views/qms/basicDataManage/inspectionScheme/inspectionScheme.data.ts

@ -90,7 +90,7 @@ export const InspectionSchemeMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'itemName',
sort: 'custom',
table: {
width: 150
width: 200
},
isSearch: true,
},
@ -106,6 +106,9 @@ export const InspectionSchemeMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '描述',
field: 'description',
sort: 'custom',
table: {
width: 150
},
}, {
label: '版本',
field: 'version',
@ -120,14 +123,14 @@ export const InspectionSchemeMain = useCrudSchemas(reactive<CrudSchema[]>([
dictClass: 'string',
sort: 'custom',
table: {
width: 150
width: 175
}
}, {
label: '检验模板编码',
field: 'programmeTemplateCode',
sort: 'custom',
table: {
width: 150
width: 175
}
}, {
label: '拆分规则',
@ -136,7 +139,7 @@ export const InspectionSchemeMain = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.SPLIT_RULES,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑
table: {
width: 150
width: 175
},
}, {
label: 'aql',
@ -176,6 +179,9 @@ export const InspectionSchemeMain = useCrudSchemas(reactive<CrudSchema[]>([
valueFormat: 'x',
}
},
table: {
width: 175
},
},
{
label: '失效时间',
@ -195,6 +201,9 @@ export const InspectionSchemeMain = useCrudSchemas(reactive<CrudSchema[]>([
valueFormat: 'x',
}
},
table: {
width: 175
},
},
{
label: '是否可用',

3
src/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data.ts

@ -89,8 +89,7 @@ export const InspectionTemplateMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '动态修改规则',
field: 'dynamicUpdateName',
sort: 'custom',
},
,{
},{
label: '版本',
field: 'version',
sort: 'custom',

9
src/views/qms/inspection/inspectionJob/addForm.vue

@ -62,9 +62,9 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检验次数" prop="inspectionJobCharacteristicsUpdateReqVO.inspectionQty">
<el-form-item label="样品份数" prop="inspectionJobCharacteristicsUpdateReqVO.inspectionQty">
<div style="display: flex; width: 100%">
<el-input v-model=" item.inspectionJobCharacteristicsUpdateReqVO.inspectionQty" disabled placeholder="请输入检验次数" />
<el-input v-model=" item.inspectionJobCharacteristicsUpdateReqVO.inspectionQty" disabled placeholder="请输入样品份数" />
</div>
</el-form-item>
@ -318,7 +318,7 @@ const rules = ref({
{ required: true, message: '请选择评估代码', trigger: 'blur' }
],
'inspectionJobCharacteristicsUpdateReqVO.inspectionQty': [
{ required: true, message: '请输入检验次数', trigger: 'blur' }
{ required: true, message: '请输入样品份数', trigger: 'blur' }
],
qualifiedQuantity: [{ required: true, message: '请输入选择结束时间', trigger: 'blur' }]
})
@ -533,6 +533,7 @@ const submitForm = async () => {
data.value.packageList.forEach(cur=>{
number += parseFloat(cur.sampleAmount)
})
number = number.toFixed('2')
if(number != data.value.sampleTotalAmount){
message.error(`采样数量之和必须等于采样总数量`)
return
@ -619,7 +620,7 @@ const submitForm = async () => {
return;
}
if(isEmptyNumberList){
message.error('合格数量和不合格数量之和必须等于检验次数')
message.error('合格数量和不合格数量之和必须等于样品份数')
return;
}
if (formType.value == 'create') {

16
src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts

@ -30,7 +30,7 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
}
},
table: {
width: 165,
width: 200,
fixed: 'left'
}
},
@ -45,7 +45,7 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
}
},
table: {
width: 150
width: 200
}
},
{
@ -59,7 +59,7 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
}
},
table: {
width: 150
width: 175
}
},{
label: '供应商名称',
@ -67,7 +67,7 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
isSearch: false,
table: {
width: 150
width: 175
},
form: {
componentProps:{
@ -95,7 +95,7 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
isSearch: false,
table: {
width: 150
width: 175
},
form: {
componentProps:{
@ -188,7 +188,7 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
}
},
table: {
width: 150
width: 200
}
},
{
@ -324,7 +324,7 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
table: {
width: 150
width: 175
}
},
{
@ -353,7 +353,7 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
table: {
width: 150
width: 175
}
},
{

34
src/views/qms/inspection/inspectionRecord/addForm.vue

@ -26,6 +26,7 @@
:tableData="data.packageList"
:isShowButton="false"
:isShowReduceButton="false"
@inputStringBlur="tableFormBlur"
/>
</div>
</div>
@ -126,10 +127,10 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
data.value = JSON.parse(JSON.stringify(row))
data.value.packageList = await InspectionRecordPackageApi.getInspectionRecordPackageList(row.id)
data.value.packageList.forEach(item=>{
item.qualifiedAmount =0
item.noQualifiedAmount =0
item.destroyAmount =0
item.frozenAmount =0
item.qualifiedAmount = item.qualifiedAmount?item.qualifiedAmount:0
item.noQualifiedAmount = item.noQualifiedAmount?item.noQualifiedAmount:0
item.destroyAmount = item.destroyAmount?item.destroyAmount:0
item.frozenAmount = item.frozenAmount?item.frozenAmount:0
})
dialogVisible.value = true
tableSchemas.value.tableFormColumns.map(item=>{
@ -141,10 +142,10 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
item.qualifiedAmount = item.amount
})
}
//
//
else if(row.useDecision == 2 || row.useDecision == 6){
tableSchemas.value.tableFormColumns.map(item=>{
if(item.field == 'qualifiedAmount' ||item.field == 'noQualifiedAmount'){
if(item.field == 'noQualifiedAmount'){
item.tableForm.disabled = false
}else{
item.tableForm.disabled = true
@ -162,8 +163,12 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
item.frozenAmount = item.amount
})
}
// 1使
if(row.estimateCode == 1){
data.value.useDecision = '1'
}
nextTick(() => {
formMainRef.value.setValues(row)
formMainRef.value.setValues( data.value)
})
}
dialogVisible.value = true
@ -205,8 +210,11 @@ const onChange = (field, cur)=>{
}
//
else if(cur == 2 || cur == 6){
data.value.packageList.forEach(item=>{
item.qualifiedAmount = item.amount
})
tableSchemas.value.tableFormColumns.map(item=>{
if(item.field == 'qualifiedAmount' ||item.field == 'noQualifiedAmount'){
if(item.field == 'noQualifiedAmount'){
item.tableForm.disabled = false
}else{
item.tableForm.disabled = true
@ -226,6 +234,16 @@ const onChange = (field, cur)=>{
}
}
}
//
const tableFormBlur = (field, val,row)=>{
if( row.amount < val){
row.noQualifiedAmount = row.amount
row.qualifiedAmount = 0
}else{
row.qualifiedAmount = row.amount - val
}
}
const buttonBaseClick = (val) => {
//
if (val == 'save') {

54
src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts

@ -16,7 +16,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true,
isForm:false,
table: {
width: 165,
width: 200,
fixed: 'left'
}
},
@ -27,7 +27,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true,
isForm:false,
table: {
width: 150
width: 200
}
},
{
@ -37,7 +37,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: false,
isForm:false,
table: {
width: 150
width: 200
}
},
{
@ -47,7 +47,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: false,
isForm:false,
table: {
width: 150
width: 200
}
},{
label: '供应商名称',
@ -56,7 +56,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: false,
isForm:false,
table: {
width: 150
width: 200
},
form: {
componentProps:{
@ -86,7 +86,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: false,
isForm:false,
table: {
width: 150
width: 200
},
form: {
componentProps:{
@ -111,7 +111,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: false,
isForm:false,
table: {
width: 150
width: 200
}
},
{
@ -258,7 +258,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
table: {
width: 150
width: 175
}
},
{
@ -287,7 +287,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
table: {
width: 150
width: 175
}
},
{
@ -316,7 +316,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
table: {
width: 150
width: 175
}
},
{
@ -345,7 +345,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
table: {
width: 150
width: 175
}
},
{
@ -400,7 +400,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
table: {
width: 170
width: 175
}
},
@ -582,7 +582,8 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
isSearch: true,
tableForm:{
disabled:true
disabled:true,
width:200
},
table:{
width:150
@ -594,7 +595,8 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
isSearch: true,
tableForm:{
disabled:true
disabled:true,
width:160
},
table:{
width:150
@ -606,7 +608,8 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
isSearch: true,
tableForm:{
disabled:true
disabled:true,
width:150
},
table:{
width:150
@ -622,7 +625,8 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
value: 0
},
tableForm:{
disabled:true
disabled:true,
width:120
},
table:{
width:150
@ -634,7 +638,8 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
isSearch: true,
tableForm:{
disabled:true
disabled:true,
width:120
},
table:{
width:150
@ -646,7 +651,8 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
isSearch: true,
tableForm:{
disabled:true
disabled:true,
width:100
},
table:{
width:150
@ -658,7 +664,8 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
isSearch: true,
tableForm:{
disabled:true
disabled:true,
width:100
},
table:{
width:150
@ -670,7 +677,8 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
isSearch: true,
tableForm:{
disabled:true
disabled:true,
width:100
},
table:{
width:150
@ -682,7 +690,8 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
isSearch: true,
tableForm:{
disabled:true
disabled:true,
width:100
},
table:{
width:150
@ -694,7 +703,8 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
isSearch: true,
tableForm:{
disabled:true
disabled:true,
width:100
},
table:{
width:150

26
src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts

@ -58,7 +58,7 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
}
},
table: {
width: 150
width: 175
}
},
{
@ -87,7 +87,7 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
table: {
width: 150
width: 175
}
},
{
@ -115,7 +115,7 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
table: {
width: 150
width: 175
}
},
{
@ -143,7 +143,7 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
table: {
width: 150
width: 175
}
},
{
@ -171,7 +171,7 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
table: {
width: 150
width: 175
}
},
{
@ -180,7 +180,7 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
isSearch: false,
table: {
width: 150
width: 175
},
form:{
componentProps: {
@ -190,6 +190,11 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
searchField: 'code', // 查询弹窗赋值字段
searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
multiple:false,
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
}
}
},
@ -199,7 +204,7 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
isSearch: false,
table: {
width: 150
width: 175
},
form:{
componentProps: {
@ -223,6 +228,11 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
searchField: 'code', // 查询弹窗赋值字段
searchPage: ItemApi.getItembasicPage, // 查询弹窗所需分页方法
multiple:false,
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
}
}
},
@ -323,7 +333,7 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
}
},
table: {
width: 150
width: 175
}
},
// {

20
src/views/qms/qualityNotice/qualityNoticeMain.data.ts

@ -16,7 +16,7 @@ export const QualityNoticeMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true,
isForm: false,
table: {
width: 150,
width: 200,
fixed: 'left'
}
},
@ -38,7 +38,7 @@ export const QualityNoticeMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: false,
isForm: false,
table: {
width: 150
width: 200
}
},
{
@ -48,7 +48,7 @@ export const QualityNoticeMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: false,
isForm: false,
table: {
width: 150
width: 200
}
}, {
label: '优先级',
@ -121,7 +121,7 @@ export const QualityNoticeMain = useCrudSchemas(reactive<CrudSchema[]>([
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
table: {
width: 150
width: 175
}
},
{
@ -150,7 +150,7 @@ export const QualityNoticeMain = useCrudSchemas(reactive<CrudSchema[]>([
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
table: {
width: 150
width: 175
}
},
{
@ -179,7 +179,7 @@ export const QualityNoticeMain = useCrudSchemas(reactive<CrudSchema[]>([
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
table: {
width: 150
width: 175
}
},
{
@ -219,7 +219,7 @@ export const QualityNoticeMain = useCrudSchemas(reactive<CrudSchema[]>([
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
table: {
width: 150
width: 175
}
},
{
@ -248,7 +248,7 @@ export const QualityNoticeMain = useCrudSchemas(reactive<CrudSchema[]>([
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
table: {
width: 150
width: 175
}
},
{
@ -297,7 +297,7 @@ export const QualityNoticeMain = useCrudSchemas(reactive<CrudSchema[]>([
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
table: {
width: 150
width: 175
}
},
{
@ -312,7 +312,7 @@ export const QualityNoticeMain = useCrudSchemas(reactive<CrudSchema[]>([
value: 0
},
table: {
width: 150
width: 175
}
},
{

3
src/views/qms/sampleCode/sampleCode.data.ts

@ -106,6 +106,9 @@ export const SampleCode = useCrudSchemas(reactive<CrudSchema[]>([
valueFormat: 'x',
}
},
table: {
width: 175
}
},
{
label: '是否可用',

24
src/views/qms/samplingProcess/samplingProcess.data.ts

@ -21,6 +21,7 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true,
isForm: false,
table: {
width: 175,
fixed: 'left'
}
},
@ -29,6 +30,9 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
field: 'description',
sort: 'custom',
isSearch: true,
table: {
width: 175
}
},
{
label: '取样类型',
@ -40,6 +44,9 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
form: {
component: 'Select'
},
table: {
width: 140
}
},
{
label: '评估模式',
@ -50,16 +57,25 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
form: {
component: 'Select'
},
table: {
width: 140
}
},
{
label: '样品量',
field: 'sampleSize',
sort: 'custom',
table: {
width: 140
}
},
{
label: '检验次数',
label: '样品份数',
field: 'inspectionQty',
sort: 'custom',
table: {
width: 140
}
},
{
label: '采样方案编码',
@ -75,6 +91,9 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
},
}
},
table: {
width: 175
}
},
{
label: '创建时间',
@ -94,6 +113,9 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
valueFormat: 'x',
}
},
table: {
width: 175
}
},
{
label: '是否可用',

10
src/views/wms/agvManage/interfaceInfo/index.vue

@ -27,9 +27,9 @@
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
<template #code="{row}">
<el-button type="primary" link @click="openDetail(row, '代码', row.code)">
<span>{{ row.code }}</span>
<template #number="{row}">
<el-button type="primary" link @click="openDetail(row, '序号', row.number)">
<span>{{ row.number }}</span>
</el-button>
</template>
<template #action="{ row }">
@ -134,8 +134,8 @@ const buttonBaseClick = (val, item) => {
// -
const butttondata = [
defaultButtons.mainListEditBtn({hasPermi:'wms:interfaceInfo:update'}), //
defaultButtons.mainListDeleteBtn({hasPermi:'wms:interfaceInfo:delete'}), //
defaultButtons.mainListEditBtn(null), //
// defaultButtons.mainListDeleteBtn({hasPermi:'wms:interfaceInfo:delete'}), //
]
// -

31
src/views/wms/agvManage/interfaceInfo/interfaceInfo.data.ts

@ -11,14 +11,20 @@ export const InterfaceInfo = useCrudSchemas(reactive<CrudSchema[]>([
label: '序号',
field: 'number',
sort: 'custom',
isSearch: true,
table: {
width: 300,
fixed: 'left'
},
},
{
label: '接口类型',
field: 'interfaceType',
sort: 'custom',
isSearch: true,
form: {
component: 'SelectV2'
table: {
width: 180,
fixed: 'left'
},
},
{
@ -26,6 +32,9 @@ export const InterfaceInfo = useCrudSchemas(reactive<CrudSchema[]>([
field: 'interfaceName',
sort: 'custom',
isSearch: true,
table: {
width: 180,
},
},
{
label: '状态',
@ -36,27 +45,42 @@ export const InterfaceInfo = useCrudSchemas(reactive<CrudSchema[]>([
form: {
component: 'Radio'
},
table: {
width: 180,
},
isSearch: true,
},
{
label: '请求地址',
field: 'url',
sort: 'custom',
table: {
width: 180,
},
},
{
label: '请求参数',
field: 'reqBody',
sort: 'custom',
table: {
width: 180,
},
},
{
label: '返回结果',
field: 'respBody',
sort: 'custom',
table: {
width: 180,
},
},
{
label: '错误信息',
field: 'errorMsg',
sort: 'custom',
table: {
width: 180,
},
},
{
label: '创建时间',
@ -73,6 +97,9 @@ export const InterfaceInfo = useCrudSchemas(reactive<CrudSchema[]>([
}
},
isForm: false,
table: {
width: 180,
},
},
{
label: '扩展属性',

2
src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue

@ -66,8 +66,6 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue'
import {Itembasic} from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data";
import * as ItembasicApi from "@/api/wms/itembasic";
defineOptions({ name: 'SupplierUser' })

18
src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts

@ -96,6 +96,18 @@ export const SupplierUser = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
{
label: '用户账号',
field: 'userName',
sort: 'custom',
isForm: false,
},
{
label: '用户昵称',
field: 'nickName',
sort: 'custom',
isForm: false,
},
{
label: '供应商代码',
field: 'supplierCode',
@ -121,6 +133,12 @@ export const SupplierUser = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
{
label: '供应商名称',
field: 'supplierName',
sort: 'custom',
isForm: false,
},
{
label: '状态',
field: 'status',

15
src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="CustomerreceiptRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...CustomerreceiptRecordMain.allSchemas.searchSchema,...CustomerreceiptRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="CustomerreceiptRecordMain.allSchemas"
:detailAllSchemas="CustomerreceiptRecordDetail.allSchemas"
/>
<!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span>
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
<template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
@ -76,7 +77,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(CustomerreceiptRecordMain.allSchemas.tableColumns)
const tableColumns = ref([...CustomerreceiptRecordMain.allSchemas.tableColumns,...CustomerreceiptRecordDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {
@ -125,7 +126,11 @@ const buttonBaseClick = (val, item) => {
}
// -
const butttondata = (row) => {
const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return []
}

31
src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="CustomerreceiptRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...CustomerreceiptRequestMain.allSchemas.searchSchema,...CustomerreceiptRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="CustomerreceiptRequestMain.allSchemas"
:detailAllSchemas="CustomerreceiptRequestDetail.allSchemas"
/>
<!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span>
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
<template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
@ -95,7 +96,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(CustomerreceiptRequestMain.allSchemas.tableColumns)
const tableColumns = ref([...CustomerreceiptRequestMain.allSchemas.tableColumns,...CustomerreceiptRequestDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {
@ -189,7 +190,11 @@ const isShowMainButton = (row,val) => {
}
// -
const butttondata = (row) => {
const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return [
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:customerreceipt-request-main:close'}), //
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:customerreceipt-request-main:reAdd'}), //
@ -208,7 +213,7 @@ const buttonTableClick = async (val, row) => {
if (val == 'mainClose') { //
await message.confirm('确认要关闭吗?')
tableObject.loading = true
CustomerreceiptRequestMainApi.close(row.id).then(() => {
CustomerreceiptRequestMainApi.close(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
tableObject.loading = false
getList()
@ -219,7 +224,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainReAdd') { //
await message.confirm('确认要重新添加吗?')
tableObject.loading = true
CustomerreceiptRequestMainApi.reAdd(row.id).then(() => {
CustomerreceiptRequestMainApi.reAdd(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
tableObject.loading = false
getList()
@ -230,7 +235,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainSubmit') { //
await message.confirm('确认要提交审批吗?')
tableObject.loading = true
CustomerreceiptRequestMainApi.submit(row.id).then(() => {
CustomerreceiptRequestMainApi.submit(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
tableObject.loading = false
getList()
@ -241,7 +246,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainTurnDown') { //
await message.confirm('确认要驳回吗?')
tableObject.loading = true
CustomerreceiptRequestMainApi.refused(row.id).then(() => {
CustomerreceiptRequestMainApi.refused(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
tableObject.loading = false
getList()
@ -252,7 +257,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainApprove') { //
await message.confirm('确认要审批通过吗?')
tableObject.loading = true
CustomerreceiptRequestMainApi.agree(row.id).then(() => {
CustomerreceiptRequestMainApi.agree(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
tableObject.loading = false
getList()
@ -263,7 +268,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainHandle') { //
await message.confirm('确认要处理吗?')
tableObject.loading = true
CustomerreceiptRequestMainApi.handle(row.id).then(() => {
CustomerreceiptRequestMainApi.handle(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
tableObject.loading = false
getList()
@ -274,7 +279,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'edit') { //
openForm('update', row)
} else if (val == 'delete') { //
handleDelete(row.id)
handleDelete(row.masterId)
}
}
@ -376,6 +381,6 @@ const searchFormClick = (searchData) => {
/** 初始化 **/
onMounted(async () => {
getList()
importTemplateData.templateUrl = await CustomerreceiptRequestMainApi.importTemplate()
// importTemplateData.templateUrl = await CustomerreceiptRequestMainApi.importTemplate()
})
</script>

21
src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="CustomerreturnJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...CustomerreturnJobMain.allSchemas.searchSchema,...CustomerreturnJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="CustomerreturnJobMain.allSchemas"
:detailAllSchemas="CustomerreturnJobDetail.allSchemas"
/>
<!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span>
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
<template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
@ -81,7 +82,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(CustomerreturnJobMain.allSchemas.tableColumns)
const tableColumns = ref([...CustomerreturnJobMain.allSchemas.tableColumns,...CustomerreturnJobDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {
@ -178,7 +179,11 @@ const isShowMainButton = (row,val) => {
}
// -
const butttondata = (row) => {
const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return [
// defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), //
// defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), //
@ -301,7 +306,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainJobAba') { //
await message.confirm('确认要放弃吗?')
console.log('列表-操作按钮事件-放弃')
CustomerreturnJobMainApi.abandonCustomerreturnJobMain(row.id).then(() => {
CustomerreturnJobMainApi.abandonCustomerreturnJobMain(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
@ -310,7 +315,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainJobClo') { //
await message.confirm('确认要关闭吗?')
console.log('列表-操作按钮事件-关闭')
CustomerreturnJobMainApi.closeCustomerreturnJobMain(row.id).then(() => {
CustomerreturnJobMainApi.closeCustomerreturnJobMain(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
@ -319,7 +324,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainJobAcc') { //
await message.confirm('确认要承接吗?')
console.log('列表-操作按钮事件-承接')
CustomerreturnJobMainApi.acceptCustomerreturnJobMain(row.id).then(() => {
CustomerreturnJobMainApi.acceptCustomerreturnJobMain(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {

22
src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="CustomerreturnRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...CustomerreturnRecordMain.allSchemas.searchSchema,...CustomerreturnRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="CustomerreturnRecordMain.allSchemas"
:detailAllSchemas="CustomerreturnRecordDetail.allSchemas"
/>
<!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span>
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
<template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
@ -77,7 +78,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(CustomerreturnRecordMain.allSchemas.tableColumns)
const tableColumns = ref([...CustomerreturnRecordMain.allSchemas.tableColumns,...CustomerreturnRecordDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {
@ -126,9 +127,14 @@ const buttonBaseClick = (val, item) => {
}
// -
const butttondata = (row) => [
defaultButtons.mainListDocumentPrintBtn(null), //
]
const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}else{
return [defaultButtons.mainListDocumentPrintBtn(null),] //
}
}
// -
const buttonTableClick = async (val, row) => {
@ -175,7 +181,7 @@ const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
const src = ref(BASE_URL + '/jmreport/view/929216638195793920?token=' + getAccessToken())
//
const handlePoint = async (row) => {
window.open(src.value+'&id='+row.id)
window.open(src.value+'&id='+row.masterId)
}
/** 初始化 **/

29
src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="CustomerreturnRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...CustomerreturnRequestMain.allSchemas.searchSchema,...CustomerreturnRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="CustomerreturnRequestMain.allSchemas"
:detailAllSchemas="CustomerreturnRequestDetail.allSchemas"
/>
<!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span>
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
<template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
@ -98,7 +99,7 @@ const route = useRoute() // 路由信息
const routeName = ref()
const customerCode = ref()
routeName.value = route.name
const tableColumns = ref(CustomerreturnRequestMain.allSchemas.tableColumns)
const tableColumns = ref([...CustomerreturnRequestMain.allSchemas.tableColumns,...CustomerreturnRequestDetail.allSchemas.tableMainColumns])
const isShowButton = ref(true)
@ -251,7 +252,11 @@ const isShowMainButton = (row,val) => {
}
// -
const butttondata = (row) => {
const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return [
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:customerreturn-request-main:close'}), //
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:customerreturn-request-main:reAdd'}), //
@ -271,7 +276,7 @@ const buttonTableClick = async (val, row) => {
if (val == 'mainClose') { //
await message.confirm('确认要关闭吗?')
tableObject.loading = true
CustomerreturnRequestMainApi.close(row.id).then(() => {
CustomerreturnRequestMainApi.close(row.masterId).then(() => {
tableObject.loading = false
message.success(t('common.updateSuccess'))
getList()
@ -281,7 +286,7 @@ const buttonTableClick = async (val, row) => {
}) } else if (val == 'mainReAdd') { //
await message.confirm('确认要重新添加吗?')
tableObject.loading = true
CustomerreturnRequestMainApi.reAdd(row.id).then(() => {
CustomerreturnRequestMainApi.reAdd(row.masterId).then(() => {
tableObject.loading = false
message.success(t('common.updateSuccess'))
getList()
@ -292,7 +297,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainSubmit') { //
await message.confirm('确认要提交审批吗?')
tableObject.loading = true
CustomerreturnRequestMainApi.submit(row.id).then(() => {
CustomerreturnRequestMainApi.submit(row.masterId).then(() => {
tableObject.loading = false
message.success(t('common.updateSuccess'))
getList()
@ -303,7 +308,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainTurnDown') { //
await message.confirm('确认要驳回审批吗?')
tableObject.loading = true
CustomerreturnRequestMainApi.refused(row.id).then(() => {
CustomerreturnRequestMainApi.refused(row.masterId).then(() => {
tableObject.loading = false
message.success(t('common.updateSuccess'))
getList()
@ -314,7 +319,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainApprove') { //
await message.confirm('确认要审批通过吗?')
tableObject.loading = true
CustomerreturnRequestMainApi.agree(row.id).then(() => {
CustomerreturnRequestMainApi.agree(row.masterId).then(() => {
tableObject.loading = false
message.success(t('common.updateSuccess'))
getList()
@ -325,7 +330,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainHandle') { //
await message.confirm('确认要处理吗?')
tableObject.loading = true
CustomerreturnRequestMainApi.handle(row.id).then(() => {
CustomerreturnRequestMainApi.handle(row.masterId).then(() => {
tableObject.loading = false
message.success(t('common.updateSuccess'))
getList()
@ -336,7 +341,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'edit') { //
openForm('update', row)
} else if (val == 'delete') { //
handleDelete(row.id)
handleDelete(row.masterId)
}
}

15
src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="CustomersettleRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...CustomersettleRecordMain.allSchemas.searchSchema,...CustomersettleRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="CustomersettleRecordMain.allSchemas"
:detailAllSchemas="CustomersettleRecordDetail.allSchemas"
/>
<!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span>
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
<template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
@ -76,7 +77,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(CustomersettleRecordMain.allSchemas.tableColumns)
const tableColumns = ref([...CustomersettleRecordMain.allSchemas.tableColumns,...CustomersettleRecordDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {
@ -125,7 +126,11 @@ const buttonBaseClick = (val, item) => {
}
// -
const butttondata = (row) => {
const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return []
}

29
src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="CustomersettleRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...CustomersettleRequestMain.allSchemas.searchSchema,...CustomersettleRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="CustomersettleRequestMain.allSchemas"
:detailAllSchemas="CustomersettleRequestDetail.allSchemas"
/>
<!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span>
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
<template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
@ -96,7 +97,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(CustomersettleRequestMain.allSchemas.tableColumns)
const tableColumns = ref([...CustomersettleRequestMain.allSchemas.tableColumns,...CustomersettleRequestDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {
@ -205,7 +206,11 @@ const isShowMainButton = (row,val) => {
}
// -
const butttondata = (row) => {
const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return [
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:customersettle-request-main:close'}), //
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:customersettle-request-main:reAdd'}), //
@ -224,7 +229,7 @@ const buttonTableClick = async (val, row) => {
if (val == 'mainClose') { //
await message.confirm('确认要关闭吗?')
tableObject.loading = true
CustomersettleRequestMainApi.close(row.id).then(() => {
CustomersettleRequestMainApi.close(row.masterId).then(() => {
tableObject.loading = false
message.success(t('common.updateSuccess'))
getList()
@ -234,7 +239,7 @@ const buttonTableClick = async (val, row) => {
}) } else if (val == 'mainReAdd') { //
await message.confirm('确认要重新添加吗?')
tableObject.loading = true
CustomersettleRequestMainApi.reAdd(row.id).then(() => {
CustomersettleRequestMainApi.reAdd(row.masterId).then(() => {
tableObject.loading = false
message.success(t('common.updateSuccess'))
getList()
@ -245,7 +250,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainSubmit') { //
await message.confirm('确认要提交审批吗?')
tableObject.loading = true
CustomersettleRequestMainApi.submit(row.id).then(() => {
CustomersettleRequestMainApi.submit(row.masterId).then(() => {
tableObject.loading = false
message.success(t('common.updateSuccess'))
getList()
@ -256,7 +261,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainTurnDown') { //
await message.confirm('确认要重新添加吗?')
tableObject.loading = true
CustomersettleRequestMainApi.refused(row.id).then(() => {
CustomersettleRequestMainApi.refused(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
@ -264,7 +269,7 @@ const buttonTableClick = async (val, row) => {
})
} else if (val == 'mainApprove') { //
tableObject.loading = true
CustomersettleRequestMainApi.agree(row.id).then(() => {
CustomersettleRequestMainApi.agree(row.masterId).then(() => {
tableObject.loading = false
message.success(t('common.updateSuccess'))
getList()
@ -274,7 +279,7 @@ const buttonTableClick = async (val, row) => {
})
} else if (val == 'mainHandle') { //
tableObject.loading = true
CustomersettleRequestMainApi.handle(row.id).then(() => {
CustomersettleRequestMainApi.handle(row.masterId).then(() => {
tableObject.loading = false
message.success(t('common.updateSuccess'))
getList()
@ -285,7 +290,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'edit') { //
openForm('update', row)
} else if (val == 'delete') { //
handleDelete(row.id)
handleDelete(row.masterId)
}
}

21
src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="DeliverJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...DeliverJobMain.allSchemas.searchSchema,...DeliverJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="DeliverJobMain.allSchemas"
:detailAllSchemas="DeliverJobDetail.allSchemas"
/>
<!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span>
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
<template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
@ -81,7 +82,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(DeliverJobMain.allSchemas.tableColumns)
const tableColumns = ref([...DeliverJobMain.allSchemas.tableColumns,...DeliverJobDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {
@ -178,7 +179,11 @@ const isShowMainButton = (row,val) => {
}
// -
const butttondata = (row) => {
const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return [
defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), //
@ -286,11 +291,11 @@ const buttonTableClick = async (val, row) => {
handleHandle(aaa)
console.log('列表-操作按钮事件-执行')
} else if (val == 'mainJobAba') { //
DeliverJobMainApi.abandonDeliverJobMain(row.id)
DeliverJobMainApi.abandonDeliverJobMain(row.masterId)
} else if (val == 'mainJobClo') { //
DeliverJobMainApi.closeDeliverJobMain(row.id)
DeliverJobMainApi.closeDeliverJobMain(row.masterId)
} else if (val == 'mainJobAcc') { //
DeliverJobMainApi.acceptDeliverJobMain(row.id)
DeliverJobMainApi.acceptDeliverJobMain(row.masterId)
}
}
//

22
src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="DeliverRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...DeliverRecordMain.allSchemas.searchSchema,...DeliverRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="DeliverRecordMain.allSchemas"
:detailAllSchemas="DeliverRecordDetail.allSchemas"
/>
<!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span>
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
<template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
@ -77,7 +78,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(DeliverRecordMain.allSchemas.tableColumns)
const tableColumns = ref([...DeliverRecordMain.allSchemas.tableColumns,...DeliverRecordDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {
@ -126,9 +127,14 @@ const buttonBaseClick = (val, item) => {
}
// -
const butttondata = (row) => [
defaultButtons.mainListDocumentPrintBtn(null), //
]
const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}else{
return [defaultButtons.mainListDocumentPrintBtn(null),] //
}
}
// -
const buttonTableClick = async (val, row) => {
@ -166,7 +172,7 @@ const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
const src = ref(BASE_URL + '/jmreport/view/929209659733770240?token=' + getAccessToken())
//
const handlePoint = async (row) => {
window.open(src.value+'&id='+row.id)
window.open(src.value+'&id='+row.masterId)
}
//

29
src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="DeliverRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...DeliverRequestMain.allSchemas.searchSchema,...DeliverRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="DeliverRequestMain.allSchemas"
:detailAllSchemas="DeliverRequestDetail.allSchemas"
/>
<!-- 列表 -->
@ -33,8 +34,8 @@
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
<template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
@ -101,7 +102,7 @@ const route = useRoute() // 路由信息
const routeName = ref()
routeName.value = route.name
const customerCode = ref()
const tableColumns = ref(DeliverRequestMain.allSchemas.tableColumns)
const tableColumns = ref([...DeliverRequestMain.allSchemas.tableColumns,...DeliverRequestDetail.allSchemas.tableMainColumns])
const isShowButton = ref(true)
@ -259,7 +260,11 @@ const isShowMainButton = (row,val) => {
}
// -
const butttondata = (row) => {
const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return [
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:deliver-request-main:close'}), //
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:deliver-request-main:reAdd'}), //
@ -279,7 +284,7 @@ const buttonTableClick = async (val, row) => {
if (val == 'mainClose') { //
await message.confirm('确认要关闭吗?')
tableObject.loading = true
DeliverRequestMainApi.close(row.id).then(() => {
DeliverRequestMainApi.close(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
tableObject.loading = false
getList()
@ -290,7 +295,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainReAdd') { //
await message.confirm('确认要重新添加吗?')
tableObject.loading = true
DeliverRequestMainApi.reAdd(row.id).then(() => {
DeliverRequestMainApi.reAdd(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
tableObject.loading = false
getList()
@ -301,7 +306,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainSubmit') { //
await message.confirm('确认要提交审批吗?')
tableObject.loading = true
DeliverRequestMainApi.submit(row.id).then(() => {
DeliverRequestMainApi.submit(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
tableObject.loading = false
getList()
@ -312,7 +317,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainTurnDown') { //
await message.confirm('确认要驳回吗?')
tableObject.loading = true
DeliverRequestMainApi.refused(row.id).then(() => {
DeliverRequestMainApi.refused(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
tableObject.loading = false
getList()
@ -323,7 +328,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainApprove') { //
await message.confirm('确认要审批通过吗?')
tableObject.loading = true
DeliverRequestMainApi.agree(row.id).then(() => {
DeliverRequestMainApi.agree(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
tableObject.loading = false
getList()
@ -334,7 +339,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainHandle') { //
await message.confirm('确认要 处理吗?')
tableObject.loading = true
DeliverRequestMainApi.handle(row.id).then(() => {
DeliverRequestMainApi.handle(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
tableObject.loading = false
getList()
@ -345,7 +350,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'edit') { //
openForm('update', row)
} else if (val == 'delete') { //
handleDelete(row.id)
handleDelete(row.masterId)
}
}

31
src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="DeliverPlanMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...DeliverPlanMain.allSchemas.searchSchema,...DeliverPlanDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="DeliverPlanMain.allSchemas"
:detailAllSchemas="DeliverPlanDetail.allSchemas"
/>
<!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span>
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
<template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
@ -92,7 +93,7 @@ const route = useRoute() // 路由信息
const routeName = ref()
routeName.value = route.name
const customerCode = ref()
const tableColumns = ref(DeliverPlanMain.allSchemas.tableColumns)
const tableColumns = ref([...DeliverPlanMain.allSchemas.tableColumns,...DeliverPlanDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {
@ -209,7 +210,11 @@ const isShowMainButton = (row,val) => {
}
// -
const butttondata = (row) => {
const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return [
defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:deliver-plan-main:open'}), //
defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:deliver-plan-main:close'}), //
@ -226,7 +231,7 @@ const butttondata = (row) => {
const buttonTableClick = async (val, row) => {
if (val == 'mainPlanOpe') { //
tableObject.loading = true
DeliverPlanMainApi.open(row.id).then(() => {
DeliverPlanMainApi.open(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
tableObject.loading = false
getList()
@ -237,7 +242,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanClo') { //
await message.confirm('确认要关闭吗?')
tableObject.loading = true
DeliverPlanMainApi.close(row.id).then(() => {
DeliverPlanMainApi.close(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
tableObject.loading = false
getList()
@ -248,7 +253,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanSub') { //
await message.confirm('确认要提交审批吗?')
tableObject.loading = true
DeliverPlanMainApi.submit(row.id).then(() => {
DeliverPlanMainApi.submit(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
tableObject.loading = false
getList()
@ -259,7 +264,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanTur') { //
await message.confirm('确认要驳回吗?')
tableObject.loading = true
DeliverPlanMainApi.reject(row.id).then(() => {
DeliverPlanMainApi.reject(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
tableObject.loading = false
getList()
@ -270,7 +275,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanApp') { //
await message.confirm('确认要审批通过吗?')
tableObject.loading = true
DeliverPlanMainApi.agree(row.id).then(() => {
DeliverPlanMainApi.agree(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
tableObject.loading = false
getList()
@ -281,7 +286,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanPub') { //
await message.confirm('确认要发布吗?')
tableObject.loading = true
DeliverPlanMainApi.publish(row.id).then(() => {
DeliverPlanMainApi.publish(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
tableObject.loading = false
getList()
@ -292,7 +297,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanRes') { //
await message.confirm('确认要重置吗?')
tableObject.loading = true
DeliverPlanMainApi.resetting(row.id).then(() => {
DeliverPlanMainApi.resetting(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
tableObject.loading = false
getList()
@ -303,7 +308,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'edit') { //
openForm('update', row)
} else if (val == 'delete') { //
handleDelete(row.id)
handleDelete(row.masterId)
}
}

21
src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="StockupMainJob.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...StockupMainJob.allSchemas.searchSchema,...StockupDetailJob.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="StockupMainJob.allSchemas"
:detailAllSchemas="StockupDetailJob.allSchemas"
/>
<!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span>
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
<template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
@ -82,7 +83,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(StockupMainJob.allSchemas.tableColumns)
const tableColumns = ref([...StockupMainJob.allSchemas.tableColumns,...StockupDetailJob.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {
@ -179,7 +180,11 @@ const isShowMainButton = (row,val) => {
}
// -
const butttondata = (row) => {
const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return [
// defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), //
// defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), //
@ -193,11 +198,11 @@ const buttonTableClick = async (val, row) => {
 if (val == 'mainJobExe') { //
handleHandle
} else if (val == 'mainJobAba') { //
StockupJobMainApi.abandonStockupMainJob(row.id)
StockupJobMainApi.abandonStockupMainJob(row.masterId)
} else if (val == 'mainJobClo') { //
StockupJobMainApi.closeStockupMainJob(row.id)
StockupJobMainApi.closeStockupMainJob(row.masterId)
} else if (val == 'mainJobAcc') { //
StockupJobMainApi.acceptStockupMainJob(row.id)
StockupJobMainApi.acceptStockupMainJob(row.masterId)
}
}
//

15
src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="StockupMainRecord.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...StockupMainRecord.allSchemas.searchSchema,...StockupDetailRecord.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="StockupMainRecord.allSchemas"
:detailAllSchemas="StockupDetailRecord.allSchemas"
/>
<!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span>
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
<template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
@ -77,7 +78,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(StockupMainRecord.allSchemas.tableColumns)
const tableColumns = ref([...StockupMainRecord.allSchemas.tableColumns,...StockupDetailRecord.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {
@ -126,7 +127,11 @@ const buttonBaseClick = (val, item) => {
}
// -
const butttondata = (row) => {
const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return []
}

29
src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="StockupMainRequest.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...StockupMainRequest.allSchemas.searchSchema,...StockupDetailRequest.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="StockupMainRequest.allSchemas"
:detailAllSchemas="StockupDetailRequest.allSchemas"
/>
<!-- 列表 -->
@ -33,8 +34,8 @@
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
<template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
@ -100,7 +101,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(StockupMainRequest.allSchemas.tableColumns)
const tableColumns = ref([...StockupMainRequest.allSchemas.tableColumns,...StockupDetailRequest.allSchemas.tableMainColumns])
const isShowButton = ref(true)
@ -228,7 +229,11 @@ const isShowMainButton = (row,val) => {
}
// -
const butttondata = (row) => {
const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return [
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:stockup-main-request:close'}), //
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:stockup-main-request:reAdd'}), //
@ -248,7 +253,7 @@ const buttonTableClick = async (val, row) => {
if (val == 'mainClose') { //
await message.confirm('确认要关闭吗?')
tableObject.loading = true
StockupMainRequestApi.close(row.id).then(() => {
StockupMainRequestApi.close(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
tableObject.loading = false
getList()
@ -259,7 +264,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainReAdd') { //
await message.confirm('确认要重新添加吗?')
tableObject.loading = true
StockupMainRequestApi.reAdd(row.id).then(() => {
StockupMainRequestApi.reAdd(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
tableObject.loading = false
getList()
@ -270,7 +275,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainSubmit') { //
await message.confirm('确认要提交审批吗?')
tableObject.loading = true
StockupMainRequestApi.submit(row.id).then(() => {
StockupMainRequestApi.submit(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
tableObject.loading = false
getList()
@ -281,7 +286,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainTurnDown') { //
await message.confirm('确认要驳回吗?')
tableObject.loading = true
StockupMainRequestApi.refused(row.id).then(() => {
StockupMainRequestApi.refused(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
tableObject.loading = false
getList()
@ -292,7 +297,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainApprove') { //
await message.confirm('确认要审批通过吗?')
tableObject.loading = true
StockupMainRequestApi.agree(row.id).then(() => {
StockupMainRequestApi.agree(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
tableObject.loading = false
getList()
@ -303,7 +308,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainHandle') { //
await message.confirm('确认要处理吗?')
tableObject.loading = true
StockupMainRequestApi.handle(row.id).then(() => {
StockupMainRequestApi.handle(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
tableObject.loading = false
getList()
@ -314,7 +319,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'edit') { //
openForm('update', row)
} else if (val == 'delete') { //
handleDelete(row.id)
handleDelete(row.masterId)
}
}

1
src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts

@ -283,7 +283,6 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isForm: false,
},
{
label: '备注',

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

@ -1,5 +1,6 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
import { fa } from 'element-plus/es/locale'
/**
* @returns {Array}
@ -14,6 +15,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
fixed: 'left'
},
isSearch: true,
sortSearchDefault:1
},
{
label: '申请单号',
@ -22,7 +24,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isSearch: true,
isSearch: false,
},
{
label: '发货单号',
@ -31,11 +33,13 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isSearch: true
},
{
label: '要货计划单号',
field: 'ppNumber',
sort: 'custom',
isTable:false,
table: {
width: 180
},
@ -44,15 +48,18 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '供应商代码',
field: 'supplierCode',
sort: 'custom',
sortTableDefault:1,
table: {
width: 150
},
isSearch: true,
sortSearchDefault:2
},
{
label: '到月台代码',
field: 'toDockCode',
sort: 'custom',
isTable:false,
table: {
width: 150
},
@ -64,6 +71,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
sortTableDefault:1010
},
{
label: '数据来源',
@ -87,6 +95,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
sortTableDefault:1011
},
{
label: '车牌号',
@ -95,11 +104,13 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
sortTableDefault:1012
},
{
label: '从仓库代码',
field: 'fromWarehouseCode',
sort: 'custom',
isTable:false,
table: {
width: 150
},
@ -108,6 +119,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '到仓库代码',
field: 'toWarehouseCode',
sort: 'custom',
isTable:false,
table: {
width: 150
},
@ -128,6 +140,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '申请时间',
field: 'requestTime',
sort: 'custom',
isTable:false,
table: {
width: 180
},
@ -151,6 +164,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable:false,
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
@ -169,7 +183,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'status',
dictType: DICT_TYPE.JOB_STATUS,
dictClass: 'string',
isSearch: true,
isSearch: false,
isTable: true,
sort: 'custom',
table: {
@ -187,6 +201,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable:false,
form: {
component: 'DatePicker',
componentProps: {
@ -211,6 +226,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false,
form: {
component: 'InputNumber',
}
@ -222,6 +238,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false,
form: {
component: 'InputNumber',
}
@ -233,6 +250,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false,
},
{
label: '岗位',
@ -241,6 +259,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false,
},
{
label: '承接人',
@ -249,6 +268,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false,
},
{
label: '承接时间',
@ -261,6 +281,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable:false,
form: {
component: 'DatePicker',
componentProps: {
@ -277,6 +298,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false,
},
{
label: '完成时间',
@ -289,6 +311,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable:false,
form: {
component: 'DatePicker',
componentProps: {
@ -303,7 +326,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'fromAreaTypes',
dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -314,7 +337,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'toAreaTypes',
dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -327,6 +350,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false,
},
{
label: '到库区代码范围',
@ -335,6 +359,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false,
},
{
label: '业务类型',
@ -343,6 +368,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false,
},
{
label: '备注',
@ -351,6 +377,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false,
},
{
label: '创建者',
@ -359,6 +386,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false,
},
{
label: '创建时间',
@ -371,6 +399,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable:false,
form: {
component: 'DatePicker',
componentProps: {
@ -385,7 +414,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'autoComplete',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
form: {
component: 'Switch',
value: 'TRUE',
@ -404,7 +433,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyLocation',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
form: {
component: 'Switch',
value: 'TRUE',
@ -423,7 +452,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyQty',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
form: {
component: 'Switch',
value: 'TRUE',
@ -442,7 +471,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowBiggerQty',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
form: {
component: 'Switch',
value: 'TRUE',
@ -461,7 +490,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowSmallerQty',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
form: {
component: 'Switch',
value: 'TRUE',
@ -480,7 +509,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyInventoryStatus',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
form: {
component: 'Switch',
value: 'TRUE',
@ -499,7 +528,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowContinuousScanning',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
form: {
component: 'Switch',
value: 'TRUE',
@ -518,7 +547,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowPartialComplete',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
form: {
component: 'Switch',
value: 'TRUE',
@ -537,7 +566,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyBatch',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
form: {
component: 'Switch',
value: 'TRUE',
@ -556,7 +585,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyPackingNumber',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
form: {
component: 'Switch',
value: 'TRUE',
@ -579,7 +608,29 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 120,
fixed: 'right'
},
}
},
{
label: '包装号', // 实际是子表的到包装号,为了不影响页面,单独放上面
field: 'toPackingNumber',
sort: 'custom',
isForm:false,
isTableForm:false,
table: {
width: 150
},
sortTableDefault:1001,
},
{
label: '批次', // 实际是子表的到批次,为了不影响页面,单独放上面
field: 'toBatch',
sort: 'custom',
isForm:false,
isTableForm:false,
table: {
width: 150
},
sortTableDefault:1001,
},
]))
//表单校验
@ -645,11 +696,16 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isSearch:true,
hiddenInMain:true,
sortTableDefault:1001,
sortSearchDefault:1002
},
{
label: '器具号',
field: 'containerNumber',
sort: 'custom',
hiddenInMain:true,
table: {
width: 150
},
@ -661,6 +717,10 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
sortTableDefault:1000,
sortSearchDefault:1000,
isSearch:true,
hiddenInMain:true,
},
{
label: '替代批次',
@ -669,6 +729,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain:true,
},
{
label: '到货日期',
@ -681,6 +742,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
hiddenInMain:true,
form: {
component: 'DatePicker',
componentProps: {
@ -702,6 +764,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
hiddenInMain:true,
form: {
component: 'DatePicker',
componentProps: {
@ -723,6 +786,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
hiddenInMain:true,
form: {
component: 'DatePicker',
componentProps: {
@ -743,6 +807,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain:true,
},
{
label: '从库位代码',
@ -751,6 +816,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
sortTableDefault:1005
},
{
label: '到库位代码',
@ -759,14 +825,17 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
sortTableDefault:1006
},
{
label: '订单号',
label: '采购订单号',
field: 'poNumber',
sort: 'custom',
table: {
width: 150
},
isSearch:true,
},
{
label: '订单行',
@ -785,7 +854,8 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
form: {
component: 'InputNumber',
}
},
sortTableDefault:1003
},
{
label: '包装规格',
@ -796,6 +866,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
sortTableDefault:1002
},
{
label: '供应商计量数量',
@ -804,6 +875,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain:true,
form: {
component: 'InputNumber',
}
@ -818,6 +890,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain:true,
},
{
label: '转换率',
@ -828,7 +901,8 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
form: {
component: 'InputNumber',
}
},
hiddenInMain:true,
},
{
label: '从货主代码',
@ -837,6 +911,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain:true,
},
{
label: '到货主代码',
@ -845,6 +920,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain:true,
},
{
label: '物料代码',
@ -853,6 +929,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isSearch:true
},
{
label: '物料名称',
@ -869,6 +946,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain:true,
},
{
label: '物料描述2',
@ -877,6 +955,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain:true,
},
{
label: '项目代码',
@ -885,6 +964,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain:true,
},
{
label: '数量',
@ -895,7 +975,8 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
form: {
component: 'InputNumber',
}
},
hiddenInMain:true,
},
{
label: '计量单位',
@ -907,6 +988,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
sortTableDefault:1004
},
{
label: '单据号',
@ -915,6 +997,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
hiddenInMain:true,
},
{
label: '备注',
@ -923,6 +1006,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain:true,
},
{
label: '创建者',
@ -931,6 +1015,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain:true,
},
{
label: '创建时间',
@ -951,6 +1036,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
valueFormat: 'x',
}
},
hiddenInMain:true,
},
{
label: '操作',
@ -963,7 +1049,8 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
fixed: 'right'
},
isTableForm:true,
}
},
]))
//表单校验

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

@ -1,5 +1,6 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
import { t } from '@wangeditor/editor'
@ -16,6 +17,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
fixed: 'left'
},
isSearch: true,
sortSearchDefault:1
},
{
label: '申请单号',
@ -24,7 +26,6 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isSearch: true,
},
{
label: '任务单号',
@ -41,6 +42,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isSearch: true
},
{
label: 'ERP单据号(无用)',
@ -67,6 +69,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable:false
},
{
label: '供应商代码',
@ -76,6 +79,8 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
isSearch: true,
sortSearchDefault:2,
isTable:false
},
{
label: '到月台代码',
@ -84,6 +89,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false
},
{
label: '承运商',
@ -92,6 +98,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false
},
{
label: '运输方式',
@ -100,6 +107,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false
},
{
label: '数据来源',
@ -115,6 +123,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
}
},
isSearch: false,
isTable:false
},
{
label: '车牌号',
@ -123,6 +132,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false
},
{
label: '从仓库代码',
@ -131,6 +141,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false
},
{
label: '到仓库代码',
@ -139,13 +150,14 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false
},
{
label: '从库区类型范围',
field: 'fromAreaTypes',
dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -156,7 +168,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'toAreaTypes',
dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -169,6 +181,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false
},
{
label: '到库区代码范围',
@ -177,6 +190,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false
},
{
label: '出库事务类型',
@ -185,6 +199,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false
},
{
label: '入库事务类型',
@ -193,6 +208,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false
},
{
label: '执行时间',
@ -205,6 +221,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable:false,
form: {
component: 'DatePicker',
componentProps: {
@ -225,6 +242,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable:false,
form: {
component: 'DatePicker',
componentProps: {
@ -246,6 +264,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable:false,
form: {
component: 'DatePicker',
componentProps: {
@ -266,6 +285,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable:false,
form: {
component: 'DatePicker',
componentProps: {
@ -282,6 +302,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false,
},
// {
// label: '代码',
@ -296,7 +317,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'interfaceType',
dictType: DICT_TYPE.INTERFACE_TYPE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -309,6 +330,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false,
},
{
label: '备注',
@ -317,6 +339,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false,
},
{
label: '创建者',
@ -325,6 +348,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false,
},
{
label: '创建时间',
@ -337,6 +361,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable:false,
form: {
component: 'DatePicker',
componentProps: {
@ -352,7 +377,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'available',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -375,7 +400,27 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 300,
fixed: 'right'
},
}
},
{
label: '批次', // 实际是子表的从批次,为了不影响页面,单独放上面
field: 'fromBatch',
sort: 'custom',
isForm:false,
isTableForm:false,
table: {
width: 150
},
sortTableDefault:1000
},
{
label: '包装号', // 实际是子表的从包装号,为了不影响页面,单独放上面
field: 'fromPackingNumber',
sort: 'custom',
table: {
width: 150
},
sortTableDefault:1001
},
]))
// 表单校验
@ -439,14 +484,24 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
width: 180,
fixed: 'left'
},
hiddenInMain:true
},
{
label: '订单号',
label: '检验申请单号',
field: 'inspectNumber',
sort: 'custom',
table: {
width: 150
},
},
{
label: '采购订单号',
field: 'poNumber',
sort: 'custom',
table: {
width: 150
},
isSearch: true
},
{
label: '订单行',
@ -463,6 +518,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isSearch: true
},
{
label: '物料名称',
@ -479,6 +535,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddenInMain:true
},
{
label: '物料描述2',
@ -487,6 +544,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddenInMain:true
},
{
label: '从批次',
@ -495,6 +553,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddenInMain:true
},
{
label: '到批次',
@ -503,6 +562,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddenInMain:true
},
{
label: '替代批次',
@ -511,6 +571,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddenInMain:true
},
{
label: '从包装号',
@ -519,6 +580,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddenInMain:true
},
{
label: '到包装号',
@ -527,6 +589,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddenInMain:true
},
{
label: '从器具号',
@ -535,6 +598,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddenInMain:true
},
{
label: '到器具号',
@ -543,6 +607,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddenInMain:true
},
{
label: '数量',
@ -553,7 +618,8 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
},
form: {
component: 'InputNumber',
}
},
sortTableDefault:1000
},
{
label: '计量单位',
@ -565,30 +631,33 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
sortTableDefault:1000
},
{
label: '包装数量',
field: 'packQty',
label: '包装规格',
field: 'packUnit',
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
form: {
component: 'InputNumber',
}
sortTableDefault:1001
},
{
label: '包装规格',
field: 'packUnit',
dictClass: 'string',
isTable: true,
label: '包装数量',
field: 'packQty',
sort: 'custom',
table: {
width: 150
},
form: {
component: 'InputNumber',
},
sortTableDefault:1001
},
{
label: '供应商计量数量',
field: 'supplierQty',
@ -598,7 +667,8 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
},
form: {
component: 'InputNumber',
}
},
hiddenInMain:true
},
{
label: '供应商计量单位',
@ -610,6 +680,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddenInMain:true
},
{
@ -622,6 +693,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddenInMain:true
},
{
label: '从库位代码',
@ -630,6 +702,8 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
sortTableDefault:1100
},
{
label: '到库位代码',
@ -638,6 +712,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
sortTableDefault:1101
},
{
label: '从库位组代码',
@ -646,6 +721,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddenInMain:true
},
{
label: '到库位组代码',
@ -654,6 +730,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddenInMain:true
},
{
label: '从库区代码',
@ -662,6 +739,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddenInMain:true,
},
{
label: '到库区代码',
@ -670,6 +748,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddenInMain:true
},
{
label: '从货主代码',
@ -678,6 +757,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddenInMain:true
},
{
label: '到货主代码',
@ -686,6 +766,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddenInMain:true
},
{
label: '到货日期',
@ -707,6 +788,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
valueFormat: 'x',
}
},
hiddenInMain:true
},
{
label: '生产日期',
@ -728,6 +810,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
valueFormat: 'x',
}
},
hiddenInMain:true
},
{
label: '过期日期',
@ -749,6 +832,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
valueFormat: 'x',
}
},
hiddenInMain:true
},
{
label: '转换率',
@ -759,7 +843,8 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
},
form: {
component: 'InputNumber',
}
},
hiddenInMain:true
},
{
label: '目检结果',
@ -768,6 +853,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddenInMain:true
},
{
label: '目检照片',
@ -776,6 +862,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddenInMain:true
},
{
label: '不合格原因',
@ -787,6 +874,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddenInMain:true
},
{
label: '单价',
@ -797,7 +885,8 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
},
form: {
component: 'InputNumber',
}
},
hiddenInMain:true
},
{
label: '金额',
@ -808,7 +897,8 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
},
form: {
component: 'InputNumber',
}
},
hiddenInMain:true
},
// {
// label: '任务明细ID',
@ -826,6 +916,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddenInMain:true
},
// {
// label: '代码',
@ -845,6 +936,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddenInMain:true
},
{
label: '备注',
@ -853,6 +945,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddenInMain:true
},
{
label: '创建时间',
@ -865,6 +958,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 180
},
hiddenInMain:true,
form: {
component: 'DatePicker',
componentProps: {
@ -881,6 +975,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddenInMain:true
},
{
label: '操作',
@ -964,6 +1059,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
width: 180,
fixed: 'left'
},
hiddenInMain:true,
form: {
componentProps: {
disabled:true

67
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@ -46,16 +46,19 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
width: 180,
fixed: 'left'
},
sortSearchDefault:1,
isForm: false,
isSearch: true,
},
{
label: '采购订单',
label: '采购订单',
field: 'ppNumber',
sort: 'custom',
table: {
width: 180
},
isSearch:true,
sortTableDefault:4,
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
@ -83,16 +86,21 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
table: {
width: 180
},
isSearch:true,
sortSearchDefault:3,
isForm: true,
sortTableDefault:2
},
{
label: '供应商代码',
field: 'supplierCode',
sort: 'custom',
sortTableDefault:1,
table: {
width: 150
},
isSearch: true,
sortSearchDefault:2,
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
@ -159,7 +167,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
table: {
width: 150
},
isSearch: true,
isSearch: false,
},
{
label: '车牌号',
@ -189,6 +197,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
label: '从仓库代码',
field: 'fromWarehouseCode',
sort: 'custom',
isTable:false,
table: {
width: 150
},
@ -198,6 +207,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
label: '到仓库代码',
field: 'toWarehouseCode',
sort: 'custom',
isTable:false,
table: {
width: 150
},
@ -208,7 +218,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
field: 'fromAreaTypes',
dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -220,7 +230,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
field: 'toAreaTypes',
dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -231,6 +241,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
label: '从库区代码范围',
field: 'fromAreaCodes',
sort: 'custom',
isTable: false,
table: {
width: 150
},
@ -240,6 +251,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
label: '到库区代码范围',
field: 'toAreaCodes',
sort: 'custom',
isTable: false,
table: {
width: 150
},
@ -249,6 +261,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
label: '到月台代码',
field: 'toDockCode',
sort: 'custom',
isTable: false,
table: {
width: 150
},
@ -258,6 +271,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
label: '业务类型',
field: 'businessType',
sort: 'custom',
isTable: false,
table: {
width: 150
},
@ -299,6 +313,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
}
},
isForm: false,
isTable: false,
},
{
label: '创建者',
@ -308,6 +323,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
width: 150
},
isForm: false,
isTable: false,
},
{
label: '申请时间',
@ -330,6 +346,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
}
},
isForm: false,
isTable: false,
},
// {
// label: '截止时间',
@ -380,8 +397,9 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
field: 'status',
dictType: DICT_TYPE.REQUEST_STATUS,
dictClass: 'string',
isSearch: true,
isSearch: false,
isTable: true,
sortTableDefault:3,
isForm:false,
sort: 'custom',
table: {
@ -399,7 +417,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
field: 'autoCommit',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
isForm:false,
sort: 'custom',
table: {
@ -420,7 +438,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
field: 'autoAgree',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
isForm:false,
sort: 'custom',
table: {
@ -441,7 +459,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
field: 'autoExecute',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
isForm:false,
sort: 'custom',
table: {
@ -488,6 +506,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
width: 150
},
isForm: false,
isTable: false,
isSearch: false,
},
{
@ -548,11 +567,13 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
width: 150
},
isTableForm: false,
hiddenInMain:true,
isForm: false
},
{
label: '订单号',
field: 'poNumber',
hiddenInMain:true,
sort: 'custom',
table: {
width: 150
@ -596,6 +617,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
sortTableDefault:5,
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
@ -636,6 +658,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 180
},
hiddenInMain:true,
isForm: false,
},
{
@ -645,6 +668,8 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
isSearch:true,
sortTableDefault:6,
tableForm:{
disabled: true
},
@ -661,6 +686,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
sortTableDefault:7,
isTableForm: false,
isForm: false
},
@ -671,6 +697,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
hiddenInMain:true,
isTableForm: false,
isForm: false
},
@ -681,6 +708,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
hiddenInMain:true,
isTableForm: false,
isForm: false
},
@ -691,6 +719,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
hiddenInMain:true,
isTableForm: false,
isForm: false
},
@ -728,6 +757,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
precision: 6
},
},
hiddenInMain:true,
tableForm: {
type: 'InputNumber',
min: 1,
@ -741,6 +771,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
sortTableDefault:9,
form: {
component: 'InputNumber',
componentProps: {
@ -764,6 +795,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
sortTableDefault:10,
tableForm: {
type: 'Select',
disabled: true
@ -782,6 +814,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
disabled: true
}
},
sortTableDefault:11,
tableForm:{
disabled:true
},
@ -794,6 +827,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
sortTableDefault:12,
form: {
componentProps: {
isSearchList: true,
@ -848,6 +882,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
sortTableDefault:13,
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
@ -891,6 +926,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 180
},
hiddenInMain:true,
form: {
component: 'DatePicker',
componentProps: {
@ -910,6 +946,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
label: '批次',
field: 'batch',
sort: 'custom',
sortTableDefault:8,
table: {
width: 150
},
@ -938,6 +975,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 180
},
hiddenInMain:true,
form: {
component: 'DatePicker',
componentProps: {
@ -964,6 +1002,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 180
},
hiddenInMain:true,
form: {
component: 'DatePicker',
componentProps: {
@ -986,6 +1025,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
sortTableDefault:12,
isTableForm: false,
isForm: false
},
@ -1000,6 +1040,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
hiddenInMain:true,
isTableForm: false,
isForm: false,
tableForm: {
@ -1022,6 +1063,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
precision: 6
},
},
hiddenInMain:true,
isTableForm: false,
isForm: false
},
@ -1035,6 +1077,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
hiddenInMain:true,
isTableForm: false,
isForm: false,
tableForm: {
@ -1048,6 +1091,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
hiddenInMain:true,
form: {
component: 'InputNumber',
componentProps: {
@ -1064,6 +1108,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 180
},
hiddenInMain:true,
isTableForm: false,
form: {
componentProps: {
@ -1078,6 +1123,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
hiddenInMain:true,
isTableForm: false,
isForm: false
},
@ -1088,6 +1134,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
hiddenInMain:true,
isTableForm: false,
isForm: false
},
@ -1098,6 +1145,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
hiddenInMain:true,
isTableForm: false,
isForm: false
},
@ -1108,6 +1156,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
hiddenInMain:true,
},
{
label: '创建者',
@ -1116,6 +1165,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
hiddenInMain:true,
isTableForm: false,
isForm: false
},
@ -1130,6 +1180,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 180
},
hiddenInMain:true,
form: {
component: 'DatePicker',
componentProps: {

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

@ -56,6 +56,7 @@
@handleAddTable="handleAddTable"
@handleDeleteTable="handleDeleteTable"
@searchTableSuccess="searchTableSuccess"
@clearSearchInput="clearSearchInput"
@submitForm="submitForm"
@onChange="onChangeQty"
@onEnter="onEnter"
@ -120,6 +121,9 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
})
const clearSearchInput = (formField)=>{
tableData.value = []
}
//
const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
nextTick(async() => {
@ -140,6 +144,15 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
message.warning(`物料代码${repeatCode.join(',')}已经存在`);
}
if(val.length>0){
//frm
const setV = {}
tableData.value = [] //
setV['contactName']=val[0]['contacts']
setV['contactPhone']=val[0]['phone']
setV['contactEmail']=val[0]['email']
setV['taxRate']=val[0]['taxRate']
formRef.setValues(setV)
//
val.forEach(item=>{
const newRow = {...row}
newRow[formField] = item[searchField]
@ -169,8 +182,9 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
setV['contactPhone']=val[0]['phone']
setV['contactEmail']=val[0]['email']
setV['taxRate']=val[0]['taxRate']
formRef.setValues(setV)
onEnter('supplierCode')
}
formRef.setValues(setV)
}
})
}
@ -516,7 +530,12 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
}
const onEnter = (field)=>{
formRef.value.handleAddTable()
const timer = setTimeout(()=>{
formRef.value.handleAddTable()
if(timer){
clearTimeout(timer)
}
},500)
}
/** 初始化 **/
onMounted(async () => {

41
src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts

@ -68,6 +68,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
isTable: true,
isForm:false,
isSearch: true,
sortSearchDefault:1000,
sort: 'custom',
table: {
width: 150
@ -105,7 +106,8 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '截止日期',
field: 'dueDate',
isTable: true,
isTable: false,
isForm: false,
formatter: dateFormatter2,
detail:{
dateFormat: 'YYYY-MM-DD'
@ -145,6 +147,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '版本',
field: 'version',
sort: 'custom',
isTable:false,
table: {
width: 150
},
@ -165,6 +168,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
},
isTableForm: false,
isForm: false,
isTable:false,
},
{
label: '是否寄存订单',
@ -191,7 +195,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'available',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -211,6 +215,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '联系人姓名',
field: 'contactName',
sort: 'custom',
isTable:false,
table: {
width: 150
},
@ -219,6 +224,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '联系人电话',
field: 'contactPhone',
sort: 'custom',
isTable:false,
table: {
width: 150
},
@ -227,6 +233,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '联系人电子邮件',
field: 'contactEmail',
sort: 'custom',
isTable:false,
table: {
width: 150
},
@ -253,6 +260,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'creator',
sort: 'custom',
isForm: false,
isTable:false,
table: {
width: 150
},
@ -260,7 +268,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '创建时间',
field: 'createTime',
isTable: true,
isTable:false,
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
@ -285,6 +293,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'updater',
sort: 'custom',
isForm: false,
isTable:false,
table: {
width: 150
},
@ -292,7 +301,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '最后更新时间',
field: 'updateTime',
isTable: true,
isTable: false,
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
@ -315,6 +324,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '备注',
field: 'remark',
isTable: false,
table: {
width: 150
},
@ -378,6 +388,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
label: '单据号',
field: 'number',
isTableForm: false,
hiddenInMain:true,
table: {
width: 180
},
@ -401,6 +412,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '物料代码',
field: 'itemCode',
isSearch: true,
table: {
width: 150
},
@ -486,6 +498,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain:true,
isTableForm: false,
isForm: false,
},
@ -495,12 +508,14 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain:true,
isTableForm: false,
isForm: false,
},
{
label: '包装数量',
field: 'packQty',
hiddenInMain:true,
table: {
width: 150
},
@ -516,6 +531,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
{
label: '包装规格',
hiddenInMain:true,
field: 'packUnit',
// dictType: DICT_TYPE.PACK_UNIT,
// dictClass: 'string',
@ -529,6 +545,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '供应商计量数量',
field: 'supplierQty',
hiddenInMain:true,
table: {
width: 150
},
@ -548,6 +565,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
hiddenInMain:true,
table: {
width: 150
},
@ -563,6 +581,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
min: 0
}
},
hiddenInMain:true,
table: {
width: 150
},
@ -575,6 +594,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain:true,
form: {
component: 'InputNumber',
componentProps: {
@ -592,6 +612,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain:true,
form: {
component: 'InputNumber',
componentProps: {
@ -609,6 +630,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain:true,
form: {
component: 'InputNumber',
value: 0,
@ -626,6 +648,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain:true,
form: {
component: 'InputNumber',
value: 0,
@ -643,6 +666,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain:true,
form: {
component: 'InputNumber',
value: 1,
@ -660,6 +684,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain:true,
form: {
component: 'InputNumber',
componentProps: {
@ -676,6 +701,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain:true,
form: {
component: 'InputNumber',
componentProps: {
@ -695,6 +721,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain:true,
tableForm:{
type:'Select',
default: 'TRUE',
@ -716,6 +743,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain:true,
form: {
component: 'InputNumber',
componentProps: {
@ -736,6 +764,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain:true,
isForm: false,
},
{
@ -750,6 +779,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
hiddenInMain:true,
isForm: false,
form: {
component: 'DatePicker',
@ -768,6 +798,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain:true,
isForm: false,
form: {
component: 'DatePicker',
@ -782,9 +813,9 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '最后更新时间',
field: 'updateTime',
hiddenInMain:false,
isTableForm: false,
isTable: true,
hiddenInMain:true,
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'

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

@ -64,6 +64,8 @@
<!-- 导入 -->
<ImportForm ref="importFormRef" url="/wms/purchase-plan-main/import" :importTemplateData="importTemplateData"
@success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
<!-- 创建供应商发货申请 -->
<supplierdeliverBasicForm ref="supplierdeliverFormRef" @getList="getList" ></supplierdeliverBasicForm>
</template>
<script setup lang="ts">
@ -76,6 +78,7 @@
import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import { PurchaseDetail } from '../purchaseMain/purchaseMain.data'
import dayjs from 'dayjs'
import supplierdeliverBasicForm from '../supplierdeliverRequestMain/supplierdeliverBasicForm.vue'
//
defineOptions({ name: 'PurchasePlanMain' })
@ -230,6 +233,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), //
// {
// label: '',
// name: 'zdy',
@ -287,8 +291,19 @@ const getSearchTableData = async (number,formField,searchField)=>{
defaultButtons.mainListPurchasePlanModBtn({ hide: isShowMainButton(row, ['5']) }), //
// defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchase-plan-main:update' }), //
// defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-plan-main:delete'}), //
{
label: '创建供应商发货申请',
name: 'supplierdeliver',
hide: isShowMainButton(row, ['1']),
type: 'primary',
icon: '',
color: '',
hasPermi: '',
link: true //
}
]
}
const supplierdeliverFormRef = ref()
// -
const buttonTableClick = async (val, row) => {
@ -310,9 +325,15 @@ const getSearchTableData = async (number,formField,searchField)=>{
openForm('update', row)
} else if (val == 'delete') { //
handleDelete(row.masterId)
} else if (val == 'supplierdeliver') { //
supplierdeliverFormRef.value.openFormByCreate({
number:row.number, //
supplierCode:row.supplierCode, //
endTime:row.endTime, //
deliveryDate:row.deliveryDate //
})
}
}
/** 添加/修改操作 */
const formRef = ref()
const openForm = async (type : string, row ?: number) => {

37
src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts

@ -55,6 +55,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false,
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
@ -84,6 +85,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '收货人',
field: 'contacts',
isTable:false,
table: {
width: 150
},
@ -96,6 +98,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '联系电话',
field: 'phone',
isTable:false,
table: {
width: 150
},
@ -111,6 +114,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
sortTableDefault:1000,
formatter: dateFormatter2,
form: {
component: 'DatePicker',
@ -131,6 +135,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false,
isForm: false
},
{
@ -140,6 +145,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
sortTableDefault:1001,
form:{
component:"TimePicker",
componentProps: {
@ -154,6 +160,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
sortTableDefault:1002,
form:{
component:"TimePicker",
componentProps: {
@ -168,6 +175,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false,
isForm: false,
},
{
@ -178,6 +186,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
isForm: false,
isTable:false,
},
{
label: '业务类型',
@ -187,6 +196,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
isForm: false,
isTable:false,
form: {
value: 'PurchaseReceipt',
componentProps: {
@ -202,7 +212,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
dictClass: 'string',
isTable: true,
isForm:false,
isSearch: true,
isSearch: false,
table: {
width: 150
},
@ -278,6 +288,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'creator',
sort: 'custom',
isForm: false,
isTable:false,
table: {
width: 150
},
@ -285,7 +296,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '创建时间',
field: 'createTime',
isTable: true,
isTable:false,
isForm: false,
formatter: dateFormatter,
detail: {
@ -310,6 +321,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'updater',
sort: 'custom',
isForm: false,
isTable:false,
table: {
width: 150
},
@ -317,7 +329,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '最后更新时间',
field: 'updateTime',
isTable: true,
isTable: false,
isForm: false,
formatter: dateFormatter,
detail: {
@ -395,6 +407,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
field: 'number',
sort: 'custom',
isTableForm: false,
hiddenInMain:true,
table: {
width: 180
},
@ -404,6 +417,14 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
{
label: '采购订单号',
field: 'poNumber',
isSearch:true,
isTable:false,
isForm:false,
isTableForm:false
},
{
label: '订单号',
field: 'poNumber',
@ -517,6 +538,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isSearch:true,
form: {
componentProps: {
disabled: true
@ -526,7 +548,6 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
disabled: true
}
},
{
label: '订单数量',
field: 'orderQty',
@ -572,7 +593,9 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
isTableForm: false,
isForm: false
isForm: false,
hiddenInMain:true,
},
{
label: '计量单位',
@ -595,6 +618,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
hiddenInMain:true,
sort: 'custom',
table: {
width: 150
@ -618,6 +642,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
field: 'updater',
sort: 'custom',
isTableForm: false,
hiddenInMain:true,
table: {
width: 150
},
@ -628,6 +653,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
field: 'updateTime',
sort: 'custom',
isTableForm: false,
hiddenInMain:true,
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
@ -650,6 +676,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
label: '备注',
field: 'remark',
sort: 'custom',
hiddenInMain:true,
table: {
width: 150
},

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

@ -44,7 +44,8 @@
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<BasicForm
<supplierdeliverBasicForm ref="supplierdeliverFormRef" @getList="getList" ></supplierdeliverBasicForm>
<!-- <BasicForm
ref="formRef"
:isOpenSearchTable="true"
:indexTableColumn="0"
@ -63,15 +64,15 @@
@submitForm="submitForm"
@formFormDateChange="formFormDateChange"
@onEnter="onEnter"
>
<template v-slot="{row}">
> -->
<!-- <template v-slot="{row}">
<el-date-picker v-bind:modelValue="row['expireTime']?addDay(row['produceDate'],row['expireTime']).format('YYYY-MM-DD'):'2099-12-31'"
:clearable="true"
style="width: 100%"
:disabled="true"
placeholder="选择日期"/>
</template>
</BasicForm>
</BasicForm> -->
<!-- 详情 -->
<Detail
@ -179,7 +180,7 @@ import { PurchasePlanDetail } from '../purchasePlanMain/purchasePlanMain.data'
import { addDay } from '@/utils/formatTime'
import * as SupplierApi from '@/api/wms/supplier'
import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
import supplierdeliverBasicForm from './supplierdeliverBasicForm.vue'
//
defineOptions({ name: 'SupplierdeliverRequestMain' })
@ -528,42 +529,45 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
}
///
const formRef = ref()
const supplierdeliverFormRef = ref()
const openForm = async (type: string, row?: number) => {
if(type == "update"){
SupplierdeliverRequestMain.allSchemas.formSchema.forEach((item) => {
if(item.field == 'supplierCode'){
item.componentProps.isSearchList = false
item.componentProps.disabled = true
}
if(item.field == 'ppNumber'){
item.componentProps.isSearchList = false
item.componentProps.disabled = true
}
if(item.field == 'asnNumber'){
item.componentProps.disabled = true
}
if(item.field == 'planArriveTime'){
item.componentProps.disabled = true
}
})
}else {
SupplierdeliverRequestMain.allSchemas.formSchema.forEach((item) => {
if(item.field == 'supplierCode'){
item.componentProps.isSearchList = true
}
if(item.field == 'ppNumber'){
item.componentProps.isSearchList = true
}
if(item.field == 'asnNumber'){
item.componentProps.disabled = false
}
if(item.field == 'planArriveTime'){
item.componentProps.disabled = false
}
})
}
tableData.value = [] //
formRef.value.open(type, row)
supplierdeliverFormRef.value.openForm(type, row)
// if(type == "update"){
// SupplierdeliverRequestMain.allSchemas.formSchema.forEach((item) => {
// if(item.field == 'supplierCode'){
// item.componentProps.isSearchList = false
// item.componentProps.disabled = true
// }
// if(item.field == 'ppNumber'){
// item.componentProps.isSearchList = false
// item.componentProps.disabled = true
// }
// if(item.field == 'asnNumber'){
// item.componentProps.disabled = true
// }
// if(item.field == 'planArriveTime'){
// item.componentProps.disabled = true
// }
// })
// }else {
// SupplierdeliverRequestMain.allSchemas.formSchema.forEach((item) => {
// if(item.field == 'supplierCode'){
// item.componentProps.isSearchList = true
// }
// if(item.field == 'ppNumber'){
// item.componentProps.isSearchList = true
// }
// if(item.field == 'asnNumber'){
// item.componentProps.disabled = false
// }
// if(item.field == 'planArriveTime'){
// item.componentProps.disabled = false
// }
// })
// }
// tableData.value = [] //
// formRef.value.open(type, row)
}
/** 删除按钮操作 */

330
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue

@ -0,0 +1,330 @@
<template>
<!-- 表单弹窗添加/修改 -->
<!-- 供应商发货申请 -->
<BasicForm
ref="formRef"
:isOpenSearchTable="true"
:indexTableColumn="0"
@success="getList"
:rules="SupplierdeliverRequestMainRules"
:formAllSchemas="SupplierdeliverRequestMain.allSchemas"
:tableAllSchemas="SupplierdeliverRequestDetail.allSchemas"
:tableFormRules="SupplierdeliverRequestDetailRules"
:tableData="tableData"
:apiUpdate="SupplierdeliverRequestMainApi.updateSupplierdeliverRequestMain"
:apiCreate="SupplierdeliverRequestMainApi.createSupplierdeliverRequestMain"
:isBusiness="true"
@handleAddTable="handleAddTable"
@handleDeleteTable="handleDeleteTable"
@searchTableSuccess="searchTableSuccess"
@submitForm="submitForm"
@formFormDateChange="formFormDateChange"
@onEnter="onEnter"
>
<template v-slot="{row}">
<el-date-picker v-bind:modelValue="row['expireTime']?addDay(row['produceDate'],row['expireTime']).format('YYYY-MM-DD'):'2099-12-31'"
:clearable="true"
style="width: 100%"
:disabled="true"
placeholder="选择日期"/>
</template>
</BasicForm>
</template>
<script setup lang="ts">
import {
SupplierdeliverRequestMain,
SupplierdeliverRequestMainRules,
SupplierdeliverRequestDetail,
SupplierdeliverRequestDetailRules,
SupplierdeliverRequestDetailLabel,
SupplierdeliverRequestPackage
} from './supplierdeliverRequestMain.data'
import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
import * as PurchasePlanDetailApi from '@/api/wms/purchasePlanDetail'
import * as SupplierApi from '@/api/wms/supplier'
import * as ItembasicApi from '@/api/wms/itembasic'
import { addDay } from '@/utils/formatTime'
import { PurchasePlanDetail } from '../purchasePlanMain/purchasePlanMain.data'
import { formatDate } from '@/utils/formatTime'
const emit = defineEmits(['getList'])
const getList = () =>{
emit('getList')
}
const message = useMessage() //
const { t } = useI18n() //
const planArriveTimeStr = ref()
///
const formRef = ref()
const tableData = ref([])
const tableFormKeys = {}
SupplierdeliverRequestDetail.allSchemas.tableFormColumns.forEach((item) => {
tableFormKeys[item.field] = item.default ? item.default : ''
})
//
const handleAddTable = () => {
tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
}
//
const handleDeleteTable = (item, index) => {
tableData.value.splice(index, 1)
}
const openFormByCreate = async ( data ) => {
SupplierdeliverRequestMain.allSchemas.formSchema.forEach((item) => {
if(item.field == 'supplierCode'){
item.componentProps.isSearchList = true
}
if(item.field == 'ppNumber'){
item.componentProps.isSearchList = true
}
if(item.field == 'asnNumber'){
item.componentProps.disabled = false
}
if(item.field == 'planArriveTime'){
item.componentProps.disabled = false
}
})
const setV = {}
//
setV['supplierCode'] = data['supplierCode'] //
setV['ppNumber'] = data['number'] //
searchPage: SupplierApi.getSupplierPage
//--
getSearchTableData(data['number'],'ppNumber','number')
//
let beginTime = data['endTime']
let deliveryDate = formatDate(data['deliveryDate'],'YYYY-MM-DD')
planArriveTimeStr.value = deliveryDate + ' '+ beginTime+":00"
setV['planArriveTime']= new Date(planArriveTimeStr.value).valueOf();
formRef.value.open('create', null)
//
const {tableObject ,tableMethods} = useTable({
defaultParams:{code:data['supplierCode']},
getListApi: SupplierApi.getSupplierPage //
})
const { getList } = tableMethods
await getList()
if(tableObject.tableList.length>0){
setV['contactName'] = tableObject.tableList[0]['contacts'] //
setV['contactPhone'] = tableObject.tableList[0]['phone'] //
setV['contactEmail'] = tableObject.tableList[0]['email'] //
}
nextTick(() => {
console.log('formRef.value.formRef',formRef.value.formRef)
formRef.value.formRef.setValues(setV)
})
}
const openForm = async (type: string, row?: number) => {
if(type == "update"){
SupplierdeliverRequestMain.allSchemas.formSchema.forEach((item) => {
if(item.field == 'supplierCode'){
item.componentProps.isSearchList = false
item.componentProps.disabled = true
}
if(item.field == 'ppNumber'){
item.componentProps.isSearchList = false
item.componentProps.disabled = true
}
if(item.field == 'asnNumber'){
item.componentProps.disabled = true
}
if(item.field == 'planArriveTime'){
item.componentProps.disabled = true
}
})
}else {
SupplierdeliverRequestMain.allSchemas.formSchema.forEach((item) => {
if(item.field == 'supplierCode'){
item.componentProps.isSearchList = true
}
if(item.field == 'ppNumber'){
item.componentProps.isSearchList = true
}
if(item.field == 'asnNumber'){
item.componentProps.disabled = false
}
if(item.field == 'planArriveTime'){
item.componentProps.disabled = false
}
})
}
tableData.value = [] //
formRef.value.open(type, row)
}
//
const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
nextTick(() => {
console.log("type:",type)
console.log("formField:",formField)
console.log(formField, searchField, val, formRef, type, row)
if (type == 'tableForm') {
//
// row[formField] = val[0][searchField]
// if (formField == 'poNumber') {
// row['poNumber'] = val[0]['poNumber']
// row['itemCode'] = val[0]['itemCode']
// row['poLine'] = val[0]['poLine']
// row['orderQty'] = val[0]['orderQty']
// row['uom'] = val[0]['uom']
// }
//--
const itemCodes = []
val.forEach(item=>{
if(tableData.value.find(item1=>item1['id'] == item['id'])) return
const newRow = {...row}
newRow[formField] = item[searchField]
newRow['poNumber'] = item['poNumber']
newRow['itemCode'] = item['itemCode']
newRow['poLine'] = item['poLine']
newRow['orderQty'] = item['orderQty']
newRow['uom'] = item['uom']
itemCodes.push(item['itemCode'])
tableData.value.push(newRow)
})
//
ItembasicApi.getItembasicPage({
code:itemCodes.join(',')
}).then((res)=>{
res.list.forEach((item,index)=>{
const findItem = tableData.value.find(item1=>item1['itemCode']==item['code'])
findItem['expireTime'] = findItem['expireTime']
})
})
} else {
const setV = {}
setV[formField] = val[0][searchField]
if(formField == 'ppNumber'){
//--
getSearchTableData(val[0]['number'],formField,searchField)
//
let beginTime = val[0]['endTime']
let deliveryDate = formatDate(val[0]['deliveryDate'],'YYYY-MM-DD')
planArriveTimeStr.value = deliveryDate + ' '+ beginTime+":00"
setV['planArriveTime']= new Date(planArriveTimeStr.value).valueOf();
//
tableData.value = []
}
if(formField == 'supplierCode'){
setV['contactName'] = val[0]['contacts']
setV['contactPhone'] = val[0]['phone']
setV['contactEmail'] = val[0]['email']
}
formRef.setValues(setV)
}
})
}
const getSearchTableData = async (number,formField,searchField)=>{
const {tableObject ,tableMethods} = useTable({
defaultParams:{number},
getListApi: PurchasePlanDetailApi.getPurchasePlanDetailPage //
})
//
const { getList:getList1 } = tableMethods
await getList1()
const tableColumns = PurchasePlanDetail.allSchemas.tableFormColumns
tableColumns.forEach((item) => {
item.width = item.table?.width || 150
})
tableData.value = []
const itemCodes = []
tableObject.tableList.forEach(row=>{
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...row}))
newRow[formField] = row[searchField]
newRow['poNumber'] = row['poNumber']
newRow['itemCode'] = row['itemCode']
newRow['poLine'] = row['poLine']
newRow['orderQty'] = row['orderQty']
newRow['uom'] = row['uom']
tableData.value.push(newRow)
itemCodes.push(row['itemCode'])
})
//
ItembasicApi.getItembasicPage({
code:itemCodes.join(',')
}).then((res)=>{
res.list.forEach((item,index)=>{
const findItem = tableData.value.find(item1=>item1['itemCode']==item['code'])
findItem['expireTime'] = findItem['expireTime']
})
})
}
//
const submitForm = async (formType, data) => {
data.subList = tableData.value //
let isHave = data.subList.some((item) => {
console.log("CCCCC",item.expireDate)
if(item.expireDate != null){
item.produceDate > item.expireDate
}
})
if (isHave) {
message.error('生产日期不可以大于过期日期')
formRef.value.formLoading = false
return
}
try {
if (formType === 'create') {
let planArriveStr = formatDate(data.planArriveTime);
if(planArriveStr > planArriveTimeStr.value){
let confirmFlag = false;
await message.confirm("计划到货时间大于要货计划送达日期是否继续?").then(() => {
console.log("选择了OK")
//OK
}).catch(() => {
//
console.log("选择了cancel")
confirmFlag = true;
formRef.value.formLoading = false
return;
})
if(confirmFlag){
return;
}
}
if(tableData.value.length <= 0){
message.warning(`子表明细不能为空!`)
formRef.value.formLoading = false
return;
}
await SupplierdeliverRequestMainApi.createSupplierdeliverRequestMain(data)
message.success(t('common.createSuccess'))
} else {
await SupplierdeliverRequestMainApi.updateSupplierdeliverRequestMain(data)
message.success(t('common.updateSuccess'))
}
formRef.value.dialogVisible = false
//
getList()
} finally {
formRef.value.formLoading = false
}
}
const formFormDateChange = (field, val,row, index) => {
if(field == 'produceDate'){
let produceDateStr = formatDate(val,'YYYYMMDD');
row.batch = produceDateStr
row.supplierBatch = produceDateStr
}
}
//
const onEnter = async (field,value)=>{
console.log(field,value)
formRef.value.opensearchTable('supplierCode', 'code', '供应商信息', Supplier.allSchemas, SupplierApi.getSupplierPage,[{
key:'code',
value:value
}])
}
defineExpose({ openForm , openFormByCreate}) // open
</script>
<style lang="scss" scoped></style>

49
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@ -82,6 +82,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
label: '要货计划单号',
field: 'ppNumber',
sort: 'custom',
isTable:false,
table: {
width: 150
},
@ -118,6 +119,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
label: '联系人姓名',
field: 'contactName',
sort: 'custom',
isTable:false,
table: {
width: 150
},
@ -126,6 +128,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
label: '联系人电话',
field: 'contactPhone',
sort: 'custom',
isTable:false,
table: {
width: 150
},
@ -134,6 +137,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
label: '联系人电子邮件',
field: 'contactEmail',
sort: 'custom',
isTable:false,
table: {
width: 150
},
@ -142,6 +146,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
label: '供应商发货仓库代码',
field: 'fromWarehouseCode',
sort: 'custom',
isTable:false,
table: {
width: 150
},
@ -156,6 +161,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
label: '到仓库代码',
field: 'toWarehouseCode',
sort: 'custom',
isTable:false,
table: {
width: 150
},
@ -165,6 +171,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
label: '到月台代码',
field: 'toDockCode',
sort: 'custom',
isTable:false,
table: {
width: 150
},
@ -174,6 +181,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
label: '时间窗口',
field: 'timeWindow',
sort: 'custom',
isTable:false,
table: {
width: 150
},
@ -190,6 +198,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
table: {
width: 180
},
isTable:false,
form: {
component: 'DatePicker',
componentProps: {
@ -204,6 +213,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
label: '承运商',
field: 'carrierCode',
sort: 'custom',
isTable:false,
table: {
width: 150
},
@ -213,6 +223,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
field: 'transferMode',
dictType: DICT_TYPE.TRANSFER_MODE,
sort: 'custom',
isTable:false,
table: {
width: 150
},
@ -221,6 +232,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
label: '车牌号',
field: 'vehiclePlateNumber',
sort: 'custom',
isTable:false,
table: {
width: 150
},
@ -256,6 +268,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
isTable:false,
table: {
width: 180
},
@ -274,6 +287,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
label: '创建者',
field: 'creator',
sort: 'custom',
isTable:false,
table: {
width: 150
},
@ -287,6 +301,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
isTable:false,
table: {
width: 180
},
@ -309,6 +324,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
isTable:false,
table: {
width: 180
},
@ -353,7 +369,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
dictClass: 'string',
isTable: true,
isForm:false,
isSearch: true,
isSearch: false,
sort: 'custom',
table: {
width: 150
@ -373,6 +389,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
isTable:false,
table: {
width: 180
},
@ -394,6 +411,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
table: {
width: 150
},
isTable:false,
isForm: false
},
{
@ -401,7 +419,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
field: 'autoCommit',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable:false,
sort: 'custom',
isForm:false,
table: {
@ -422,7 +440,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
field: 'autoAgree',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -443,7 +461,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
field: 'autoExecute',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -554,12 +572,13 @@ export const SupplierdeliverRequestMainRules = reactive({
*/
export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '订单号',
label: '采购订单号',
field: 'poNumber',
sort: 'custom',
table: {
width: 150
},
isSearch:true,
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
@ -626,6 +645,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
label: '物料代码',
field: 'itemCode',
sort: 'custom',
isSearch:true,
table: {
width: 150
},
@ -645,6 +665,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
hiddenInMain:true,
tableForm: {
disabled: true
}
@ -705,6 +726,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
dateFormat: 'YYYY-MM-DD'
},
sort: 'custom',
hiddenInMain:true,
table: {
width: 180
},
@ -728,6 +750,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
},
{
label: '过期日期',
hiddenInMain:true,
field: 'expireDate',
formatter: dateFormatter2,
detail: {
@ -782,6 +805,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
hiddenInMain:true,
form: {
component: 'InputNumber',
componentProps: {
@ -802,6 +826,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
label: '供应商计量数量',
field: 'supplierPackQty',
sort: 'custom',
hiddenInMain:true,
table: {
width: 150
},
@ -825,6 +850,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
field: 'supplierPackUnit',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
hiddenInMain:true,
isTable: true,
sort: 'custom',
table: {
@ -838,6 +864,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
},
{
label: '转换率',
hiddenInMain:true,
field: 'convertRate',
sort: 'custom',
table: {
@ -858,6 +885,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
},
{
label: '单据号',
hiddenInMain:true,
field: 'number',
sort: 'custom',
table: {
@ -893,6 +921,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
hiddenInMain:true,
isTableForm: false,
isForm: false
},
@ -903,6 +932,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
hiddenInMain:true,
isTableForm: false,
isForm: false
},
@ -913,6 +943,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
hiddenInMain:true,
isTableForm: false,
isForm: false
},
@ -923,6 +954,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
hiddenInMain:true,
isTableForm: false,
isForm: false
},
@ -933,6 +965,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
hiddenInMain:true,
isTableForm: false,
isForm: false
},
@ -943,6 +976,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
hiddenInMain:true,
isTableForm: false,
isForm: false
},
@ -953,6 +987,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
hiddenInMain:true,
form: {
component: 'DatePicker',
componentProps: {
@ -976,6 +1011,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
hiddenInMain:true,
isTableForm: false,
isForm: false,
},
@ -995,6 +1031,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
valueFormat: 'x',
}
},
hiddenInMain:true,
sort: 'custom',
table: {
width: 180
@ -1009,6 +1046,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
hiddenInMain:true,
isTableForm: false,
isForm: false,
},
@ -1016,6 +1054,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
label: '备注',
field: 'remark',
sort: 'custom',
hiddenInMain:true,
table: {
width: 150
},

12
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts

@ -365,7 +365,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '创建者',
field: 'creator',
sort: 'custom',
sortDefault:1000,
sortTableDefault:1000,
table: {
width: 150
},
@ -374,7 +374,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '创建时间',
field: 'createTime',
isTable: true,
sortDefault:1001,
sortTableDefault:1001,
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
@ -387,7 +387,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '采购审批人',
field: 'procurementCreator',
sortDefault:1002,
sortTableDefault:1002,
sort: 'custom',
table: {
width: 150
@ -397,7 +397,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '采购审批时间',
field: 'procurementCreateTime',
sortDefault:1003,
sortTableDefault:1003,
isTable: true,
formatter: dateFormatter,
detail: {
@ -412,7 +412,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '财务审批用户名',
field: 'financialCreator',
sortDefault:1004,
sortTableDefault:1004,
sort: 'custom',
table: {
width: 150
@ -422,7 +422,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '财务审批时间',
field: 'financialCreateTime',
sortDefault:1005,
sortTableDefault:1005,
isTable: true,
formatter: dateFormatter,
detail: {

6
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

@ -240,8 +240,8 @@
//
const HeadButttondata = [
defaultButtons.defaultAddBtn({ hasPermi: 'wms:supplierinvoice-request-main:create' }), //
defaultButtons.defaultImportBtn(null), //
defaultButtons.defaultExportBtn(null), //
defaultButtons.defaultImportBtn({hasPermi: 'wms:supplierinvoice-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi: 'wms:supplierinvoice-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), //
@ -341,7 +341,7 @@
hasPermi: 'wms:supplierinvoice-request-main:financeRej'
},
defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierinvoice-request-main:update' , hide: isShowMainButton(row, ['1','8','6'])}), //
defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1','8','6']) }), //
defaultButtons.mainListPurchasePlanCloBtn({ hasPermi: 'wms:supplierinvoice-request-main:close' ,hide: isShowMainButton(row, ['1','8','6']) }), //
// defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierinvoice-request-main:delete'}), //
]
}

12
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@ -414,7 +414,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
table: {
width: 150
},
sortDefault:1001,
sortTableDefault:1001,
isForm: false,
},
{
@ -422,7 +422,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
field: 'createTime',
isTable: true,
formatter: dateFormatter,
sortDefault:1000,
sortTableDefault:1000,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
@ -468,7 +468,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
label: '采购审批人',
field: 'procurementCreator',
sort: 'custom',
sortDefault:1003,
sortTableDefault:1003,
table: {
width: 150
},
@ -478,7 +478,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
label: '采购审批时间',
field: 'procurementCreateTime',
isTable: true,
sortDefault:1004,
sortTableDefault:1004,
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
@ -502,7 +502,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
label: '财务审批时间',
field: 'financialCreateTime',
isTable: true,
sortDefault:1005,
sortTableDefault:1005,
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
@ -518,7 +518,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
field: 'supplierCreator',
sort: 'custom',
isTable:false,
sortDefault:1006,
sortTableDefault:1006,
table: {
width: 180
},

4
src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue

@ -172,8 +172,10 @@ const buttonTableClick = async (val, row) => {
openForm('update', row)
} else if (val == 'delete') { //
handleDelete(row.id)
} else if(val == 'agree'){
} else if(val == 'agree'){//
handleAgree(row.id)
} else if(val == 'refuse'){//
handleRefuse(row.id)
}
}

Loading…
Cancel
Save