From a8c2f0178b3cf480a40a7fd6c224939adfe5d8f8 Mon Sep 17 00:00:00 2001 From: long <18782126717@163.com> Date: Sat, 12 Nov 2022 09:09:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=8D=95=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E6=8F=90=E4=BA=A4=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activiti/form/ProcessMaterialWarehousingForm.vue | 7 +++++-- .../activiti/form/ProcessMaterialsAllotForm.vue | 6 ++++-- .../activiti/form/ProcessMaterialsDeliveryForm.vue | 6 ++++-- .../form/ProcessPermissionAuthorizationForm.vue | 12 +++++++----- .../activiti/form/ProcessSmaterialsScrapForm.vue | 6 ++++-- src/views/activiti/form/ProcessUdgetPlanForm.vue | 3 ++- .../ProcessPermissionAuthorizationList.vue | 8 ++++---- .../modules/ProcessPermissionAuthorizationForm.vue | 6 +++--- 8 files changed, 33 insertions(+), 21 deletions(-) diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue index 81a06b6..8548bb8 100644 --- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue +++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue @@ -283,6 +283,9 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep' getForm:'/actBusiness/getForm', add: "/hy/processMaterialWarehousing/add", edit: "/hy/processMaterialWarehousing/edit", + addWarehousingApply: "/hy/processMaterialWarehousing/addWarehousingApply" + + "", + editWarehousingApply: "/hy/processMaterialWarehousing/editWarehousingApply", queryById: "/hy/processMaterialWarehousing/queryById", list: "/hy/processUdgetPlan/queryProcessUdgetPlanMaterialByMainId", puwwlist: "/unitwaste/processUnitWasteWarehouseCode/queryById", @@ -455,10 +458,10 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep' formData.procDeTitle = this.processData.name; formData.title=this.processData.description; if (!formData.tableName)formData.tableName = this.processData.businessTable; - var url = this.url.addFromTableApply; + var url = this.url.addWarehousingApply; let method='post'; if (!this.isNew){ - url = this.url.fromTableApply; + url = this.url.editWarehousingApply; method='put'; } this.btndisabled = true; diff --git a/src/views/activiti/form/ProcessMaterialsAllotForm.vue b/src/views/activiti/form/ProcessMaterialsAllotForm.vue index 74b5a57..ee5e5e2 100644 --- a/src/views/activiti/form/ProcessMaterialsAllotForm.vue +++ b/src/views/activiti/form/ProcessMaterialsAllotForm.vue @@ -283,6 +283,8 @@ getForm: '/actBusiness/getForm', add: '/hy/processMaterialsAllot/add', edit: '/hy/processMaterialsAllot/edit', + addAlloApply:'/hy/processMaterialsAllot/addAlloApply', + editAlloApply:'/hy/processMaterialsAllot/editAlloApply', queryById: '/hy/processMaterialsAllot/queryById', descriptionRake: '/wastematerials/processWasteMaterials/wasteMaterialsName', //查询物料组 descriptionRakeUrl: '/hy/processMaterialWarehousingList/queryByIdWarehousingList', //查询物料组 @@ -658,10 +660,10 @@ formData.procDeTitle = this.processData.name; formData.title=this.processData.description; if (!formData.tableName)formData.tableName = this.processData.businessTable; - var url = this.url.addFromTableApply; + var url = this.url.addAlloApply; let method='post'; if (!this.isNew){ - url = this.url.fromTableApply; + url = this.url.editAlloApply; method='put'; } this.btndisabled = true; diff --git a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue index 09b82fa..f83f3f0 100644 --- a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue +++ b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue @@ -313,6 +313,8 @@ getForm: '/actBusiness/getForm', add: '/hy/processMaterialsDelivery/add', edit: '/hy/processMaterialsDelivery/edit', + addDeliveryApply: '/hy/processMaterialsDelivery/addDeliveryApply', + editDeliveryApply: '/hy/processMaterialsDelivery/editDeliveryApply', queryById: '/hy/processMaterialsDelivery/queryById', descriptionRake: '/suppliesstronger/processSuppliesStronger/descriptionName', //查询总库物料组 wasteMaterialsUrl: '/wastematerials/processWasteMaterials/wasteMaterialsName', //查询账外物料组 @@ -1124,10 +1126,10 @@ formData.procDeTitle = this.processData.name; formData.title=this.processData.description; if (!formData.tableName)formData.tableName = this.processData.businessTable; - var url = this.url.addFromTableApply; + var url = this.url.addDeliveryApply; let method='post'; if (!this.isNew){ - url = this.url.fromTableApply; + url = this.url.editDeliveryApply; method='put'; } this.btndisabled = true; diff --git a/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue b/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue index 51137a2..0883972 100644 --- a/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue +++ b/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue @@ -173,9 +173,11 @@ confirmLoading: false, url: { getForm:'/actBusiness/getForm', - add: "/processpermissionauthorization/processPermissionAuthorization/add", - edit: "/processpermissionauthorization/processPermissionAuthorization/edit", - queryById: "/processpermissionauthorization/processPermissionAuthorization/queryById" + add: "/hy/processPermissionAuthorization/add", + edit: "/hy/processPermissionAuthorization/edit", + addAuthorizationApply: "/hy/processPermissionAuthorization/addAuthorizationApply", + editAuthorizationApply: "/hy/processPermissionAuthorization/editAuthorizationApply", + queryById: "/hy/processPermissionAuthorization/queryById" }, btndisabled: false, validatorRules: { @@ -312,10 +314,10 @@ formData.procDeTitle = this.processData.name; formData.title=this.processData.description; if (!formData.tableName)formData.tableName = this.processData.businessTable; - var url = this.url.addFromTableApply; + var url = this.url.addAuthorizationApply; let method='post'; if (!this.isNew){ - url = this.url.fromTableApply; + url = this.url.editAuthorizationApply; method='put'; } this.btndisabled = true; diff --git a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue index 5daf8f9..c28ad49 100644 --- a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue +++ b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue @@ -256,6 +256,8 @@ getForm: '/actBusiness/getForm', add: '/hy/processSmaterialsScrap/add', edit: '/hy/processSmaterialsScrap/edit', + addScrapApply: '/hy/processSmaterialsScrap/addScrapApply', + editScrapApply: '/hy/processSmaterialsScrap/editScrapApply', queryById: '/hy/processSmaterialsScrap/queryById', list:"/hy/processMaterialsDelivery/queryProcessMaterialsDeliveryListByMainId", processSmaterialsScrapList: { @@ -419,10 +421,10 @@ formData.procDeTitle = this.processData.name; formData.title=this.processData.description; if (!formData.tableName)formData.tableName = this.processData.businessTable; - var url = this.url.addFromTableApply; + var url = this.url.addScrapApply; let method='post'; if (!this.isNew){ - url = this.url.fromTableApply; + url = this.url.editScrapApply; method='put'; } this.btndisabled = true; diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue index 629a489..1996011 100644 --- a/src/views/activiti/form/ProcessUdgetPlanForm.vue +++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue @@ -490,6 +490,7 @@ add: '/hy/processUdgetPlan/add', edit: '/hy/processUdgetPlan/edit', addFromTableApply:'/hy/processUdgetPlan/addFromTableApply', + editFromTableApply: '/hy/processUdgetPlan/editFromTableApply', queryById: '/hy/processUdgetPlan/queryById', selectdeparment:'/sys/selectByUser', descriptionRakeUrl: "/description/processDescription/list", @@ -1043,7 +1044,7 @@ var url = this.url.addFromTableApply; let method='post'; if (!this.isNew){ - url = this.url.fromTableApply; + url = this.url.editFromTableApply; method='put'; } this.btndisabled = true; diff --git a/src/views/processmaterials/ProcessPermissionAuthorizationList.vue b/src/views/processmaterials/ProcessPermissionAuthorizationList.vue index 20a1997..3d6aaa8 100644 --- a/src/views/processmaterials/ProcessPermissionAuthorizationList.vue +++ b/src/views/processmaterials/ProcessPermissionAuthorizationList.vue @@ -133,10 +133,10 @@ } ], url: { - list: "/processpermissionauthorization/processPermissionAuthorization/list", - delete: "/processpermissionauthorization/processPermissionAuthorization/delete", - deleteBatch: "/processpermissionauthorization/processPermissionAuthorization/deleteBatch", - exportXlsUrl: "/processpermissionauthorization/processPermissionAuthorization/exportXls", + list: "/hy/processPermissionAuthorization/list", + delete: "/hy/processPermissionAuthorization/delete", + deleteBatch: "/hy/processPermissionAuthorization/deleteBatch", + exportXlsUrl: "/hy/processPermissionAuthorization/exportXls", importExcelUrl: "processpermissionauthorization/processPermissionAuthorization/importExcel", }, diff --git a/src/views/processmaterials/modules/ProcessPermissionAuthorizationForm.vue b/src/views/processmaterials/modules/ProcessPermissionAuthorizationForm.vue index 20d1021..41bd3bb 100644 --- a/src/views/processmaterials/modules/ProcessPermissionAuthorizationForm.vue +++ b/src/views/processmaterials/modules/ProcessPermissionAuthorizationForm.vue @@ -126,9 +126,9 @@ validatorRules: { }, url: { - add: "/processpermissionauthorization/processPermissionAuthorization/add", - edit: "/processpermissionauthorization/processPermissionAuthorization/edit", - queryById: "/processpermissionauthorization/processPermissionAuthorization/queryById" + add: "/hy/processPermissionAuthorization/add", + edit: "/hy/processPermissionAuthorization/edit", + queryById: "/hy/processPermissionAuthorization/queryById" } } },