bug

src/pages/device/account/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-11-10 09:39:56
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2023-01-31 09:34:55
+ * @Last Modified time: 2023-01-31 14:49:20
  */
 
 import * as React from 'react';
@@ -620,6 +620,11 @@ function Model(props) {
           dataIndex: 'equipmentTypeName',
           key: 'equipmentTypeId',
         },
+        {
+          title: '设备型号',
+          dataIndex: 'equipmentModelName',
+          key: 'equipmentModelName',
+        },
         {
           title: '状态',
           dataIndex: 'statusName',

src/pages/device/supplier/columns.js

@@ -254,7 +254,7 @@ function getcolumns(ifs) {
           dataIndex: 'title',
           key: 'title',
           fieldProps: {
-            placeholder: '请输入',
+            placeholder: '请输入职务',
           },
           formItemProps: {
             rules: [

src/pages/device/supplier/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-11-09 14:44:44
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2023-01-18 15:25:43
+ * @Last Modified time: 2023-01-31 13:50:19
  */
 
 import * as React from 'react';
@@ -293,7 +293,7 @@ function Supplier(props) {
     );
   };
   const columns = useMemo(() => {
-    let defcolumn = getcolumns(setDrawer);
+    let defcolumn = getcolumns(false);
     defcolumn[1].render = (text, row) => {
       return (
         <a

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-01-31 11:18:25
+ * @Last Modified time: 2023-01-31 15:01:41
  */
 
 import * as React from 'react';
@@ -775,6 +775,7 @@ function Failure(props) {
     return (
       <>
         <InitForm
+          defaultFormValue={drawer?.item}
           fields={columns}
           onFinish={async (vals) => {
             let params = {
@@ -802,7 +803,6 @@ function Failure(props) {
               actionRef.current.reload();
             }
           }}
-          defaultFormValue={drawer?.item}
           {...drawer}
         />
       </>
@@ -813,6 +813,7 @@ function Failure(props) {
     return (
       <>
         <InitForm
+          defaultFormValue={drawer?.item}
           fields={[
             {
               title: '申请追踪原因',
@@ -857,6 +858,7 @@ function Failure(props) {
     return (
       <>
         <InitForm
+          defaultFormValue={drawer?.item}
           fields={[
             {
               title: '申请外协原因',
@@ -901,6 +903,7 @@ function Failure(props) {
     return (
       <>
         <InitForm
+          defaultFormValue={drawer?.item}
           fields={[
             {
               title: '转单类型',
@@ -965,6 +968,7 @@ function Failure(props) {
     return (
       <>
         <InitForm
+          defaultFormValue={drawer?.item}
           fields={[
             {
               title: '退单原因',
@@ -1009,6 +1013,7 @@ function Failure(props) {
     return (
       <>
         <InitForm
+          defaultFormValue={drawer?.item}
           fields={[
             {
               title: '故障描述',
@@ -1081,8 +1086,8 @@ function Failure(props) {
             },
             {
               title: '备注',
-              dataIndex: 'remaker',
-              key: 'remaker',
+              dataIndex: 'remark',
+              key: 'remark',
               valueType: 'textarea',
               formItemProps: {
                 rules: [
@@ -1096,7 +1101,11 @@ function Failure(props) {
           ]}
           onFinish={async (vals) => {
             let params = {
-              repairInfo: { ...vals },
+              repairProcess: {
+                reviewerResult: '',
+                remark: vals?.remark,
+              },
+              resultFlag: vals?.resultFlag,
               id: drawer?.item.id,
             };
             let res = await doFetch({
@@ -1122,6 +1131,7 @@ function Failure(props) {
     return (
       <>
         <InitForm
+          defaultFormValue={drawer?.item}
           fields={[
             {
               title: '申请追踪原因',
@@ -1159,8 +1169,8 @@ function Failure(props) {
             },
             {
               title: '备注',
-              dataIndex: 'remaker',
-              key: 'remaker',
+              dataIndex: 'remark',
+              key: 'remark',
               valueType: 'textarea',
               formItemProps: {
                 rules: [
@@ -1201,6 +1211,7 @@ function Failure(props) {
     return (
       <>
         <InitForm
+          defaultFormValue={drawer?.item}
           fields={[
             {
               title: '申请外协原因',
@@ -1238,8 +1249,8 @@ function Failure(props) {
             },
             {
               title: '备注',
-              dataIndex: 'remaker',
-              key: 'remaker',
+              dataIndex: 'remark',
+              key: 'remark',
               valueType: 'textarea',
               formItemProps: {
                 rules: [
@@ -1280,6 +1291,7 @@ function Failure(props) {
     return (
       <>
         <InitForm
+          defaultFormValue={drawer?.item}
           fields={[
             {
               title: '退单原因',
@@ -1317,8 +1329,8 @@ function Failure(props) {
             },
             {
               title: '备注',
-              dataIndex: 'remaker',
-              key: 'remaker',
+              dataIndex: 'remark',
+              key: 'remark',
               valueType: 'textarea',
               formItemProps: {
                 rules: [
@@ -1332,7 +1344,7 @@ function Failure(props) {
           ]}
           onFinish={async (vals) => {
             let params = {
-              repairProcess: { reviewerResult: vals.reviewerResult },
+              repairProcess: { reviewerResult: vals.reason, remark: vals?.reason },
               resultFlag: vals.resultFlag,
               id: drawer?.item.id,
             };

src/pages/setting/organization/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-11-24 11:16:02
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2022-12-05 16:20:22
+ * @Last Modified time: 2023-01-31 13:29:12
  */
 import * as React from 'react';
 import { useState, useMemo, useRef } from 'react';
@@ -151,7 +151,7 @@ function Type(props) {
     return (
       <PremButton
         pop={{
-          title: '是否删除该设备类型?',
+          title: '是否删除该组织?',
           okText: '确认',
           cancelText: '取消',
           onConfirm: async () => {

src/pages/setting/role/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-11-09 14:44:44
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2022-12-30 14:10:29
+ * @Last Modified time: 2023-01-31 13:28:48
  */
 
 import * as React from 'react';
@@ -99,7 +99,7 @@ function Role(props) {
     return (
       <PremButton
         pop={{
-          title: '是否删除该工厂?',
+          title: '是否删除该角色?',
           okText: '确认',
           cancelText: '取消',
           onConfirm: async () => {

src/pages/setting/users/columns.js

@@ -109,6 +109,23 @@ function getcolumns(setDrawer, ifs, formRef) {
                     dataIndex: 'statusName',
                     key: 'status',
                   },
+                  {
+                    title: '个人图片',
+                    dataIndex: 'pictureUrl',
+                    key: 'pictureUrl',
+                    render: (text, row) => {
+                      if (row?.pictureUrl == null) {
+                        return '暂无图片';
+                      } else {
+                        return <Image width={70} src={row.pictureUrl} />;
+                      }
+                    },
+                  },
+                  {
+                    title: '备注',
+                    dataIndex: 'remarks',
+                    key: 'remarks',
+                  },
                 ],
                 setDrawer,
                 row,

src/pages/system/field/columns.js

@@ -130,11 +130,16 @@ function getcolumns(ifs) {
       formItemProps: {
         rules: [
           {
-            required: false,
+            required: true,
             message: '此项为必填项',
           },
         ],
       },
+      fieldProps: {
+        placeholder: '请输入排序号，默认为0',
+        min: 0,
+        defaultValue: 0,
+      },
       search: false,
       precision: 0,
     },

src/pages/system/field/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-11-10 09:39:56
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2023-01-13 17:07:03
+ * @Last Modified time: 2023-01-31 14:06:49
  */
 
 import * as React from 'react';