diff --git a/.env b/.env
index 74e66bb15..832d68083 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,5 @@
# 标题
-VITE_APP_TITLE=富维海拉智慧工厂管理平台
+VITE_APP_TITLE=天津英泰智慧工厂管理平台
# 项目本地运行端口号
VITE_PORT=80
diff --git a/.env.wyf b/.env.wyf
new file mode 100644
index 000000000..1bbc40c94
--- /dev/null
+++ b/.env.wyf
@@ -0,0 +1,46 @@
+# 开发环境
+NODE_ENV=development
+
+VITE_DEV=false
+
+# 请求路径
+VITE_BASE_URL='http://192.168.1.35:12080'
+
+# 上传路径
+VITE_UPLOAD_URL='http://192.168.1.35:12080/admin-api/infra/file/upload'
+
+# 接口前缀
+VITE_API_BASEPATH=/dev-api
+
+# 接口地址
+VITE_API_URL=/admin-api
+
+# 打包路径
+VITE_BASE_PATH=/
+
+# 是否删除debugger
+VITE_DROP_DEBUGGER=true
+
+# 是否删除console.log
+VITE_DROP_CONSOLE=false
+
+# 是否sourcemap
+VITE_SOURCEMAP=false
+
+# 输出路径
+VITE_OUT_DIR=dist
+
+# 自定义接口路径
+VITE_INTERFACE_URL='http://localhost:12080/magic/web/index.html'
+
+# 积木报表请求路径
+VITE_JMREPORT_BASE_URL='http://localhost:12080'
+
+# 租户配置
+VITE_TENANT='["英泰"]'
+
+# 查看质检报告环境
+VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'
+
+# 是否需要验证码
+VITE_NEED_CODE = false
diff --git a/index.html b/index.html
index e1dc00eea..75739cd5e 100644
--- a/index.html
+++ b/index.html
@@ -6,8 +6,8 @@
-
-
+
+
%VITE_APP_TITLE%
@@ -44,7 +44,7 @@
}
.app-loading .app-loading-logo {
- width: 100px;
+ width: 200px;
margin: 0 auto 15px auto;
}
diff --git a/src/api/wms/inventorymoveRequestDetail/index.ts b/src/api/wms/inventorymoveRequestDetail/index.ts
index 26ad3a1ab..f78b67a06 100644
--- a/src/api/wms/inventorymoveRequestDetail/index.ts
+++ b/src/api/wms/inventorymoveRequestDetail/index.ts
@@ -22,12 +22,13 @@ export interface InventorymoveRequestDetailVO {
itemDesc2: string
projectCode: string
qty: number
+ inventoryQty: number
uom: string
updateTime: Date
updater: string
itemCode: string
}
-
+const message = useMessage() // 消息弹窗
// 查询库存转移申请子列表
export const getInventorymoveRequestDetailPage = async (params) => {
if (params.isSearch) {
@@ -51,6 +52,10 @@ export const createInventorymoveRequestDetail = async (data: InventorymoveReques
// 修改库存转移申请子
export const updateInventorymoveRequestDetail = async (data: InventorymoveRequestDetailVO) => {
+ if(parseFloat(data.inventoryQty) < parseFloat(data.qty)){
+ message.warning("数量不能大于库存数量")
+ return
+ }
return await request.put({ url: `/wms/inventorymove-request-detail/update`, data })
}
diff --git a/src/assets/imgs/login-bg.png b/src/assets/imgs/login-bg.png
index a0e6f1c61..09e4b13bf 100644
Binary files a/src/assets/imgs/login-bg.png and b/src/assets/imgs/login-bg.png differ
diff --git a/src/assets/imgs/logo1.png b/src/assets/imgs/logo1.png
index 0dcd2fa03..5b18d7c60 100644
Binary files a/src/assets/imgs/logo1.png and b/src/assets/imgs/logo1.png differ
diff --git a/src/assets/imgs/logo_white.png b/src/assets/imgs/logo_white.png
index fe3f26474..f31e69f43 100644
Binary files a/src/assets/imgs/logo_white.png and b/src/assets/imgs/logo_white.png differ
diff --git a/src/assets/imgs/logo_white_blue.png b/src/assets/imgs/logo_white_blue.png
index 5f8214f15..f5c6dcda6 100644
Binary files a/src/assets/imgs/logo_white_blue.png and b/src/assets/imgs/logo_white_blue.png differ
diff --git a/src/assets/imgs/logo_white_btn.png b/src/assets/imgs/logo_white_btn.png
index e980cce17..b44461f4d 100644
Binary files a/src/assets/imgs/logo_white_btn.png and b/src/assets/imgs/logo_white_btn.png differ
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index c8ebbd536..efa872f7e 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -723,7 +723,7 @@ const masterParmas = ref({
// 列表头部按钮
const HeadButttondata = ref()
-const HeadButttondataBackups = ref()// 列表头部按钮备份
+const HeadButttondataBackups = ref([])// 列表头部按钮备份
// 列表-操作按钮
const buttondata = ref()
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 474e6f59b..8406ad3ed 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1121,7 +1121,7 @@ export default {
查看质检报告:'Check the quality inspection report',
长春:'ChangChun',
成都:'ChengDu',
- 富维海拉智慧工厂管理平台:'FAWAY HELLA Smart Factory Management Platform',
+ 天津英泰智慧工厂管理平台:'TIANJIN YINGTAI Smart Factory Management Platform',
采购未收货记录:'Purchase unreceived record',
请选择要货计划单号:'Please select the desired shipment tracking number',
大小不超过:'Not more in size',
@@ -1141,7 +1141,7 @@ export default {
// 基础设施:'infrastructure',
// 报表管理:'report manager',
// 报表:'statement',
- // 富维海拉供应商管理系统:'vendor management system',
+ // 天津英泰供应商管理系统:'vendor management system',
请输入用户名:'Please enter your username',
请输入邮箱:'Please enter email',
忘记密码:'Forget Password',
@@ -1170,7 +1170,7 @@ export default {
计划员:'Planner',
最小值:'Min',
最大值:'Max',
- 富维海拉供应商系统:'FAWAY HELLA Supplier System',
+ 天津英泰供应商系统:'TIANJIN YINGTAI Supplier System',
系统管理:'System Management',
基础设施:'Infrastructure Construction',
报表管理:'Report Management',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 92927f2ba..c7402cf39 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1127,7 +1127,7 @@ export default {
查看质检报告:'查看质检报告',
长春:'长春',
成都:'成都',
- 富维海拉智慧工厂管理平台:'富维海拉智慧工厂管理平台',
+ 天津英泰智慧工厂管理平台:'天津英泰智慧工厂管理平台',
采购未收货记录:'采购未收货记录',
请选择要货计划单号:'请选择要货计划单号',
大小不超过:'大小不超过',
@@ -1147,7 +1147,7 @@ export default {
基础设施:'基础设施',
报表管理:'报表管理',
报表:'报表',
- 富维海拉供应商管理系统:'富维海拉供应商管理系统',
+ 天津英泰供应商管理系统:'天津英泰供应商管理系统',
请输入用户名:'请输入用户名',
请输入邮箱:'请输入邮箱',
忘记密码:'忘记密码',
@@ -1176,7 +1176,7 @@ export default {
计划员:'计划员',
最小值:'最小值',
最大值:'最大值',
- 富维海拉供应商系统:'富维海拉供应商系统',
+ 天津英泰供应商系统:'天津英泰供应商系统',
物料包装信息:'物料包装信息',
仓库管理:'仓库管理',
库区管理:'库区管理',
diff --git a/src/main.ts b/src/main.ts
index 419c06d0d..0720e0034 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -78,7 +78,7 @@ const setupAll = async () => {
// 多语言相关
const localeStore = useLocaleStore()
if(localeStore&&localeStore.currentLocale&&localeStore.currentLocale.lang.indexOf('en')>-1&&document.querySelector('#app-loading-title')){
- document.querySelector('#app-loading-title').innerHTML = 'FAWAY HELLA Smart Factory Management Platform' // 富维海拉智慧工厂管理平台
+ document.querySelector('#app-loading-title').innerHTML = 'FAWAY HELLA Smart Factory Management Platform' // 天津英泰智慧工厂管理平台
}
setupAll()
diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
index 84402e817..65ca0295e 100644
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -41,7 +41,7 @@ export const usePermissionStore = defineStore('permission', {
if (wsCache.get(CACHE_KEY.ROLE_ROUTERS)) {
res = wsCache.get(CACHE_KEY.ROLE_ROUTERS) as AppCustomRouteRecordRaw[]
// res.forEach(item=>{
- // if(item.name == '富维海拉供应商系统'&&tenant){
+ // if(item.name == '天津英泰供应商系统'&&tenant){
// item.name = item.name + tenant['text']
// }
// })
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
index 15ebf50c0..ea487419a 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
@@ -54,7 +54,7 @@
// tableData.value.push(newRow)
// })
// 查询标准价格
- if (formField == 'packingNumber') {
+ if (formField == 'batch') {
val = val.filter(
(item) =>
!tableData.value.find(
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index 8c3a5080e..ae82ca85a 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -963,22 +963,11 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([
table: {
width: 150
},
- tableForm: {
- disabled: true
- }
- },
- {
- label: '包装号',
- field: 'packingNumber',
- sort: 'custom',
- table: {
- width: 150
- },
tableForm:{
multiple:true,
isInpuFocusShow: true, // 开启查询弹窗
- searchListPlaceholder: '请选择包装号',
- searchField: 'packingNumber',
+ searchListPlaceholder: '请选择批次',
+ searchField: 'batch',
searchTitle: '库存余额信息',
searchAllSchemas: Balance.allSchemas,
searchPage: BalanceApi.getBalanceItemPage,
@@ -1009,8 +998,8 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
- searchListPlaceholder: '请选择包装号',
- searchField: 'packingNumber',
+ searchListPlaceholder: '请选择批次',
+ searchField: 'batch',
searchTitle: '库存余额信息',
searchAllSchemas: Balance.allSchemas,
searchPage: BalanceApi.getBalanceItemPage,
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
index 8ac2d8b84..a1e237350 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
@@ -332,7 +332,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
newRow['fromContainerNumber'] = item['containerNumber']
newRow['itemCode'] = item['itemCode']
newRow['fromBatch'] = item['batch']
-
+ newRow['inventoryQty'] = item['qty']
+
//从批次
await ruleApi.getManagementPrecision({
itemCodes: [item['itemCode']],
@@ -704,6 +705,13 @@ const submitForm = async (formType, submitData) => {
return
}
data.subList = tableData.value // 拼接子表数据参数
+ const cmdExists = data.subList.some(filter =>
+ parseFloat(filter.inventoryQty) < parseFloat(filter.qty)
+ );
+ if(cmdExists){
+ message.warning("数量不能大于库存数量")
+ return
+ }
let isExist = false
tableData.value.forEach(item => {
item['toLocationCode'] = toLocationCode
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
index 422e39fc8..a2998e593 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
@@ -1230,6 +1230,21 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive(
// isTableForm: false,
// isForm: false,
// },
+ {
+ label: '库存数量 ',
+ field: 'inventoryQty',
+ sort: 'custom',
+ isSearch: false,
+ isTable: false,
+ tableForm: {
+ disabled: true
+ },
+ form:{
+ componentProps:{
+ disabled:true
+ }
+ }
+ },
{
label: '数量',
field: 'qty',
diff --git a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue
index 1e8500eca..d59de5ecc 100644
--- a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue
@@ -256,9 +256,9 @@ const butttondata = (row,$index) => {
defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-barter-request-main:submit'}), // 提交审批
defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchase-barter-request-main:refused'}), // 驳回
defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchase-barter-request-main:agree'}), // 审批通过
- defaultButtons.outBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:unplannedreceipt-request-main:out'}), // 出库
- defaultButtons.inBtn({hide:isShowMainButton(row,['11']),hasPermi:'wms:unplannedreceipt-request-main:in'}), // 入库
- defaultButtons.mainListSuspend1Btn({hide:isShowMainButton(row,['11']),hasPermi:'wms:unplannedreceipt-request-main:suspend'}), // 中止
+ defaultButtons.outBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchase-barter-request-main:out'}), // 出库
+ defaultButtons.inBtn({hide:isShowMainButton(row,['11']),hasPermi:'wms:purchase-barter-request-main:in'}), // 入库
+ defaultButtons.mainListSuspend1Btn({hide:isShowMainButton(row,['11']),hasPermi:'wms:purchase-barter-request-main:suspend'}), // 中止
// defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-barter-request-main:update'}), // 编辑
defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-barter-request-main:delete'}), // 删除
]
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/purchaseMain.data.ts
index 25ce89d60..e320c6590 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/purchaseMain.data.ts
@@ -56,7 +56,7 @@ export const PurchaseMain = useCrudSchemas(reactive([
}
}
},
- {
+ {
label: '订单类型',
field: 'type',
dictType: DICT_TYPE.PURCHASE_ORDER_TYPE,
@@ -69,19 +69,14 @@ export const PurchaseMain = useCrudSchemas(reactive([
},
},
{
- label: '物料类型',
- field: 'itemTypeList',
- dictType: DICT_TYPE.ITEM_TYPE,
- dictClass: 'string',
- isTable: false,
- isForm: false,
+ label: '行类型',
+ field: 'poLineType',
+ isTable: true,
isSearch: true,
sort: 'custom',
- search: {
- componentProps: {
- multiple: true,//多选
- }
- }
+ table: {
+ width: 150
+ },
},
{
label: '状态',
@@ -291,7 +286,7 @@ export const PurchaseMain = useCrudSchemas(reactive([
{
label: '创建时间',
field: 'createTime',
- isTable:true,
+ isTable:false,
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -554,6 +549,26 @@ export const PurchaseDetail = useCrudSchemas(reactive([
precision: 6
},
},
+ {
+ label: '默认收货库区',
+ field: 'defaultAreaCode',
+ table: {
+ width: 150
+ },
+ isTableForm: false,
+ isForm: false,
+ isTable: true,
+ },
+ {
+ label: '库区描述',
+ field: 'areaDescription',
+ table: {
+ width: 150
+ },
+ isTableForm: false,
+ isForm: false,
+ isTable: true,
+ },
// {
// label: 'ERP库位',
// field: 'erpLocationCode',
@@ -821,16 +836,6 @@ export const PurchaseDetail = useCrudSchemas(reactive([
min: 0
}
},
- {
- label: '创建者',
- field: 'creator',
- isTableForm: false,
- table: {
- width: 150
- },
- hiddenInMain:true,
- isForm: false,
- },
{
label: '创建时间',
field: 'createTime',
@@ -843,7 +848,7 @@ export const PurchaseDetail = useCrudSchemas(reactive([
table: {
width: 180
},
- hiddenInMain:true,
+ hiddenInMain:false,
isForm: false,
form: {
component: 'DatePicker',
@@ -856,48 +861,58 @@ export const PurchaseDetail = useCrudSchemas(reactive([
}
},
{
- label: '最后更新者',
- field: 'updater',
- isTableForm: false,
- table: {
- width: 150
- },
- hiddenInMain:true,
- isForm: false,
- // form: {
- // component: 'DatePicker',
- // componentProps: {
- // style: {width:'100%'},
- // type: 'datetime',
- // dateFormat: 'YYYY-MM-DD HH:mm:ss',
- // valueFormat: 'x',
- // }
- // }
- },
- {
- label: '最后更新时间',
- field: 'updateTime',
+ label: '创建者',
+ field: 'creator',
isTableForm: false,
- isTable: true,
- hiddenInMain:true,
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
table: {
width: 150
},
+ hiddenInMain:false,
isForm: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width:'100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
- }
- }
},
+ // {
+ // label: '最后更新时间',
+ // field: 'updateTime',
+ // isTableForm: false,
+ // isTable: true,
+ // hiddenInMain:false,
+ // formatter: dateFormatter,
+ // detail: {
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ // },
+ // table: {
+ // width: 150
+ // },
+ // isForm: false,
+ // form: {
+ // component: 'DatePicker',
+ // componentProps: {
+ // style: {width:'100%'},
+ // type: 'datetime',
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ // valueFormat: 'x',
+ // }
+ // }
+ // },
+ // {
+ // label: '最后更新者',
+ // field: 'updater',
+ // isTableForm: false,
+ // table: {
+ // width: 150
+ // },
+ // hiddenInMain:false,
+ // isForm: false,
+ // // form: {
+ // // component: 'DatePicker',
+ // // componentProps: {
+ // // style: {width:'100%'},
+ // // type: 'datetime',
+ // // dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ // // valueFormat: 'x',
+ // // }
+ // // }
+ // },
{
label: '备注',
hiddenInMain:true,
@@ -912,6 +927,7 @@ export const PurchaseDetail = useCrudSchemas(reactive([
field: 'action',
isDetail: false,
isForm: false ,
+ isTable: false ,
table: {
width: 150,
fixed: 'right'
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 930246585..ba6e84229 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -511,6 +511,11 @@ const getSearchTableData = async (number,formField,searchField)=>{
if(item.field == 'deliveryDate'){
item.componentProps.disabled = false
}
+ if (item.field == 'poNumber') {
+ item.componentProps.isSearchList = true
+ item.componentProps.disabled = false
+ item.componentProps.enterSearch = true
+ }
})
}else if('update'==type){
PurchasePlanMain.allSchemas.formSchema.forEach((item) => {
@@ -519,6 +524,11 @@ const getSearchTableData = async (number,formField,searchField)=>{
item.componentProps.disabled = true
item.componentProps.isSearchList = false
}
+ if (item.field == 'poNumber') {
+ item.componentProps.isSearchList = false
+ item.componentProps.disabled = true
+ item.componentProps.enterSearch = false
+ }
// if(item.field == 'deliveryDate'){
// item.componentProps.disabled = true
// }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index efa4b84dc..b4f19d402 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -159,6 +159,7 @@ export const PurchasePlanMain = useCrudSchemas(
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
+ disabled:true,
enterSearch: true,
dialogWidth: '1085px', //搜索出来弹窗的宽度
isSearchList: true,
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 59b797b74..4c732d00b 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -537,16 +537,16 @@ const butttondata = (row, $index) => {
// hide: isShowMainButton(row, ['1', '2', '3']),
// hasPermi: 'wms:supplierdeliver-request-main:uploadCheck'
// }), // 上传质量报告
- {
- label: t('ts.上传履历表'),
- name: 'mainPlanCurriculumVitae',
- hide: row.status==5,
- type: 'primary',
- icon: '',
- color: '',
- hasPermi: '',
- link: true // 文本展现按钮
- }, // 上传履历表
+ // {
+ // label: t('ts.上传履历表'),
+ // name: 'mainPlanCurriculumVitae',
+ // hide: row.status==5,
+ // type: 'primary',
+ // icon: '',
+ // color: '',
+ // hasPermi: '',
+ // link: true // 文本展现按钮
+ // }, // 上传履历表
defaultButtons.mainListPlanSubBtn({
hide: isShowMainButton(row, ['1']),
hasPermi: 'wms:supplierdeliver-request-main:sub'
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 38d774cd6..41d128832 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -116,9 +116,8 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive(
},
sortTableDefault:9,
form: {
- // labelMessage: '信息提示说明!!!',
+ // labelMessage: '信息提示说明!!!',
componentProps: {
- disabled:true,
enterSearch:true,
dialogWidth:'1055px',//搜索出来弹窗的宽度
isSearchList: true, // 开启查询弹窗
@@ -1702,39 +1701,38 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive