【前端pc】kitting申请执行功能，特殊封装开发

fe/PC/src/api/wms-api.js

@@ -717,6 +717,25 @@ export function deliverRequestHandleList(ids) {
   })
 }
 
+// 获取任务number
+export function getJobNumbersByRequestNumber(URL,requestNumber) {
+  return request({
+    url: baseURL + URL + '/by-request-number/' + requestNumber,
+    method: 'post',
+  })
+}
+
+// 使用任务number执行申请
+export function handleRequestIsHasNewJob(URL,requestNumber,data) {
+  return request({
+    url: baseURL + URL + '/IsHasNewJob',
+    method: 'post',
+    params:{requestNumber:requestNumber},
+    data
+  })
+}
+
+
 // 客户退拆任务-完成 todo
 // export async function productionRecycleJobComplete(id) {
 //   return request({

fe/PC/src/components/commonTabel-drawer/index.vue

@@ -355,8 +355,8 @@ export default {
     drawerShut () {
       this.$emit('drawerShut', false)
     },
-    tableButtonClick (val) {
-      this.$emit('drawerbutton', val)
+    tableButtonClick (val,item) {
+      this.$emit('drawerbutton', val,false,item)
     },
     //排序
     sortChange (data) {

fe/PC/src/mixins/drawerMixins.js

@@ -3,6 +3,8 @@ import {
   processRequest,
   getDetailed,
   postExportForDetail,
+  getJobNumbersByRequestNumber,
+  handleRequestIsHasNewJob,
   fileStorage
 } from '@/api/wms-api'
 import requestDataNames from "@/utils/processButtonData"
@@ -34,7 +36,7 @@ export const drawerMixins = {
       this.displayDialog.detailsDialog = val;
     },
     //抽屉常用按钮
-    drawerbutton(val, that) {
+    drawerbutton(val, that,item) {
       if (!that) {
         that = this
       }
@@ -240,6 +242,40 @@ export const drawerMixins = {
         .catch(() => {
         });
       }
+      // 【新执行20240513】操作，先获取ids方式，如：kitting,注塑，喷涂，装配申请
+      else if(val == 'handleGetIds'){
+        this.$confirm('是否确定执行?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          that.Loading.appMainLoading = true
+          getJobNumbersByRequestNumber(item.handleGetJobsUrl,this.propsData.number)
+            .then(res=>{
+              console.log(res)
+              let _numbers = []
+              res.forEach(item=>{_numbers.push(item.number)})
+              handleRequestIsHasNewJob((that.URL||item.handleRequestUrl),this.propsData.number,_numbers)
+                .then(res=>{
+                  that.$successMsg('执行成功')
+                  getDetailed(that.propsData.id, that.URL).then(res => {
+                    that.propsData = res
+                  })
+                  that.paging()
+                  that.Loading.appMainLoading = false
+                })
+                .catch(err=>{
+                  that.Loading.appMainLoading = false
+                })
+            })
+            .catch(err=>{
+              that.Loading.appMainLoading = false
+            })
+        })
+        .catch(() => {
+        });
+        
+      }
       // 任务 流程按钮实现
       if (val == 'acceptJob') {
         this.$confirm('是否确定接受任务?', '提示', {

fe/PC/src/utils/tabsDesTions/index.js

@@ -1775,7 +1775,7 @@ export const customerDismantleJob = [
     type: "name",
   },
   { label: "申请单号", prop: "requestNumber" },
-  { label: "状态", prop: "jobStatus", type: "tagFilter", filters: "jobStatus" },
+  { label: "状态", prop: "jobStatus", type: "filter", filters: "jobStatus" },
   { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
   { label: "承接者用户名", prop: 'acceptUserName' },
   { label: "完成时间", prop: 'completeTime', type: "dateTime" },
@@ -3049,7 +3049,7 @@ export const Kitting = [
 // 空器具呼叫任务
 export const callEmptyUtensilJob =  [
   { label: "任务编号", prop: "number" },
-  { label: "状态", prop: "status",type: "tagFilter", filters: "jobStatus" },
+  { label: "状态", prop: "status",type: "filter", filters: "jobStatus" },
   { label: "器具呼叫号码", prop: 'containerRequestNumber' },
   { label: "器具类型", prop: 'containerType',type:"filter",filters:"utensilType" },
   { label: "器具规格", prop: "specificationsType",type: "filter", filters: "getDict" , dictType:"ContainerSpecificationsType"},
@@ -3128,7 +3128,7 @@ export const IssueRequestZS =  [
     fixed: "left",
     type: "name",
   },
-  { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
+  { label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" },
   { label: "叫料库位代码", prop: "toLocationCode" },
   { label: "目标ERP库位", prop: "toLocationErpCode" },
   { label: "操作员", prop: "worker" },
@@ -3149,7 +3149,7 @@ export const IssueJobZS =  [
   },
   { label: "要货单号", prop: 'injectionIssueRequestNumber' },
   { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
-  { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
+  { label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
   { label: "生产线", prop: 'prodLine' },
   { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
   { label: "操作员", prop: 'worker' },
@@ -3183,7 +3183,7 @@ export const IssueRequestPT =  [
     fixed: "left",
     type: "name",
   },
-  { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
+  { label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "操作员", prop: "worker" },
   { label: "备注", prop: 'remark' },
@@ -3212,7 +3212,7 @@ export const IssueJobPT =  [
     fixed: "left",
     type: "name",
   },
-  { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
+  { label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
   { label: "申请单号", prop: "materialRequestNumber" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "完成时间", prop: "completeTime", type: "dateTime" },
@@ -3361,7 +3361,7 @@ export const automaticRequestZS =  [
     fixed: "left",
     type: "name",
   },
-  { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
+  { label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" },
   { label: "叫料库位代码", prop: "toLocationCode" },
   { label: "目标ERP库位", prop: "toLocationErpCode" },
   { label: "操作员", prop: "worker" },
@@ -3382,7 +3382,7 @@ export const automaticJobZS =  [
   },
   { label: "要货单号", prop: 'injectionIssueRequestNumber' },
   { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
-  { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
+  { label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
   { label: "生产线", prop: 'prodLine' },
   { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
   { label: "操作员", prop: 'worker' },
@@ -3416,7 +3416,7 @@ export const automaticRequestPT =  [
     fixed: "left",
     type: "name",
   },
-  { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
+  { label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" },
   { label: "叫料库位代码", prop: "toLocationCode" },
   { label: "目标ERP库位", prop: "toLocationErpCode" },
   { label: "操作员", prop: "worker" },
@@ -3437,7 +3437,7 @@ export const automaticJobPT =  [
   },
   { label: "要货单号", prop: 'injectionIssueRequestNumber' },
   { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
-  { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
+  { label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
   { label: "生产线", prop: 'prodLine' },
   { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
   { label: "操作员", prop: 'worker' },
@@ -3472,7 +3472,7 @@ export const automaticRequestZP =  [
     fixed: "left",
     type: "name",
   },
-  { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
+  { label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" },
   { label: "叫料库位代码", prop: "toLocationCode" },
   { label: "目标ERP库位", prop: "toLocationErpCode" },
   { label: "操作员", prop: "worker" },
@@ -3493,7 +3493,7 @@ export const automaticJobZP =  [
   },
   { label: "要货单号", prop: 'injectionIssueRequestNumber' },
   { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
-  { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
+  { label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
   { label: "生产线", prop: 'prodLine' },
   { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
   { label: "操作员", prop: 'worker' },
@@ -3522,7 +3522,7 @@ export const automaticNoteZP =  [
 // 业务库移申请
 export const transferLibRequest =  [
   { label: "申请编号", prop: "number",type:"name",fixed: "left", },
-  { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" },
+  { label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
   // { label: "回调服务名称", prop: "callServerName" },
   // { label: "回调业务类型", prop: "callBusinessType" },
   // { label: "传入申请单号", prop: "callRequestNumber" },
@@ -3537,7 +3537,7 @@ export const transferLibRequest =  [
 export const transferLibJob = [
   { label: "任务编号", prop: "number",type:"name",fixed: "left", },
   { label: "申请单号", prop: 'requestNumber' },
-  { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
+  { label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
   { label: "调拨类型", prop: 'type' },
   { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
   // { label: "回调服务名称", prop: "callServerName" },
@@ -3571,7 +3571,7 @@ export const transferLibNote =  [
 // 三方库申请
 export const ThirdLocationRequest =  [
   { label: "申请单号", prop: "number"},
-  { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" },
+  { label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
   { label: _Public.remark, prop: "remark" },
   { label: "操作员", prop: 'worker' },
   { label: "生产线", prop: 'prodLine' },
@@ -3586,7 +3586,7 @@ export const ThirdLocationRequest =  [
 export const ThirdLocationJob =  [
   { label: "任务单号", prop: "number", fixed: "left", type: "name" },
   { label: "申请单号", prop: 'requestNumber' },
-  { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
+  { label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
   { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
   { label: "承接者用户名", prop: 'acceptUserName' },
   { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
@@ -3697,7 +3697,7 @@ export const KittingPackagingNote =  [
 // kitting请求
 export const KittingIssueRequest =  [
   { label: "请求单号", prop: "number", fixed: "left", type: "name" },
-  { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
+  { label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" },
   { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
   { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
   { label: "目标库位代码", prop: "toLocationCode" },
@@ -3711,7 +3711,7 @@ export const KittingIssueRequest =  [
 // kitting任务
 export const KittingIssueJob =  [
   { label: "任务单号", prop: "number", fixed: "left", type: "name" },
-  { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
+  { label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
   { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
   { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
   { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },

fe/PC/src/views/kittingManage/KittingIssueRequest.vue

@@ -99,9 +99,11 @@
             type: 'warning',
             label: '执行',
             hide: false,
-            name: "againHandleRequest",
+            name: "handleGetIds",
             hide: () => { return this.hideButton([1,5,9]) },
-            size: 'mini'
+            size: 'mini',
+            handleGetJobsUrl:'wms/store/kitting-issue-job',
+            // handleRequestUrl:'wms/store/kitting-issue-request',
           },
           {
             type: 'danger',