【EDI前端】暂存

Web/src/api/system/taskSubApi.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 是否自动执行
+export function getCanceltaskByUid(id) {
+  return request({
+    url: `/api/tasksub/canceltask`,
+    method: 'get',
+    params:{taskId:id}
+  })
+}

Web/src/utils/common/apiTableColumns.js

@@ -8,8 +8,8 @@ const apiTableColumns = {
         {prop:'api',title:'api',align:'left',width:200},
         {prop:'url',title:'url',align:'left',width:300},
         {prop:'corn',title:'corn'},
-        {prop:'writeState',title:'writeState',type:'tagFilter',options:EnumList.whetherBoolean},
+        {prop:'writeState',title:'是否传出',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
-        {prop:'readState',title:'readState',type:'tagFilter',options:EnumList.whetherBoolean},
+        {prop:'readState',title:'是否已确认',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
         {prop:'isAuto',title:'是否自动执行',type:'tagFilter',options:EnumList.whetherBoolean},
         {prop:'remark',title:'remark',align:'left',width:300},
         {prop:'creationTime',title:'创建时间',width:180,type:'datetime',noEdit:true},
@@ -19,12 +19,11 @@ const apiTableColumns = {
 
     // 任务列表
     tasksub:[
-        // {prop:'writeState',title:'writeState'},
-        // {prop:'readState',title:'readState'},
-        // {prop:'taskId',title:'taskId'},
         {prop:'tableName',title:'表名',align:'left',width:240,disabled:true},
         {prop:'taskName',title:'任务名称',align:'left',width:160,disabled:true},
         {prop:'dataCount',title:'同步总数量',type:'number'},
+        {prop:'writeState',title:'是否传出',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
+        {prop:'readState',title:'是否已确认',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
         {prop:'subscriber',title:'客户名'},
         {prop:'failedCount',title:'失败次数',type:'number'},
         {prop:'failedInfo',title:'失败信息'},
@@ -103,6 +102,8 @@ const apiTableColumns = {
     ],
     // M+6月物料需求计划风险确认
     cherysupplierconmmrp:[
+        {prop:'writeState',title:'是否传出',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
+        {prop:'readState',title:'是否已确认',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
         {prop:'supplierCode',title:'供应商代码',width:120},
         {prop:'releaseEdition',title:'需求发布版次',width:150},
         {prop:'materialCode',title:'零件号'},
@@ -156,8 +157,6 @@ const apiTableColumns = {
         {prop:'version',title:'版本号'},
         // {prop:'isDelete',title:'是否删除',type:'tagFilter',options:EnumList.whether},
         // {prop:'isUpdate',title:'是否更新',type:'tagFilter',options:EnumList.whether},
-        // {prop:'writeState',title:'writeState',type:'tagFilter',options:EnumList.whetherBoolean},
-        // {prop:'readState',title:'readState',type:'tagFilter',options:EnumList.whetherBoolean},
     ],
     // 日物料需求计划
     cherysuppliermrpdata:[
@@ -208,6 +207,8 @@ const apiTableColumns = {
     ],
     // 日物料需求计划风险确认
     cherysuppliercondate:[
+        {prop:'writeState',title:'是否传出',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
+        {prop:'readState',title:'是否已确认',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
         {prop:'supplierCode',title:'供应商代码',width:120},
         {prop:'releaseEdition',title:'需求发布版次',width:150},
         {prop:'materialCode',title:'零件号'},
@@ -343,6 +344,8 @@ const apiTableColumns = {
     ],
     // 采购订单风险确认
     cherysupplierconpo:[
+        {prop:'writeState',title:'是否传出',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
+        {prop:'readState',title:'是否已确认',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
         {prop:'supplierCode',title:'供应商代码',width:120},
         {prop:'purchaseOrder',title:'采购订单号',width:120},
         {prop:'serialNumber',title:'行项目号',width:120},
@@ -460,6 +463,8 @@ const apiTableColumns = {
     ],
     // 供应商共享库存
     cherysuppliersinvdata:[
+        {prop:'writeState',title:'是否传出',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
+        {prop:'readState',title:'是否已确认',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
         {prop:'supplierCode',title:'供应商代码',required:true},
         {prop:'supplierName',title:'供应商名称',required:true},
         {prop:'serialNumber',title:'行项目号'},
@@ -528,6 +533,8 @@ const apiTableColumns = {
     /*生产质量 */
     // 来料检验数据
     supplierpromaterialstock:[
+        {prop:'writeState',title:'是否传出',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
+        {prop:'readState',title:'是否已确认',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
         {prop:'supplierCode',title:'供应商代码',required:true},
         {prop:'supplierName',title:'供应商名称',required:true},
         {prop:'supplierSubCode',title:'供应商子零件编号',width:180,required:true},
@@ -562,6 +569,8 @@ const apiTableColumns = {
     ],
     // 排产数据
     cherysupplierproscheduling:[
+        {prop:'writeState',title:'是否传出',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
+        {prop:'readState',title:'是否已确认',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
         {prop:'supplierCode',title:'供应商代码'},
         {prop:'supplierName',title:'供应商名称'},
         {prop:'plantId',title:'工厂代码'},
@@ -585,6 +594,8 @@ const apiTableColumns = {
     ],
     // 供应商基础信息
     cherysupplierinfo:[
+        {prop:'writeState',title:'是否传出',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
+        {prop:'readState',title:'是否已确认',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
         {prop:'supplierCode',title:'供应商代码',required:true},
         {prop:'supplierName',title:'供应商名称',required:true},
         {prop:'plantId',title:'工厂代码',required:true},
@@ -607,6 +618,8 @@ const apiTableColumns = {
     ],
     // 人员资质信息
     cherysupplieremployee:[
+        {prop:'writeState',title:'是否传出',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
+        {prop:'readState',title:'是否已确认',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
         {prop:'supplierCode',title:'供应商代码',required:true},
         {prop:'supplierName',title:'供应商名称',required:true},
         {prop:'plantId',title:'工厂代码',required:true},
@@ -630,6 +643,8 @@ const apiTableColumns = {
     ],
     // BOM主数据
     cherysupplierbom:[
+        {prop:'writeState',title:'是否传出',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
+        {prop:'readState',title:'是否已确认',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
         {prop:'supplierCode',title:'供应商代码'},
         {prop:'supplierName',title:'供应商名称'},
         {prop:'bomCode',title:'BOM编码'},
@@ -651,6 +666,8 @@ const apiTableColumns = {
     ],
     // 过程控制项质量数据
     cherysupplierprocps:[
+        {prop:'writeState',title:'是否传出',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
+        {prop:'readState',title:'是否已确认',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
         {prop:'supplierCode',title:'供应商代码',required:true},
         {prop:'supplierName',title:'供应商名称',required:true},
         {prop:'vendorProductNo',title:'供应商总成零件号',width:180,required:true},
@@ -703,6 +720,8 @@ const apiTableColumns = {
     ],
     // 生产过程数据
     cherysupplierprodata:[
+        {prop:'writeState',title:'是否传出',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
+        {prop:'readState',title:'是否已确认',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
         {prop:'supplierCode',title:'供应商代码',required:true},
         {prop:'supplierName',title:'供应商名称',required:true},
         {prop:'plantId',title:'工厂代码',required:true},
@@ -751,6 +770,8 @@ const apiTableColumns = {
     ],
     // 产品一次合格率
     cherysupplierprofirstpassyield:[
+        {prop:'writeState',title:'是否传出',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
+        {prop:'readState',title:'是否已确认',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
         {prop:'supplierCode',title:'供应商代码',required:true},
         {prop:'supplierName',title:'供应商名称',required:true},
         {prop:'vendorProductNo',title:'供应商总成零件号',width:180,required:true},
@@ -777,6 +798,8 @@ const apiTableColumns = {
     ],
     // 工位一次合格率
     cherysupplierprostationfirstpassyield:[
+        {prop:'writeState',title:'是否传出',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
+        {prop:'readState',title:'是否已确认',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
         {prop:'supplierCode',title:'供应商代码',required:true},
         {prop:'supplierName',title:'供应商名称',required:true},
         {prop:'plantId',title:'工厂代码',required:true},
@@ -805,6 +828,8 @@ const apiTableColumns = {
     ],
     // 缺陷业务数据
     cherysupplierproflaw:[
+        {prop:'writeState',title:'是否传出',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
+        {prop:'readState',title:'是否已确认',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
         {prop:'supplierCode',title:'供应商代码',required:true},
         {prop:'supplierName',title:'供应商名称',required:true},
         {prop:'plantId',title:'工厂代码',required:true},
@@ -836,6 +861,8 @@ const apiTableColumns = {
     ],
     // 物料主数据
     cherysupplierpromaterialdata:[
+        {prop:'writeState',title:'是否传出',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
+        {prop:'readState',title:'是否已确认',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
         {prop:'supplierCode',title:'供应商代码'},
         {prop:'supplierName',title:'供应商名称'},
         {prop:'vendorProductNo',title:'供应商物料号'},
@@ -860,6 +887,8 @@ const apiTableColumns = {
     ],
     // 附件类数据
     cherysupplierproattachmentdata:[
+        {prop:'writeState',title:'是否传出',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
+        {prop:'readState',title:'是否已确认',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
         {prop:'supplierCode',title:'供应商代码',required:true},
         {prop:'supplierName',title:'供应商名称',required:true},
         {prop:'type',title:'数据类型',type:'filter',options:EnumList.attachmentType,required:true},
@@ -881,6 +910,8 @@ const apiTableColumns = {
     ],
     // 工艺装备
     cherysupplierproprocessequipment:[
+        {prop:'writeState',title:'是否传出',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
+        {prop:'readState',title:'是否已确认',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
         {prop:'supplierCode',title:'供应商代码',required:true},
         {prop:'supplierName',title:'供应商名称',required:true},
         {prop:'cheryProductNo',title:'奇瑞零件号',required:true},
@@ -915,6 +946,8 @@ const apiTableColumns = {
     ],
     // 工艺
     cherysupplierproprocess:[
+        {prop:'writeState',title:'是否传出',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
+        {prop:'readState',title:'是否已确认',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
         {prop:'cheryProductNo',title:'奇瑞零件号'},
         {prop:'cheryProductName',title:'奇瑞零件名称',width:180},
         {prop:'vendorProductNo',title:'供应商总成零件号',width:180},

Web/src/views/task/taskSub/index.vue

@@ -2,12 +2,14 @@
   <div class="taskSubPage">
     <!-- 主表 -->
     <tablePage 
+      ref="tablePageRef"
       :apiName="state.apiName"
       :searchOptions="state.searchOptions"
       :searchFilter="state.searchFilter"
       @leftOperationHadel="leftOperationHadel"
       :leftOperation="state.leftOperation"
       :rightOperation="state.rightOperation"
+      @rightOperationHadel="rightOperationHadel"
     ></tablePage>
 
     <!-- 明细抽屉 -->
@@ -37,6 +39,7 @@
   import { reactive, ref, onMounted,nextTick  } from 'vue'
   import tablePage from '@/components/tablePage/index.vue'
   import { getColoumsByServeName } from '@/utils/common/index'
+  import { getCanceltaskByUid } from '@/api/system/taskSubApi'
   
   const state = reactive({
     apiName:'tasksub',
@@ -56,9 +59,27 @@
     infoTableColumns:null,
     // 查看详情内部table查询条件
     infoSearchFilter: [],
-    rightOperation:'apiUpdate',
+    rightOperation:[],
   })
 
+  state.rightOperation = [
+    {
+      label:'撤销',
+      name:'canceltask',
+      link:true,
+      type:'danger',
+      auth:state.apiName+':canceltask',
+      hide:(row,scope) => {return hideCanceltaskBtn(row)}
+    },
+  ]
+
+  // 撤销按钮隐藏/显示
+  function hideCanceltaskBtn(row){
+    let _arr = ['M+6月物料需求计划风险确认','日物料需求计划风险确认','采购订单风险确认']
+    // 任务为风险确认，并且失败次数>0时显示
+    return !(_arr.indexOf(row.taskName) >= 0 && row.failedCount > 0)
+  }
+
   function leftOperationHadel(btn,scope) {
     // 查看详情
     if(btn.name == 'showInfo'){
@@ -87,6 +108,27 @@
     }
   }
 
+  const tablePageRef = ref(null)
+  // 右侧按钮操作
+  function rightOperationHadel(btn,scope){
+    // 撤销
+    if(btn.name == 'canceltask'){
+      ElMessageBox.confirm(`是否确定撤销？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        tablePageRef.value.state.loading = true
+        getCanceltaskByUid(scope.row.taskId)
+        .then(res=>{
+          ElMessage.success('操作成功！')   
+          tablePageRef.value.getTableData()
+        })
+        .finally(()=>{tablePageRef.value.state.loading = false})
+      })
+    }
+  }
+
 
 </script>
 <style scope lang="scss">