diff --git a/.env.production b/.env.production index 8e25d2385..e43912634 100644 --- a/.env.production +++ b/.env.production @@ -1,13 +1,13 @@ # 生产环境 -NODE_ENV=production +NODE_ENV=test VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://localhost:12080' +VITE_BASE_URL='http://10.62.193.15:25100/api' # 上传路径 -VITE_UPLOAD_URL='http://localhost:12080/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://10.62.193.15:25100/api/admin-api/infra/file/upload' # 接口前缀 VITE_API_BASEPATH= @@ -28,7 +28,10 @@ VITE_SOURCEMAP=false VITE_BASE_PATH=/ # 输出路径 -VITE_OUT_DIR=dist-pro +VITE_OUT_DIR=dist-test + +# 自定义接口路径 +VITE_INTERFACE_URL='http://dev.ccwin-in.com:25110/magic/web/index.html' # 积木报表请求路径 VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25110' diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index 54af3b072..904144e3f 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -414,6 +414,12 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName: defaultButtons.defaultFilterBtn(null) // 筛选 ] } + //采购收货详情筛选 + if (props.fromeWhere == 'purchasereceipt') { + HeadButttondata.value = [ + defaultButtons.defaultFilterBtn(null) // 筛选 + ] + } } // 动态显示操作列按钮 diff --git a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts index 7d7470eaf..2392ac81a 100644 --- a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts +++ b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts @@ -584,17 +584,17 @@ export const CountRequestDetail = useCrudSchemas(reactive([ isTableForm: false, isForm: false }, - { - label: '操作', - field: 'action', - isDetail: false, - isForm: false , - table: { - width: 150, - fixed: 'right' - }, - isTableForm:false, - } + // { + // label: '操作', + // field: 'action', + // isDetail: false, + // isForm: false , + // table: { + // width: 150, + // fixed: 'right' + // }, + // isTableForm:false, + // } ])) //表单校验 @@ -614,4 +614,4 @@ export const CountRequestDetailRules = reactive({ inventoryStatus: [ { required: true, message: '请选择库存状态', trigger: 'change' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index f4707ada7..259befd56 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -68,6 +68,7 @@ :apiPage="apiPage" :apiDelete="PurchasereceiptRequestDetailApi.deletePurchasereceiptRequestDetail" :Echo="Echo" + fromeWhere="purchasereceipt" @searchTableSuccessDetail="searchTableSuccessDetail" /> @@ -189,7 +190,7 @@ const butttondata = (row) => { defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:refused'}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:agree'}), // 审批通过 defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), // 处理 - defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑 + // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑 ] } diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 002804c62..dee7c5a54 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -900,17 +900,17 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive