ccc

src/pages/maintain/plan/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2023-01-16 15:35:00
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2023-02-01 11:00:50
+ * @Last Modified time: 2023-02-02 17:04:15
  */
 
 import * as React from 'react';
@@ -332,6 +332,11 @@ function Plan(props) {
           dataIndex: 'maintainTypeName',
           key: 'maintainTypeName',
         },
+        {
+          title: '保养频次',
+          dataIndex: 'maintainFrequencyName',
+          key: 'maintainFrequencyName',
+        },
         {
           title: '计划类型',
           dataIndex: 'isCycle',

src/pages/maintain/workOrder/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2023-01-19 09:53:59
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2023-02-02 11:00:36
+ * @Last Modified time: 2023-02-02 18:23:31
  */
 
 import * as React from 'react';
@@ -372,7 +372,7 @@ function WorkOrder(props) {
   const close = (text, row, _, action) => {
     return (
       <PremButton
-        access="umMaintainTask:customsDeclaration"
+        access="umMaintainTask_customsDeclaration"
         pop={{
           title: '是否关单?',
           okText: '确认',
@@ -396,7 +396,7 @@ function WorkOrder(props) {
   const finish = (text, row, _, action) => {
     return (
       <PremButton
-        access="umMaintainTask:finishMaintainTask"
+        access="umMaintainTask_finishMaintainTask"
         btn={{
           size: 'small',
           onClick: () => {
@@ -429,7 +429,7 @@ function WorkOrder(props) {
   const remove = (text, row, _, action) => {
     return (
       <PremButton
-        access="umMaintainTask:deleteById"
+        access="umMaintainTask_deleteById"
         pop={{
           title: '是否删除?',
           okText: '确认',
@@ -451,7 +451,7 @@ function WorkOrder(props) {
   const verify = (text, row, _, action) => {
     return (
       <PremButton
-        access="umMaintainTask:verification"
+        access="umMaintainTask_verification"
         btn={{
           size: 'small',
           onClick: () => {
@@ -489,12 +489,17 @@ function WorkOrder(props) {
           title: '操作',
           valueType: 'option',
           width: 150,
-          render: (text, row, _, action) => [
-            order(text, row, _, action),
-            close(text, row, _, action),
-            finish(text, row, _, action),
-            verify(text, row, _, action),
-          ],
+          render: (text, row, _, action) => {
+            if (row?.taskStatus == 1) {
+              return [order(text, row, _, action), close(text, row, _, action)];
+            } else if (row?.taskStatus == 2) {
+              return [finish(text, row, _, action)];
+            } else if (row?.taskStatus == 5) {
+              return [verify(text, row, _, action)];
+            } else {
+              return '无操作';
+            }
+          },
         })
       : defcolumn;
   }, [activeTabKey]);

src/pages/repair/order/index.jsx

@@ -3,7 +3,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-12-02 11:41:03
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2023-02-02 16:46:59
+ * @Last Modified time: 2023-02-02 17:04:01
  */
 
 import * as React from 'react';

src/pages/system/pushsetting/procolumns.js

@@ -37,6 +37,7 @@ function procolumns(id) {
         title: '选择对象',
         colProps: { span: 6 },
         dataIndex: 'targetNames',
+        hideInTable: true,
         hideInSearch: true,
         key: 'targetIdList',
         valueType: 'select',
@@ -57,6 +58,7 @@ function procolumns(id) {
         colProps: { span: 6 },
         dataIndex: 'targetNames',
         hideInSearch: true,
+        hideInTable: true,
         valueType: 'select',
         options: {
           path: '/auth/sysUser/selection',
@@ -71,6 +73,12 @@ function procolumns(id) {
           },
         },
       },
+      {
+        title: '选择对象',
+        dataIndex: 'targetNames',
+        hideInSearch: true,
+        hideInForm: true,
+      },
       {
         colProps: { span: 6 },
         title: '触发次数',