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

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

intex_onlin20250418
张立 6 days ago
parent
0d229ee7df 8995ef6150
commit
49cb2d2080
7 changed files with 265 additions and 257 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/components/Table/src/TableV2.vue
  2. 54
      src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
  3. 270
      src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
  4. 3
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
  5. 1
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
  6. 168
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainQuery/index.vue
  7. 20
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainQuery/supplierinvoiceRequestMain.data.ts

6
src/components/Table/src/TableV2.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div style="height: 400px" v-loading="loading"> <div style="height: 400px" v-loading="loading||timeLoading">
<el-auto-resizer> <el-auto-resizer>
<template #default="{ height, width }"> <template #default="{ height, width }">
<el-table-v2 <el-table-v2
@ -149,8 +149,10 @@ const mColumns = ref(props.columns.map(item=>({
}))) })))
const mData = ref([]) const mData = ref([])
const timeLoading = ref(false)
watch(()=>props.data,()=>{ watch(()=>props.data,()=>{
console.log('selections',selections.value ) console.log('selections',selections.value )
timeLoading.value = true
mData.value = props.data.map(item=>({ mData.value = props.data.map(item=>({
...item, ...item,
checked: selections.value.find(item1=>item1.id==item.id)?true:false, checked: selections.value.find(item1=>item1.id==item.id)?true:false,
@ -158,6 +160,8 @@ watch(()=>props.data,()=>{
})) }))
console.log('mData',mData.value) console.log('mData',mData.value)
timeLoading.value = false
}) })
const rowEventHandlers = ({onClick})=>{ const rowEventHandlers = ({onClick})=>{

54
src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
View File

@ -213,33 +213,33 @@ export const ScrapRecordMain = useCrudSchemas(
isForm:false, isForm:false,
isTableForm:false, isTableForm:false,
}, },
{ // {
label: 'Q1通知单号', // label: 'Q1通知单号',
field: 'q1Number', // field: 'q1Number',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 180 // width: 180
}, // },
isSearch: false // isSearch: false
}, // },
{ // {
label: 'Q2通知单号', // label: 'Q2通知单号',
field: 'q2Number', // field: 'q2Number',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 180 // width: 180
}, // },
isSearch: false // isSearch: false
}, // },
{ // {
label: 'Q3通知单号', // label: 'Q3通知单号',
field: 'q3Number', // field: 'q3Number',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 180 // width: 180
}, // },
isSearch: false // isSearch: false
}, // },
{ {
label: '申请时间', label: '申请时间',
field: 'requestTime', field: 'requestTime',

270
src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
View File

@ -420,141 +420,141 @@ export const ScrapRequestMain = useCrudSchemas(
filterable: true filterable: true
} }
}, },
{ // {
label: 'Q1通知单号', // label: 'Q1通知单号',
field: 'q1Number', // field: 'q1Number',
sort: 'custom', // sort: 'custom',
isSearch: false, // isSearch: false,
isDetail: true, // isDetail: true,
table: { // table: {
width: 150 // width: 150
}, // },
form: { // form: {
// labelMessage: '信息提示说明！！！', // // labelMessage: '信息提示说明！！！',
componentProps: { // componentProps: {
enterSearch: true, // enterSearch: true,
// multiple: true, // // multiple: true,
isSearchList: true, // 开启查询弹窗 // isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择Q1通知单号', // 输入框占位文本 // searchListPlaceholder: '请选择Q1通知单号', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段 // searchField: 'number', // 查询弹窗赋值字段
searchTitle: 'Q1通知单号', // 查询弹窗标题 // searchTitle: 'Q1通知单号', // 查询弹窗标题
searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类 // searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法 // searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
searchCondition: [ // searchCondition: [
{ // {
key: 'available', // key: 'available',
value: 'TRUE', // value: 'TRUE',
isMainValue: false // isMainValue: false
}, // },
{ // {
key: 'status', // key: 'status',
value: '0', // value: '0',
isMainValue: false // isMainValue: false
} // }
], // ],
verificationParams: [ // verificationParams: [
{ // {
key: 'number', // key: 'number',
action: '==', // action: '==',
value: '', // value: '',
isMainValue: false, // isMainValue: false,
isSearch: true, // isSearch: true,
isFormModel: true // isFormModel: true
} // }
] // 失去焦点校验参数 // ] // 失去焦点校验参数
} // }
} // }
}, // },
{ // {
label: 'Q2通知单号', // label: 'Q2通知单号',
field: 'q2Number', // field: 'q2Number',
sort: 'custom', // sort: 'custom',
isSearch: false, // isSearch: false,
isDetail: true, // isDetail: true,
table: { // table: {
width: 150 // width: 150
}, // },
form: { // form: {
// labelMessage: '信息提示说明！！！', // // labelMessage: '信息提示说明！！！',
componentProps: { // componentProps: {
enterSearch: true, // enterSearch: true,
// multiple: true, // // multiple: true,
isSearchList: true, // 开启查询弹窗 // isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本 // searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段 // searchField: 'number', // 查询弹窗赋值字段
searchTitle: 'Q2通知单号', // 查询弹窗标题 // searchTitle: 'Q2通知单号', // 查询弹窗标题
searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类 // searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类
searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法 // searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法
searchCondition: [ // searchCondition: [
{ // {
key: 'available', // key: 'available',
value: 'TRUE', // value: 'TRUE',
isMainValue: false // isMainValue: false
}, // },
{ // {
key: 'status', // key: 'status',
value: '0', // value: '0',
isMainValue: false // isMainValue: false
} // }
], // ],
verificationParams: [ // verificationParams: [
{ // {
key: 'number', // key: 'number',
action: '==', // action: '==',
value: '', // value: '',
isMainValue: false, // isMainValue: false,
isSearch: true, // isSearch: true,
isFormModel: true // isFormModel: true
} // }
] // 失去焦点校验参数 // ] // 失去焦点校验参数
} // }
} // }
}, // },
{ // {
label: 'Q3通知单号', // label: 'Q3通知单号',
field: 'q3Number', // field: 'q3Number',
sort: 'custom', // sort: 'custom',
isSearch: false, // isSearch: false,
isDetail: true, // isDetail: true,
table: { // table: {
width: 150 // width: 150
}, // },
form: { // form: {
// labelMessage: '信息提示说明！！！', // // labelMessage: '信息提示说明！！！',
componentProps: { // componentProps: {
enterSearch: true, // enterSearch: true,
// multiple: true, // // multiple: true,
isSearchList: true, // 开启查询弹窗 // isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本 // searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段 // searchField: 'number', // 查询弹窗赋值字段
searchTitle: 'Q3通知单号', // 查询弹窗标题 // searchTitle: 'Q3通知单号', // 查询弹窗标题
searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类 // searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类
searchPage: InspectionQ3Api.getInspectionQ3MainPage, // 查询弹窗所需分页方法 // searchPage: InspectionQ3Api.getInspectionQ3MainPage, // 查询弹窗所需分页方法
searchCondition: [ // searchCondition: [
{ // {
key: 'available', // key: 'available',
value: 'TRUE', // value: 'TRUE',
isMainValue: false // isMainValue: false
}, // },
{ // {
key: 'status', // key: 'status',
value: '0', // value: '0',
isMainValue: false // isMainValue: false
} // }
], // ],
verificationParams: [ // verificationParams: [
{ // {
key: 'number', // key: 'number',
action: '==', // action: '==',
value: '', // value: '',
isMainValue: false, // isMainValue: false,
isSearch: true, // isSearch: true,
isFormModel: true // isFormModel: true
} // }
] // 失去焦点校验参数 // ] // 失去焦点校验参数
} // }
} // }
}, // },
{ {
label: '状态', label: '状态',
field: 'status', field: 'status',

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

@ -548,6 +548,9 @@ export const InventorymoveRequestMainRules = reactive({
fromWarehouseCode: [ fromWarehouseCode: [
{ required: true, message: '请选择从仓库代码', trigger: 'blur' } { required: true, message: '请选择从仓库代码', trigger: 'blur' }
], ],
fromLocationCode: [
{ required: true, message: '请选择从库位代码', trigger: 'blur' }
],
toLocationCode: [ toLocationCode: [
{ required: true, message: '请选择到库位代码', trigger: 'change' } { required: true, message: '请选择到库位代码', trigger: 'change' }
], ],

1
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
View File

@ -439,6 +439,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x',
disabled:true
} }
}, },
}, },

168
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainQuery/index.vue
View File

@ -767,91 +767,91 @@ const isShowMainButton = (row, val) => {
const butttondata = (row, $index) => { const butttondata = (row, $index) => {
return [ return [
// defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['9']) ,hasPermi: 'wms:supplierinvoice-request-main:open'}), // 打开 // defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['9']) ,hasPermi: 'wms:supplierinvoice-request-main:open'}), // 打开
defaultButtons.mainListPlanSubBtn({ // defaultButtons.mainListPlanSubBtn({
hide: isShowMainButton(row, ['1', '6']), // hide: isShowMainButton(row, ['1', '6']),
hasPermi: 'wms:supplierinvoice-request-main:sub' // hasPermi: 'wms:supplierinvoice-request-main:sub'
}), // 提交审批 // }), // 提交审批
{ // {
label: t('ts.查看明细'), // label: t('ts.查看明细'),
name: 'open_detail', // name: 'open_detail',
type: 'primary', // type: 'primary',
icon: '', // icon: '',
color: '', // color: '',
hasPermi: '', // hasPermi: '',
link: true // 文本展现按钮 // link: true // 文本展现按钮
}, // },
{ // {
label: t('ts.采购通过'), // label: t('ts.采购通过'),
name: 'purchase_mainPlanSub', // name: 'purchase_mainPlanSub',
hide: !(!isShowMainButton(row, ['2']) && row.currentIsProcurementCreator == true), // hide: !(!isShowMainButton(row, ['2']) && row.currentIsProcurementCreator == true),
type: 'primary', // type: 'primary',
icon: '', // icon: '',
color: '', // color: '',
hasPermi: 'wms:supplierinvoice-request-main:app', // hasPermi: 'wms:supplierinvoice-request-main:app',
link: true // 文本展现按钮 // link: true // 文本展现按钮
}, // },
{ // {
label: t('ts.采购驳回'), // label: t('ts.采购驳回'),
name: 'purchase_mainPlanTur', // name: 'purchase_mainPlanTur',
hide: !(!isShowMainButton(row, ['2']) && row.currentIsProcurementCreator == true), // hide: !(!isShowMainButton(row, ['2']) && row.currentIsProcurementCreator == true),
type: 'danger', // type: 'danger',
color: '', // color: '',
link: true, // 文本展现按钮 // link: true, // 文本展现按钮
hasPermi: 'wms:supplierinvoice-request-main:rej' // hasPermi: 'wms:supplierinvoice-request-main:rej'
}, // },
{ // {
label: t('ts.供应商确认'), // label: t('ts.供应商确认'),
name: 'invoice_sent_out', // name: 'invoice_sent_out',
hide: isShowMainButton(row, ['3', '7']), // hide: isShowMainButton(row, ['3', '7']),
type: 'danger', // type: 'danger',
color: '', // color: '',
link: true, // 文本展现按钮 // link: true, // 文本展现按钮
hasPermi: 'wms:supplierinvoice-request-main:invoiceSentOut' // hasPermi: 'wms:supplierinvoice-request-main:invoiceSentOut'
}, // },
{ // {
label: t('ts.财务通过'), // label: t('ts.财务通过'),
name: 'finance_mainPlanSub', // name: 'finance_mainPlanSub',
hide: isShowMainButton(row, ['4']), // hide: isShowMainButton(row, ['4']),
type: 'primary', // type: 'primary',
icon: '', // icon: '',
color: '', // color: '',
hasPermi: 'wms:supplierinvoice-request-main:financeApp', // hasPermi: 'wms:supplierinvoice-request-main:financeApp',
link: true // 文本展现按钮 // link: true // 文本展现按钮
}, // },
{ // {
label: t('ts.财务驳回'), // label: t('ts.财务驳回'),
name: 'finance_mainPlanTur', // name: 'finance_mainPlanTur',
hide: isShowMainButton(row, ['4']), // hide: isShowMainButton(row, ['4']),
type: 'danger', // type: 'danger',
color: '', // color: '',
link: true, // 文本展现按钮 // link: true, // 文本展现按钮
hasPermi: 'wms:supplierinvoice-request-main:financeRej' // hasPermi: 'wms:supplierinvoice-request-main:financeRej'
}, // },
defaultButtons.mainListEditBtn({ // defaultButtons.mainListEditBtn({
hasPermi: 'wms:supplierinvoice-request-main:update', // hasPermi: 'wms:supplierinvoice-request-main:update',
hide: isShowMainButton(row, ['1', '3', '6', '7']) // hide: isShowMainButton(row, ['1', '3', '6', '7'])
}), // 编辑 // }), // 编辑
// defaultButtons.mainListPurchasePlanCloBtn({ hasPermi: 'wms:supplierinvoice-request-main:close' ,hide: isShowMainButton(row, ['1','3','6','7']) }), // 关闭 // // defaultButtons.mainListPurchasePlanCloBtn({ hasPermi: 'wms:supplierinvoice-request-main:close' ,hide: isShowMainButton(row, ['1','3','6','7']) }), // 关闭
{ // {
label: t('ts.作废'), // label: t('ts.作废'),
name: 'repeal', // name: 'repeal',
hide: isShowMainButton(row, ['1', '3', '6', '7']), // hide: isShowMainButton(row, ['1', '3', '6', '7']),
type: 'danger', // type: 'danger',
color: '', // color: '',
link: true, // 文本展现按钮 // link: true, // 文本展现按钮
hasPermi: 'wms:supplierinvoice-request-main:repeal' // hasPermi: 'wms:supplierinvoice-request-main:repeal'
}, // },
// defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierinvoice-request-main:delete'}), // 删除 // // defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierinvoice-request-main:delete'}), // 删除
// {
// label: t('打印对账单'),
// name: 'mian_print',
// hide: !(row.goldenTaxInvoiceNumber != null && row.goldenTaxInvoiceNumber != ''),
// type: 'primary',
// color: '',
// link: true, // 文本展现按钮
// hasPermi: ''
// },
{ {
label: t('打印对账单'),
name: 'mian_print',
hide: !(row.goldenTaxInvoiceNumber != null && row.goldenTaxInvoiceNumber != ''),
type: 'primary',
color: '',
link: true, // 文本展现按钮
hasPermi: ''
}
,{
label: t('导出对账单明细'), label: t('导出对账单明细'),
name: 'export_statement_detail', name: 'export_statement_detail',
hide: false, hide: false,

20
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainQuery/supplierinvoiceRequestMain.data.ts
View File

@ -1279,16 +1279,16 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
} }
} }
}, },
// { {
// label: '操作', label: '操作',
// field: 'action', field: 'action',
// isDetail: false, isDetail: false,
// isForm: false, isForm: false,
// table: { table: {
// width: 300, width: 150,
// fixed: 'right' fixed: 'right'
// }, },
// } }
])) ]))
export const accountantFormartDetail = ( cellValue) => { export const accountantFormartDetail = ( cellValue) => {
if(cellValue == 0){ if(cellValue == 0){

Write Preview
Loading…
Cancel
Save