diff --git a/src/api/processManagement/taskProcessing.js b/src/api/processManagement/taskProcessing.js
index 6d76b6f0..b8d53bda 100644
--- a/src/api/processManagement/taskProcessing.js
+++ b/src/api/processManagement/taskProcessing.js
@@ -106,7 +106,7 @@ export const getProcessManagementAuthorized = (params) => {
// 转派
export const taskRedeploy = data => {
return request({
- url: '/blade-desk/dsTasking/taskRedeploy',
+ url: '/blade-desk/dsTasking/batch-taskRedeploy',
method: 'post',
data
});
diff --git a/src/api/storeManagement/workwearPlan.js b/src/api/storeManagement/workwearPlan.js
index fa0a81f7..6d43bcf3 100644
--- a/src/api/storeManagement/workwearPlan.js
+++ b/src/api/storeManagement/workwearPlan.js
@@ -96,4 +96,22 @@ export const getMaterialList = params => {
method: 'get',
params,
});
+};
+
+// 发送审批
+export const renderApproval = data => {
+ return request({
+ url: '/api/blade-wms/stMoldApplyFor/renderApproval ',
+ method: 'post',
+ data:data,
+ });
+};
+
+// 审批 /stMoldApplyFor/approval/operate
+export const approvalOperate = data => {
+ return request({
+ url: '/api/blade-wms/stMoldApplyFor/approval/operate',
+ method: 'post',
+ params:data,
+ });
};
\ No newline at end of file
diff --git a/src/views/inboundOutboundManagement/materialIssuing.vue b/src/views/inboundOutboundManagement/materialIssuing.vue
index 34892007..ce12ee84 100644
--- a/src/views/inboundOutboundManagement/materialIssuing.vue
+++ b/src/views/inboundOutboundManagement/materialIssuing.vue
@@ -35,7 +35,7 @@
{{
- scope.row.location == '' ? '请选择库位' : scope.row.location
+ scope.row.location == ''|| scope.row.location == null? '请选择库位' : scope.row.location
}}
diff --git a/src/views/processManagement/components/assignDaialog.vue b/src/views/processManagement/components/assignDaialog.vue
index 813c57f3..de454518 100644
--- a/src/views/processManagement/components/assignDaialog.vue
+++ b/src/views/processManagement/components/assignDaialog.vue
@@ -89,8 +89,7 @@ export default {
if (this.title == '转派') {
let query = {
craftMan: this.$refs.from.form.userId,
- id: arr[0],
- // remarks:'任务分派'
+ taskIds: arr.join(','),
};
taskRedeploy(query).then(res => {
this.$message.success('操作成功!');
diff --git a/src/views/processManagement/taskProcessing.vue b/src/views/processManagement/taskProcessing.vue
index 28c64b4d..a02b92af 100644
--- a/src/views/processManagement/taskProcessing.vue
+++ b/src/views/processManagement/taskProcessing.vue
@@ -13,15 +13,17 @@
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
+ @selection-change="selectionChange"
+
>
新增任务
+ 批量转派
-
详情
@@ -34,14 +36,6 @@
v-if="scope.row.taskStatus == 2 || scope.row.sinTerType != -1"
>编制
-
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/warehouseManagement/workwearPlan/index.vue b/src/views/warehouseManagement/workwearPlan/index.vue
index 1f8e2926..54d29ffd 100644
--- a/src/views/warehouseManagement/workwearPlan/index.vue
+++ b/src/views/warehouseManagement/workwearPlan/index.vue
@@ -1,10 +1,5 @@
-
-
新增
+ 发送审批
- 修改
- 删除
+ 修改
+ 审批
+ 删除
-
-
+
插入一行
删除选择行
-
-
*工装号
-
-
@@ -182,10 +147,13 @@
+
+