ccc

src/components/InitForm/index.jsx

@@ -182,7 +182,7 @@ function InitForm(props) {
       }}
     >
       <FormRender
-        fields={fields.filter((it) => it.valueType != 'option')}
+        fields={fields?.filter((it) => it.valueType != 'option')}
         colProps={colProps}
         proformRef={proformRef}
       />

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 15:14:34
+ * @Last Modified time: 2023-01-31 17:43:42
  */
 
 import * as React from 'react';
@@ -1077,7 +1077,7 @@ function Failure(props) {
               valueType: 'radio',
               options: [
                 { label: '通过', value: '1' },
-                { label: '不通过', value: '2' },
+                { label: '不通过', value: '0' },
               ],
               formItemProps: {
                 rules: [
@@ -1160,7 +1160,7 @@ function Failure(props) {
               valueType: 'radio',
               options: [
                 { label: '通过', value: '1' },
-                { label: '不通过', value: '2' },
+                { label: '不通过', value: '0' },
               ],
               formItemProps: {
                 rules: [
@@ -1240,7 +1240,7 @@ function Failure(props) {
               valueType: 'radio',
               options: [
                 { label: '通过', value: '1' },
-                { label: '不通过', value: '2' },
+                { label: '不通过', value: '0' },
               ],
               formItemProps: {
                 rules: [
@@ -1320,7 +1320,7 @@ function Failure(props) {
               valueType: 'radio',
               options: [
                 { label: '通过', value: '1' },
-                { label: '不通过', value: '2' },
+                { label: '不通过', value: '0' },
               ],
               formItemProps: {
                 rules: [

src/pages/repair/track/columns.js

@@ -80,7 +80,7 @@ function getcolumns(setdrawer, bus) {
               <span
                 style={{
                   color: `${
-                    row.nextTrackDate.valueOf() < dayjs().format('YYYY-MM-DD').valueOf()
+                    row?.nextTrackDate?.valueOf() < dayjs().format('YYYY-MM-DD').valueOf()
                       ? '#f50'
                       : 'rgba(0, 0, 0, 0.85)'
                   }`,

src/pages/repair/track/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 09:20:37
+ * @Last Modified time: 2023-01-31 15:46:59
  */
 
 import * as React from 'react';

src/pages/setting/users/columns.js

@@ -179,6 +179,7 @@ function getcolumns(setDrawer, ifs, formRef) {
       width: 120,
       valueType: 'treeSelect',
       dataIndex: 'departmentName',
+      search: false,
       formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
       key: 'departmentId',
       options: {
@@ -188,6 +189,22 @@ function getcolumns(setDrawer, ifs, formRef) {
         },
       },
     },
+    {
+      title: '部门名称',
+      width: 120,
+      valueType: 'select',
+      dataIndex: 'departmentName',
+      formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
+      key: 'departmentId',
+      options: {
+        path: '/auth/sysDepartment/query/all/department/selection',
+      },
+      fieldProps: {
+        showSearch: true,
+      },
+      hideInForm: true,
+      hideInTable: true,
+    },
     {
       title: '角色名称',
       dataIndex: 'roleNames',