优化

src/pages/insertstore/Instore/fields.js

@@ -709,6 +709,10 @@ const one = {
             title: "状态",
             key: "statusName",
           },
+          {
+            title: "完成时间",
+            key: "finishTime",
+          },
           {
             title: "工单二维码",
             key: "qrCodeUrl",
@@ -797,14 +801,14 @@ const one = {
         ],
       },
       {
-        cardTitle: "强制关闭信息",
+        cardTitle: "强制关单信息",
         itemData: [
           {
-            title: "操作人",
+            title: "关单人",
             key: "closeUserName",
           },
           {
-            title: "操作时间",
+            title: "关单时间",
             key: "closeTime",
           }
         ],

src/pages/insertstore/Instore/index.jsx

@@ -233,7 +233,7 @@ function Instore(props) {
                                     })
                                 }
                             }),
-                            getPrem("equipmentCustomer_deleteById", action, '删除', null, {
+                            record.status==0 && getPrem("equipmentCustomer_deleteById", action, '删除', null, {
                                 title: "确认删除？",
                                 onConfirm: () => {
                                     doFetch({ url: "/ngic-workmanship/wmsMaterieInstore/deleteById", params: { id: record.id } }).then(res => {
@@ -330,12 +330,12 @@ function Instore(props) {
                     }
                 },
                 {
-                    "title": "关单时间",
-                    "dataIndex": "closeTime",
-                    "key": "closeTime",
+                    "title": "完成时间",
+                    "dataIndex": "finishTime",
+                    "key": "finishTime",
                     "valueType": "dateRange",
                     formItemProps:{
-                        name:"closeTimeList"
+                        name:"finishTimeList"
                     }
                 },
                 {

src/pages/outsetstore/Outstore/fields.js

@@ -688,6 +688,10 @@ const one = {
             title: "状态",
             key: "statusName",
           },
+          {
+            title: "完成时间",
+            key: "finishTime",
+          },
           {
             title: "工单二维码",
             key: "qrCodeUrl",
@@ -768,14 +772,14 @@ const one = {
         ],
       },
       {
-        cardTitle: "强制关闭信息",
+        cardTitle: "强制关单信息",
         itemData: [
           {
-            title: "操作人",
+            title: "关单人",
             key: "closeUserName",
           },
           {
-            title: "操作时间",
+            title: "关单时间",
             key: "closeTime",
           }
         ],

src/pages/outsetstore/Outstore/index.jsx

@@ -63,7 +63,7 @@ function Outstore(props) {
             setdrawprops(s => ({
                 ...s,
                 visible: false,
-                fields:{}
+                fields: {}
             }))
         },
         fields: {},
@@ -81,7 +81,7 @@ function Outstore(props) {
         setdrawprops(s => ({
             ...s,
             visible: false,
-            fields:{}
+            fields: {}
         }))
     }
 
@@ -233,7 +233,7 @@ function Outstore(props) {
                                     })
                                 }
                             }),
-                            getPrem("equipmentCustomer_deleteById", action, '删除', null, {
+                            record.status == 0 && getPrem("equipmentCustomer_deleteById", action, '删除', null, {
                                 title: "确认删除？",
                                 onConfirm: () => {
                                     doFetch({ url: "/ngic-workmanship/wmsMaterieOutstore/deleteById", params: { id: record.id } }).then(res => {
@@ -330,12 +330,12 @@ function Outstore(props) {
                     }
                 },
                 {
-                    "title": "关单时间",
-                    "dataIndex": "closeTime",
-                    "key": "closeTime",
+                    "title": "完成时间",
+                    "dataIndex": "finishTime",
+                    "key": "finishTime",
                     "valueType": "dateRange",
                     formItemProps: {
-                        name: "closeTimeList"
+                        name: "finishTimeList"
                     }
                 },
                 {