diff --git a/src/components/ImportForm/src/ImportCustomerStatementForecastForm.vue b/src/components/ImportForm/src/ImportCustomerStatementForecastForm.vue
index 2e5fdae96..cf0d77457 100644
--- a/src/components/ImportForm/src/ImportCustomerStatementForecastForm.vue
+++ b/src/components/ImportForm/src/ImportCustomerStatementForecastForm.vue
@@ -309,7 +309,7 @@ const verifyData = async () => {
}else if(data.status==2){
try {
// 确认
- await message.confirm('已存在相同客户代码及年月的客户对账单,是否确认覆盖?')
+ await message.confirm('已存在相同客户代码及年月的客户模具分摊对账单预测,是否重新导入?')
//确定走的
submitForm();
// await PurchasepriceApi.deletePurchaseprice(id)
@@ -321,7 +321,7 @@ const verifyData = async () => {
//取消走的
}
}else if(data.status==3){
- await message.alertWarning('已存在相同客户代码及年月的客户对账单,且已提交,无法导入。')
+ await message.alertWarning('已存在相同客户代码及年月的客户模具分摊对账单预测,且已提交,无法导入。')
}
}
diff --git a/src/components/ImportForm/src/ImportFormPlanCSV.vue b/src/components/ImportForm/src/ImportFormPlanCSV.vue
index b38c14e3a..18fe25de1 100644
--- a/src/components/ImportForm/src/ImportFormPlanCSV.vue
+++ b/src/components/ImportForm/src/ImportFormPlanCSV.vue
@@ -140,7 +140,7 @@ const props = defineProps({
accept: {
type: String,
required: false,
- default: '.xlsx,.xls'
+ default: '.csv'
},
// 是否更新已经存在的用户数据.默认值是1
mode: {
diff --git a/src/components/SearchHigh/src/SearchHigh.vue b/src/components/SearchHigh/src/SearchHigh.vue
index 44c20ff59..7cbf987b0 100644
--- a/src/components/SearchHigh/src/SearchHigh.vue
+++ b/src/components/SearchHigh/src/SearchHigh.vue
@@ -49,17 +49,16 @@
/>
-
+
-
+
-
+
+
+
-
+
@@ -193,7 +192,9 @@ const moreListOptions = ref({
} else if (type?.form?.component == 'DatePicker') {
if(type?.form?.componentProps?.type=='datetimerange'|| type?.form?.componentProps?.type == 'datetime'){
data = 'datePicker'
- }else if(type?.form?.componentProps?.type == 'date'){
+ } else if(type?.form?.componentProps?.type=='monthrange'|| type?.form?.componentProps?.type == 'month'){
+ data = 'monthPicker'
+ } else if(type?.form?.componentProps?.type == 'date'){
data = 'date'
}
}
@@ -221,7 +222,7 @@ const getFilterable = (val) => {
// 根据数据内容约束条件选项 ==,!=,>,<,>=,<=,like,in,notIn,between,isNull,isNotNull
const formatMoreListActions = (val) => {
if (val) {
- if(getInputType(val.column)=='datePicker'|| getInputType(val.column) == 'date'){
+ if(getInputType(val.column)=='datePicker'|| getInputType(val.column) == 'date'|| getInputType(val.column) == 'monthPicker'){
return moreListOptions.value.action.filter(item => item.value == 'between')
}else{
return moreListOptions.value.action.filter(item => item.value != 'between')
@@ -255,7 +256,7 @@ const moreListPush = () => {
const lastestType = ref('')
// 筛选条件改变重置其他项
const resetSelect = (val) => {
- if (getInputType(val.column) == 'datePicker' || getInputType(val.column) == 'date') {
+ if (getInputType(val.column) == 'datePicker' || getInputType(val.column) == 'date'|| getInputType(val.column) == 'monthPicker') {
val.action = 'between'
val.disabled = false
}else{
@@ -285,11 +286,12 @@ const actionSelect = (val)=>{
// 查询 重置按钮事件
const buttonBaseClick = (val) => {
+ console.log(moreListData.value.filters)
if (val == 'search') { // 查询
let data = []
moreListData.value.filters.forEach(item => {
let obj = {}
- if(item.value1&&item.value1.length>0 || (item.value1&&typeof item.value1 === 'number')){
+ if(item.value1&&item.value1.length>0&&!item.value || (item.value1&&typeof item.value1 === 'number')){
obj = {
column: item.column,
action: item.action,
@@ -363,6 +365,12 @@ const changeDateTimePicker = (e, val,from) =>{
let startTime = new Date(e[0] + ' 00:00:00').getTime()
let endTime = new Date(e[1] + ' 23:59:59').getTime()
val.value = startTime + ',' + endTime
+ }else if(from == 'monthrange'){
+ let startTime = new Date(e[0] + '-01 00:00:00').getTime()
+ const lastDay = new Date(e[1].split('-')[0],e[1].split('-')[1], 0).getDate();
+ let endTime = new Date(e[1] + '-'+lastDay+' 23:59:59').getTime()
+ val.value = startTime + ',' + endTime
+ console.log(val)
}else if(from == 'datetimerange'){
val.value = e.join(',')
}
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index d25048231..bde9ea22e 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -687,7 +687,9 @@ export default {
版本号:'Version Number',
发布时间:'Publish Time',
开始时间:'Start Time',
- 结束时间:'Finish Time',
+ 结束时间: 'Finish Time',
+ 开始月份: 'Start Month',
+ 结束月份: 'Finish Month',
业务类型:'Business Type',
预测时间类型:'Forecast time type',
预测日期:'Forecast Date',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 9e748c598..c0de5bab8 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -691,8 +691,10 @@ export default {
美元:'美元',
版本号:'版本号',
发布时间:'发布时间',
- 开始时间:'开始时间',
- 结束时间:'结束时间',
+ 开始时间: '开始时间',
+ 结束时间: '结束时间',
+ 开始月份: '开始年月',
+ 结束月份: '结束年月',
业务类型:'业务类型',
预测时间类型:'预测时间类型',
预测日期:'预测日期',
diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts
index 1ad09830c..dd51b272c 100644
--- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts
@@ -245,7 +245,11 @@ export const PackageInventory = useCrudSchemas(reactive([
key: 'available',
value: 'TRUE',
isMainValue: false
- }],
+ }, {
+ key: 'enableMake',
+ value: 'TRUE',
+ isMainValue: false
+ }],
verificationParams: [{
key: 'code',
action: '==',
diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
index 2b0bb74b7..1baff2838 100644
--- a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
@@ -257,7 +257,11 @@ export const PackageInventory = useCrudSchemas(reactive([
key: 'available',
value: 'TRUE',
isMainValue: false
- }],
+ }, {
+ key: 'enableBuy',
+ value: 'TRUE',
+ isMainValue: false
+ }],
verificationParams: [{
key: 'code',
action: '==',
diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts
index 73d2355bb..8080d8162 100644
--- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts
@@ -196,7 +196,10 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive([
},
table:{
width:180
- }
+ },
+ detail: {
+ dateFormat : 'YYYY-MM-DD HH:mm:ss'
+ },
},
{
@@ -278,6 +281,18 @@ export const CustomerSaleInvoiceDetailRules = reactive({
})
export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive([
+ {
+ label: '序号',
+ type: 'index',
+ field: 'numberIndex',
+ sort: 'custom',
+ isSearch: false,
+ isForm: false,
+ isTableForm: false,
+ tableForm: {
+ disabled: true
+ }
+ },
{
label: '品番',
field: 'itemCode',
diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/index.vue b/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/index.vue
index 0114187d5..224d3021b 100644
--- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/index.vue
@@ -132,7 +132,7 @@ const Echo = []
const { getList, setSearchParams } = tableMethods
// 列表头部按钮
const HeadButttondata = [
- defaultButtons.defaultImportBtn({hasPermi:`wms:customer-sale-invoice-record-main:import` }), // 导入
+ //defaultButtons.defaultImportBtn({hasPermi:`wms:customer-sale-invoice-record-main:import` }), // 导入
defaultButtons.defaultExportBtn({hasPermi:`wms:customer-sale-invoice-record-main:export` }), // 导出
defaultButtons.defaultFreshBtn(null), // 刷新
defaultButtons.defaultFilterBtn(null), // 筛选
diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue
index 37b382c1d..e1c5026cd 100644
--- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue
+++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue
@@ -68,11 +68,7 @@
(formRef, formModel, tableData) => {
const { taxRate = 0 } = formModel
// 1、主数据未税金额 mainBeforeTaxAmount : 所有明细行未税金额的和
- let mainBeforeTaxAmount = tableData.reduce(
- (prev, item) =>
- prev + Number(item['beforeTaxAmount']),
- 0
- )
+ let mainBeforeTaxAmount = tableData.reduce((prev, item) =>prev + Number(item['beforeTaxAmount'].toFixed(2)),0).toFixed(2)
// 2.主数据税额 mainTaxAmount = 未税金额*税率/100 保留两位小数
let mainTaxAmount = Number(Number(mainBeforeTaxAmount*taxRate*0.01).toFixed(2))
const sumObject = {
diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts
index af4d60e2a..87d32b5a1 100644
--- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts
@@ -29,6 +29,9 @@ export const CustomerSaleInvoiceMainRules = reactive({
taxRate: [required],
taxAmount: [required],
adTaxAmount: [required],
+ goldenTaxInvoiceNumber: [{
+ max: 64, message: '字符长度不可以大于64', trigger: 'blur'
+ }]
})
export const CustomerSaleInvoiceMain = useCrudSchemas(reactive([
@@ -322,6 +325,7 @@ export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive([
sort: 'custom',
isSearch: false,
isForm: false,
+ isTableForm: false,
tableForm: {
disabled: true
}
@@ -427,13 +431,13 @@ export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive([
component: 'InputNumber',
componentProps: {
disabled: true,
- precision: 2
+ precision: 5
}
},
tableForm: {
disabled: true,
type: 'InputNumber',
- precision: 2,
+ precision: 5,
}
},
{
diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts
index 54d5073a4..2e0ed0655 100644
--- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts
+++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts
@@ -105,7 +105,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive([
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYY-MM',
- type: 'daterange',
+ type: 'monthrange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
@@ -115,7 +115,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive([
form: {
component: 'DatePicker',
componentProps: {
- type: 'datetime',
+ type: 'monthrange',
valueFormat: 'YYYY-MM',
}
},
@@ -485,12 +485,12 @@ export const CustomerStatementShareReconciliation = useCrudSchemas(reactive {
}
]
}
+ getList()
}
diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatementShareRecord/customerStatementShareRecordMain.data.ts b/src/views/wms/deliversettlementManage/moldAllocation/customerStatementShareRecord/customerStatementShareRecordMain.data.ts
index bce69b789..b101e1864 100644
--- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatementShareRecord/customerStatementShareRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatementShareRecord/customerStatementShareRecordMain.data.ts
@@ -83,7 +83,7 @@ export const CustomerStatementShareRecordMain = useCrudSchemas(reactive([
{
label: '帐票号',
- field: 'number',
+ field: 'invoiceNumber',
sort: 'custom',
isSearch: true,
},
diff --git a/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/supplierMoldCostMain.data.ts b/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/supplierMoldCostMain.data.ts
index 8f4280e27..e94af8281 100644
--- a/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/supplierMoldCostMain.data.ts
+++ b/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/supplierMoldCostMain.data.ts
@@ -67,8 +67,9 @@ export const SupplierMoldCostMain = useCrudSchemas(reactive([
form: {
component: 'DatePicker',
componentProps: {
- type: 'datetime',
- valueFormat: 'YYYY-MM'
+ valueFormat: 'YYYY-MM',
+ type: 'monthrange',
+ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
}
},
@@ -97,7 +98,16 @@ export const SupplierMoldCostMain = useCrudSchemas(reactive([
dateFormat : 'YYYY-MM-DD HH:mm:ss'
},
isTable:true,
- isForm: false
+ isForm: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x'
+ }
+ },
},
{
label: '更新者',
diff --git a/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/index.vue b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/index.vue
index aab050700..a6028e46f 100644
--- a/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/index.vue
+++ b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/index.vue
@@ -213,7 +213,7 @@ const handleExport = async () => {
// 发起导出
exportLoading.value = true
const data = await FinishedShipmentDetailApi.exportFinishedShipmentDetail(tableObject.params)
- download.excel(data, '已发未结发货记录主.xlsx')
+ download.excel(data, '已发已结记录主.xlsx')
} catch {
} finally {
exportLoading.value = false
diff --git a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/index.vue b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/index.vue
index 8e5f5a65f..fdcbe43b1 100644
--- a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/index.vue
+++ b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/index.vue
@@ -214,7 +214,7 @@ const handleExport = async () => {
// 发起导出
exportLoading.value = true
const data = await UnfinishedShipmentDetailApi.exportUnfinishedShipmentDetail(tableObject.params)
- download.excel(data, '已发未结发货记录主.xlsx')
+ download.excel(data, '已发未结记录主.xlsx')
} catch {
} finally {
exportLoading.value = false
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
index e47416124..71d4d6103 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
@@ -127,6 +127,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
val.forEach(item=>{
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
newRow[formField] = item[searchField]
+ newRow['packUnit'] = item['defaultPackUnit']
+ newRow['packQty'] = item['defaultPackQty']
newRow['uom'] = item['uom']
tableData.value.push(newRow)
})
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
index 3d7d13528..c2246c291 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
@@ -235,6 +235,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
//车间代码
setV['productionLineCode'] = ''
setV['workStationCode'] = ''
+ tableData.value =[]
}
if (formField == 'productionLineCode') {
//生产线
@@ -246,6 +247,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
if(res&&res.list&&res.list.length>0){
setV['workStationCode'] = res.list[0].code
}
+ tableData.value =[]
+ }
+ if (formField == 'workStationCode') {
+ tableData.value =[]
}
formRef.setValues(setV)
}
diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
index 1b17e5e4f..e92acfb6d 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
@@ -661,6 +661,22 @@ export const PreparetoissueDetail = useCrudSchemas(reactive([
}], // 失去焦点校验参数
},
},
+ {
+ label: '备料数量',
+ field: 'issueQty',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled: true
+ }
+ },
+ tableForm: {
+ disabled: true
+ },
+ },
{
label: '计划数量',
field: 'planQty',
diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue
index 754b5ed19..72559f15b 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue
@@ -162,13 +162,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
if(formField == 'workshop'){
setV['workshop'] = val[0]['code']
setV['productionLine'] = ''
- if(tableData.value){
- tableData.value.forEach(item => {
- item.itemCode =''
- item.bomVersion = ''
- item.uom = ''
- })
- }
+ tableData.value =[]
+ }else if(formField == 'productionLine'){
+ setV['productionLine'] = val[0]['code']
+ tableData.value =[]
}else{
setV[formField] = val[0][searchField]
}
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
index 9573cc3ba..cf2699d27 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
@@ -289,16 +289,16 @@ const butttondata = (row,$index) => {
defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:production-main:resetting'}), // 重置
defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
// defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
- {
- label: '生成备料计划',
- name: 'scbljh',
- hide: isShowMainButtonBl(row,['6']),
- type: 'primary',
- icon: 'Select',
- hasPermi:'wms:production-main:publish',
- link: true, // 文本展现按钮
- color: ''
- },
+ // {
+ // label: '生成备料计划',
+ // name: 'scbljh',
+ // hide: isShowMainButtonBl(row,['6']),
+ // type: 'primary',
+ // icon: 'Select',
+ // hasPermi:'wms:production-main:publish',
+ // link: true, // 文本展现按钮
+ // color: ''
+ // },
{
label: '生成收货申请',
name: 'scshsq',
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index d80ef2409..d46203baa 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -2626,6 +2626,7 @@ export const PurchasereceiptRequestPackage = useCrudSchemas(reactive{
// 列表头部按钮
const HeadButttondata = [
defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchase-plan-main:create' }), // 新增
- defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-plan-main:import' }), // 导入
+ // defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-plan-main:import' }), // 导入
+ {
+ label: t(`ts.导入SPARC订单`).replace('ts.', ''),
+ name: 'import',
+ hide: false,
+ type: 'warning',
+ icon: 'ep:upload',
+ color: '',
+ hasPermi: 'wms:purchase-plan-main:import'
+ },
// defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // 导出
defaultButtons.defaultExportDetailsBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // 导出明细
//defaultButtons.defaultExportTableBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // 导出二维表
@@ -452,7 +461,7 @@ const isShowMainButton1 = (row, val) => {
return [
// defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['2']) }), // 打开
defaultButtons.mainListPurchasePlanCloBtn({ hide: !(row.status!=6&&row.status!=2&&row.type=='SCHEDULE'),hasPermi: 'wms:purchase-plan-main:close' }), // 关闭
- defaultButtons.mainListPurchasePlanPubBtn({ hide: isShowMainButton(row, ['1']) ,hasPermi: 'wms:purchase-plan-main:publish'}), // 发布
+ defaultButtons.mainListPurchasePlanPubBtn({ hide: isShowMainButton(row, ['1','5']) ,hasPermi: 'wms:purchase-plan-main:publish'}), // 发布
defaultButtons.mainListPurchasePlanAccBtn({ hide: isShowMainButton(row, ['3']) ,hasPermi: 'wms:purchase-plan-main:accept'}), // 接受
defaultButtons.mainListPurchasePlanRejBtn({ hide: isShowMainButton(row, ['3']) ,hasPermi: 'wms:purchase-plan-main:noaccept'}), // 不接受
defaultButtons.mainListPurchasePlanWitBtn({ hide: isShowMainButton(row, ['3']) ,hasPermi: 'wms:purchase-plan-main:unpublish'}), // 下架