李志伟 3 gadus atpakaļ
vecāks
revīzija
7169526000
31 mainītis faili ar 297 papildinājumiem un 49 dzēšanām
  1. 6
    0
      config/routes.js
  2. 4
    2
      src/components/AMap/SearchPOI.jsx
  3. 3
    0
      src/components/AMap/weather.js
  4. 4
    0
      src/components/CooperativeSearch/index.jsx
  5. 8
    2
      src/components/ExtendContent/List.jsx
  6. 4
    0
      src/components/ExtendContent/index.jsx
  7. 20
    16
      src/components/GeoMap/map.js
  8. 6
    2
      src/components/MachinetySelect/index.jsx
  9. 4
    2
      src/components/RightContent/ChangePassword.jsx
  10. 3
    1
      src/pages/ContentManagementSystem/Advertisement/index.jsx
  11. 3
    1
      src/pages/ContentManagementSystem/InformationClassification/index.jsx
  12. 4
    0
      src/pages/ContentManagementSystem/InformationList/edit.jsx
  13. 5
    1
      src/pages/ContentManagementSystem/InformationList/index.jsx
  14. 13
    1
      src/pages/JobStatistics/Order/index.jsx
  15. 2
    0
      src/pages/Machinery/GPS/index.jsx
  16. 8
    0
      src/pages/Machinery/Machinery/edit.jsx
  17. 7
    1
      src/pages/Machinery/Machinery/index.jsx
  18. 3
    1
      src/pages/Machinery/MachineryType/index.jsx
  19. 2
    0
      src/pages/Machinery/Org/index.jsx
  20. 16
    4
      src/pages/Machinery/Person/index.jsx
  21. 8
    3
      src/pages/MonitoringScreen/hook.js
  22. 2
    0
      src/pages/MonitoringScreen/index.jsx
  23. 66
    0
      src/pages/OrderManage/JobWarning/detail.jsx
  24. 51
    1
      src/pages/OrderManage/JobWarning/index.jsx
  25. 10
    0
      src/pages/OrderManage/OrderList/index.jsx
  26. 15
    5
      src/pages/OrderManage/dispatch.jsx
  27. 4
    0
      src/pages/OrderManage/index.jsx
  28. 2
    0
      src/pages/SystemManagement/BasicParameters/index.jsx
  29. 3
    1
      src/pages/SystemManagement/Region/index.jsx
  30. 5
    5
      src/pages/SystemManagement/UserRights/index.jsx
  31. 6
    0
      src/services/order.js

+ 6
- 0
config/routes.js Parādīt failu

160
         access: 'orderwarning',
160
         access: 'orderwarning',
161
         component: './OrderManage/JobWarning',
161
         component: './OrderManage/JobWarning',
162
       },
162
       },
163
+      {
164
+        path: '/OrderManage/JobWarning/detail.jsx',
165
+        name: '订单详情',
166
+        access: 'orderwarning',
167
+        component: './OrderManage/JobWarning/detail.jsx',
168
+      },
163
     ],
169
     ],
164
   },
170
   },
165
   {
171
   {

+ 4
- 2
src/components/AMap/SearchPOI.jsx Parādīt failu

64
 
64
 
65
       instance.on('click', handleClick);
65
       instance.on('click', handleClick);
66
       map.current = instance
66
       map.current = instance
67
-    })
67
+    }).catch((err) => {
68
+      console.log(err.message)
69
+    });
68
   }, [])
70
   }, [])
69
 
71
 
70
   useEffect(() => {
72
   useEffect(() => {
124
 
126
 
125
   return (
127
   return (
126
     <div className={className} style={boxStyle}>
128
     <div className={className} style={boxStyle}>
127
-      <div ref={container} style={mapStyle} id="poi-map-wrapper"></div>
129
+      <div ref={container} style={mapStyle} id="poi-map-wrapper" />
128
       <input placeholder="请输入搜索关键字" ref={inputRef} style={inputSty1} />
130
       <input placeholder="请输入搜索关键字" ref={inputRef} style={inputSty1} />
129
       <input value={`坐标: ${currentPos.join(',')}`} style={inputSty2} disabled />
131
       <input value={`坐标: ${currentPos.join(',')}`} style={inputSty2} disabled />
130
     </div>
132
     </div>

+ 3
- 0
src/components/AMap/weather.js Parādīt failu

11
       } else {
11
       } else {
12
         return Promise.reject(res.info);
12
         return Promise.reject(res.info);
13
       }
13
       }
14
+    })
15
+    .catch((err) => {
16
+      console.log(err.message);
14
     });
17
     });
15
 }
18
 }

+ 4
- 0
src/components/CooperativeSearch/index.jsx Parādīt failu

11
   const searchData = (val) => {
11
   const searchData = (val) => {
12
     getCooperativeList({ name: val, pageSize: 9999 }).then((res) => {
12
     getCooperativeList({ name: val, pageSize: 9999 }).then((res) => {
13
       setList(res.records || []);
13
       setList(res.records || []);
14
+    }).catch((err) => {
15
+      console.log(err.message)
14
     });
16
     });
15
   };
17
   };
16
 
18
 
24
     if (value) {
26
     if (value) {
25
       getCooperativeDetail(value).then((res) => {
27
       getCooperativeDetail(value).then((res) => {
26
         setList([res]);
28
         setList([res]);
29
+      }).catch((err) => {
30
+        console.log(err.message)
27
       });
31
       });
28
     }
32
     }
29
   }, [value]);
33
   }, [value]);

+ 8
- 2
src/components/ExtendContent/List.jsx Parādīt failu

20
         setList(res.records || []);
20
         setList(res.records || []);
21
         setLoading(false);
21
         setLoading(false);
22
       })
22
       })
23
-      .catch(() => setLoading(false));
23
+      .catch((err) => {
24
+        console.log(err.message)
25
+        setLoading(false)
26
+      });
24
   };
27
   };
25
 
28
 
26
   refs.current = tableList;
29
   refs.current = tableList;
43
         setLoading(false);
46
         setLoading(false);
44
         // refs.current.reload();
47
         // refs.current.reload();
45
       })
48
       })
46
-      .catch(() => setLoading(false));
49
+      .catch((err) => {
50
+        console.log(err.message)
51
+        setLoading(false)
52
+      });
47
   };
53
   };
48
 
54
 
49
   const columns = [
55
   const columns = [

+ 4
- 0
src/components/ExtendContent/index.jsx Parādīt failu

29
         next();
29
         next();
30
 
30
 
31
         message.success('更新数据成功');
31
         message.success('更新数据成功');
32
+      }).catch((err) => {
33
+        console.log(err.message)
32
       });
34
       });
33
     } else if (data.content) {
35
     } else if (data.content) {
34
       // 新增提交
36
       // 新增提交
38
         next();
40
         next();
39
 
41
 
40
         message.success('保存数据成功');
42
         message.success('保存数据成功');
43
+      }).catch((err) => {
44
+        console.log(err.message)
41
       });
45
       });
42
     } else {
46
     } else {
43
       next();
47
       next();

+ 20
- 16
src/components/GeoMap/map.js Parādīt failu

8
   const [map, setMap] = useState();
8
   const [map, setMap] = useState();
9
 
9
 
10
   useEffect(() => {
10
   useEffect(() => {
11
-    loader(plugins).then((AMap) => {
12
-      amapRef.current = AMap;
13
-      const mapInst = new AMap.Map(containerRef.current, {
14
-        mapStyle: 'amap://styles/669a7d8709a9bab0945747a1a1db3327',
15
-        // mapStyle: 'amap://styles/blue',
16
-        zoom: 10,
17
-        resizeEnable: true,
18
-        center: [112.092716, 32.681642],
19
-      });
11
+    loader(plugins)
12
+      .then((AMap) => {
13
+        amapRef.current = AMap;
14
+        const mapInst = new AMap.Map(containerRef.current, {
15
+          mapStyle: 'amap://styles/669a7d8709a9bab0945747a1a1db3327',
16
+          // mapStyle: 'amap://styles/blue',
17
+          zoom: 10,
18
+          resizeEnable: true,
19
+          center: [112.092716, 32.681642],
20
+        });
20
 
21
 
21
-      // 缩放按钮
22
-      mapInst.addControl(new AMap.ToolBar());
22
+        // 缩放按钮
23
+        mapInst.addControl(new AMap.ToolBar());
23
 
24
 
24
-      // 遮罩层;
25
-      geoPolygon(AMap, mapInst);
25
+        // 遮罩层;
26
+        geoPolygon(AMap, mapInst);
26
 
27
 
27
-      //
28
-      setMap(mapInst);
29
-    });
28
+        //
29
+        setMap(mapInst);
30
+      })
31
+      .catch((err) => {
32
+        console.log(err.message);
33
+      });
30
   }, []);
34
   }, []);
31
 
35
 
32
   return { amapRef, map };
36
   return { amapRef, map };

+ 6
- 2
src/components/MachinetySelect/index.jsx Parādīt failu

11
   const searchData = (val) => {
11
   const searchData = (val) => {
12
     getMachineryList({ name: val, pageSize: 9999 }).then((res) => {
12
     getMachineryList({ name: val, pageSize: 9999 }).then((res) => {
13
       setList(res.records || [])
13
       setList(res.records || [])
14
-    })
14
+    }).catch((err) => {
15
+      console.log(err.message)
16
+    });
15
   }
17
   }
16
 
18
 
17
   const handleSearch = (text) => {
19
   const handleSearch = (text) => {
24
     if (value) {
26
     if (value) {
25
       getMachineryDetail(value).then((res) => {
27
       getMachineryDetail(value).then((res) => {
26
         setList([res])
28
         setList([res])
27
-      })
29
+      }).catch((err) => {
30
+        console.log(err.message)
31
+      });
28
     }
32
     }
29
   }, [value])
33
   }, [value])
30
 
34
 

+ 4
- 2
src/components/RightContent/ChangePassword.jsx Parādīt failu

28
       if (onSuccess) {
28
       if (onSuccess) {
29
         onSuccess()
29
         onSuccess()
30
       }
30
       }
31
-    }).catch((err) => {
32
-      setLoading(false)
33
     })
31
     })
32
+      .catch((err) => {
33
+        console.log(err.message)
34
+        setLoading(false)
35
+      });
34
   }
36
   }
35
 
37
 
36
   const handleCancel = () => {
38
   const handleCancel = () => {

+ 3
- 1
src/pages/ContentManagementSystem/Advertisement/index.jsx Parādīt failu

24
     deleteBanner(e).then((res) => {
24
     deleteBanner(e).then((res) => {
25
       message.success('删除成功');
25
       message.success('删除成功');
26
       actionRef.current.reload();
26
       actionRef.current.reload();
27
+    }).catch((err) => {
28
+      console.log(err.message)
27
     });
29
     });
28
   };
30
   };
29
   const handleOK = (record, data) => {
31
   const handleOK = (record, data) => {
41
             actionRef.current.reload();
43
             actionRef.current.reload();
42
           })
44
           })
43
           .catch((err) => {
45
           .catch((err) => {
44
-            message.error(err);
46
+            console.log(err.message)
45
           });
47
           });
46
       },
48
       },
47
     });
49
     });

+ 3
- 1
src/pages/ContentManagementSystem/InformationClassification/index.jsx Parādīt failu

27
         message.success(`修改成功`);
27
         message.success(`修改成功`);
28
         onCancel();
28
         onCancel();
29
         actionRef.current.reload();
29
         actionRef.current.reload();
30
+      }).catch((err) => {
31
+        console.log(err.message)
30
       });
32
       });
31
     } else {
33
     } else {
32
       addNewsType(values)
34
       addNewsType(values)
59
         actionRef.current.reload();
61
         actionRef.current.reload();
60
       })
62
       })
61
       .catch((err) => {
63
       .catch((err) => {
62
-        message.error(err);
64
+        console.log(err.message)
63
       });
65
       });
64
   };
66
   };
65
   useEffect(() => {
67
   useEffect(() => {

+ 4
- 0
src/pages/ContentManagementSystem/InformationList/edit.jsx Parādīt failu

54
   useEffect(() => {
54
   useEffect(() => {
55
     getNewsTypeList().then((res) => {
55
     getNewsTypeList().then((res) => {
56
       setNewsTypeList(res.records);
56
       setNewsTypeList(res.records);
57
+    }).catch((err) => {
58
+      console.log(err.message)
57
     });
59
     });
58
   }, []);
60
   }, []);
59
   useEffect(() => {
61
   useEffect(() => {
60
     if (id) {
62
     if (id) {
61
       getNewsDetail(id).then((res) => {
63
       getNewsDetail(id).then((res) => {
62
         form.setFieldsValue(res);
64
         form.setFieldsValue(res);
65
+      }).catch((err) => {
66
+        console.log(err.message)
63
       });
67
       });
64
     }
68
     }
65
   }, [id]);
69
   }, [id]);

+ 5
- 1
src/pages/ContentManagementSystem/InformationList/index.jsx Parādīt failu

25
     deleteNews(id).then(() => {
25
     deleteNews(id).then(() => {
26
       message.success('删除成功');
26
       message.success('删除成功');
27
       actionRef.current.reload();
27
       actionRef.current.reload();
28
+    }).catch((err) => {
29
+      console.log(err.message)
28
     });
30
     });
29
   };
31
   };
30
   //列表切换资讯状态方法
32
   //列表切换资讯状态方法
43
             actionRef.current.reload();
45
             actionRef.current.reload();
44
           })
46
           })
45
           .catch((err) => {
47
           .catch((err) => {
46
-            message.error(err);
48
+            console.log(err.message)
47
           });
49
           });
48
       },
50
       },
49
     });
51
     });
51
   useEffect(() => {
53
   useEffect(() => {
52
     getNewsTypeList().then((res) => {
54
     getNewsTypeList().then((res) => {
53
       setNewsTypeList(res.records);
55
       setNewsTypeList(res.records);
56
+    }).catch((err) => {
57
+      console.log(err.message)
54
     });
58
     });
55
   }, []);
59
   }, []);
56
   const actions = () => [
60
   const actions = () => [

+ 13
- 1
src/pages/JobStatistics/Order/index.jsx Parādīt failu

26
     getevaluation(val).then(res => {
26
     getevaluation(val).then(res => {
27
       setEval(res)
27
       setEval(res)
28
       setShow(true)
28
       setShow(true)
29
-    })
29
+    }).catch((err) => {
30
+      console.log(err.message)
31
+    });
30
   }
32
   }
31
   useEffect(() => {
33
   useEffect(() => {
32
     getCooperativeList().then((res) => {
34
     getCooperativeList().then((res) => {
33
       setCooperativeList(res.records);
35
       setCooperativeList(res.records);
36
+    }).catch((err) => {
37
+      console.log(err.message)
34
     });
38
     });
35
     getMachineryTypeList().then((res) => {
39
     getMachineryTypeList().then((res) => {
36
       setMachineryTypeList(res.records);
40
       setMachineryTypeList(res.records);
41
+    }).catch((err) => {
42
+      console.log(err.message)
37
     });
43
     });
38
   }, []);
44
   }, []);
39
   const columns = [
45
   const columns = [
46
+    {
47
+      title: '订单号',
48
+      dataIndex: 'orderNo',
49
+      key: 'orderNo',
50
+      search: false
51
+    },
40
     {
52
     {
41
       title: '合作社',
53
       title: '合作社',
42
       dataIndex: 'orgId',
54
       dataIndex: 'orgId',

+ 2
- 0
src/pages/Machinery/GPS/index.jsx Parādīt failu

28
     deleteNote(e.noteId).then((res) => {
28
     deleteNote(e.noteId).then((res) => {
29
       message.success('删除成功');
29
       message.success('删除成功');
30
       actionRef.current.reload();
30
       actionRef.current.reload();
31
+    }).catch((err) => {
32
+      console.log(err.message)
31
     });
33
     });
32
   };
34
   };
33
 
35
 

+ 8
- 0
src/pages/Machinery/Machinery/edit.jsx Parādīt failu

81
   useEffect(() => {
81
   useEffect(() => {
82
     getMachineryTypeList().then((res) => {
82
     getMachineryTypeList().then((res) => {
83
       setMachineryTypeList(res.records);
83
       setMachineryTypeList(res.records);
84
+    }).catch((err) => {
85
+      console.log(err.message)
84
     });
86
     });
85
     getRegionList().then((res) => {
87
     getRegionList().then((res) => {
86
       setRegionList(res.records);
88
       setRegionList(res.records);
89
+    }).catch((err) => {
90
+      console.log(err.message)
87
     });
91
     });
88
     getCooperativeList().then((res) => {
92
     getCooperativeList().then((res) => {
89
       setCooperativeList(res.records);
93
       setCooperativeList(res.records);
94
+    }).catch((err) => {
95
+      console.log(err.message)
90
     });
96
     });
91
     if (id) {
97
     if (id) {
92
       getMachineryDetail(id).then((res) => {
98
       getMachineryDetail(id).then((res) => {
93
         form.setFieldsValue({ ...res, buyDate: res.buyDate ? moment(res.buyDate, 'YYYY-MM-DD') : null });
99
         form.setFieldsValue({ ...res, buyDate: res.buyDate ? moment(res.buyDate, 'YYYY-MM-DD') : null });
100
+      }).catch((err) => {
101
+        console.log(err.message)
94
       });
102
       });
95
     }
103
     }
96
   }, [id]);
104
   }, [id]);

+ 7
- 1
src/pages/Machinery/Machinery/index.jsx Parādīt failu

23
     deleteMachinery(id).then(() => {
23
     deleteMachinery(id).then(() => {
24
       message.success('删除成功');
24
       message.success('删除成功');
25
       actionRef.current.reload();
25
       actionRef.current.reload();
26
+    }).catch((err) => {
27
+      console.log(err.message)
26
     });
28
     });
27
   };
29
   };
28
   //列表切换农机状态方法
30
   //列表切换农机状态方法
41
             actionRef.current.reload();
43
             actionRef.current.reload();
42
           })
44
           })
43
           .catch((err) => {
45
           .catch((err) => {
44
-            message.error(err);
46
+            console.log(err.message)
45
           });
47
           });
46
       },
48
       },
47
     });
49
     });
49
   useEffect(() => {
51
   useEffect(() => {
50
     getCooperativeList().then((res) => {
52
     getCooperativeList().then((res) => {
51
       setCooperativeList(res.records);
53
       setCooperativeList(res.records);
54
+    }).catch((err) => {
55
+      console.log(err.message)
52
     });
56
     });
53
     getMachineryTypeList().then((res) => {
57
     getMachineryTypeList().then((res) => {
54
       setMachineryTypeList(res.records);
58
       setMachineryTypeList(res.records);
59
+    }).catch((err) => {
60
+      console.log(err.message)
55
     });
61
     });
56
   }, []);
62
   }, []);
57
   const actions = () => [
63
   const actions = () => [

+ 3
- 1
src/pages/Machinery/MachineryType/index.jsx Parādīt failu

41
             actionRef.current.reload();
41
             actionRef.current.reload();
42
           })
42
           })
43
           .catch((err) => {
43
           .catch((err) => {
44
-            message.error(err);
44
+            console.log(err.message)
45
           });
45
           });
46
       },
46
       },
47
     });
47
     });
56
     deleteMachineryType(val).then(() => {
56
     deleteMachineryType(val).then(() => {
57
       message.success('删除成功');
57
       message.success('删除成功');
58
       actionRef.current.reload();
58
       actionRef.current.reload();
59
+    }).catch((err) => {
60
+      console.log(err.message)
59
     });
61
     });
60
   };
62
   };
61
 
63
 

+ 2
- 0
src/pages/Machinery/Org/index.jsx Parādīt failu

45
       message.success('删除成功');
45
       message.success('删除成功');
46
       setOrgId();
46
       setOrgId();
47
       handelReset();
47
       handelReset();
48
+    }).catch((err) => {
49
+      console.log(err.message)
48
     });
50
     });
49
   };
51
   };
50
   // 刷新左侧列表
52
   // 刷新左侧列表

+ 16
- 4
src/pages/Machinery/Person/index.jsx Parādīt failu

99
         message.success(`修改成功`);
99
         message.success(`修改成功`);
100
         onCancel();
100
         onCancel();
101
         actionRef.current.reload();
101
         actionRef.current.reload();
102
+      }).catch((err) => {
103
+        console.log(err.message)
102
       });
104
       });
103
     } else {
105
     } else {
104
       addUser(newData)
106
       addUser(newData)
136
         actionRef.current.reload();
138
         actionRef.current.reload();
137
       })
139
       })
138
       .catch((err) => {
140
       .catch((err) => {
139
-        message.error(err);
141
+        console.log(err.message)
140
       });
142
       });
141
   };
143
   };
142
   //列表切换人员状态方法
144
   //列表切换人员状态方法
155
             actionRef.current.reload();
157
             actionRef.current.reload();
156
           })
158
           })
157
           .catch((err) => {
159
           .catch((err) => {
158
-            message.error(err);
160
+            console.log(err.message)
159
           });
161
           });
160
       },
162
       },
161
     });
163
     });
167
       if (res.length !== 0) {
169
       if (res.length !== 0) {
168
         setCurrentCheckbox(res.map((item) => item.roleId));
170
         setCurrentCheckbox(res.map((item) => item.roleId));
169
       }
171
       }
172
+    }).catch((err) => {
173
+      console.log(err.message)
170
     });
174
     });
171
     setEditRoleModal(true);
175
     setEditRoleModal(true);
172
   };
176
   };
191
           onRoleCancel();
195
           onRoleCancel();
192
         })
196
         })
193
         .catch((err) => {
197
         .catch((err) => {
194
-          message.error(err);
198
+          console.log(err.message)
195
           setRLoading(false);
199
           setRLoading(false);
196
         });
200
         });
197
     } else {
201
     } else {
207
           onRoleCancel();
211
           onRoleCancel();
208
         })
212
         })
209
         .catch((err) => {
213
         .catch((err) => {
210
-          message.error(err);
214
+          console.log(err.message)
211
           setRLoading(false);
215
           setRLoading(false);
212
         });
216
         });
213
     }
217
     }
219
     //获取账号默认密码
223
     //获取账号默认密码
220
     getDefaultPassword().then((res) => {
224
     getDefaultPassword().then((res) => {
221
       setPassWord(res);
225
       setPassWord(res);
226
+    }).catch((err) => {
227
+      console.log(err.message)
222
     });
228
     });
223
     //获取合作社列表数据
229
     //获取合作社列表数据
224
     getCooperativeList().then((res) => {
230
     getCooperativeList().then((res) => {
227
         return { title: item.name, key: item.orgId };
233
         return { title: item.name, key: item.orgId };
228
       });
234
       });
229
       setData(list);
235
       setData(list);
236
+    }).catch((err) => {
237
+      console.log(err.message)
230
     });
238
     });
231
     //获取角色列表数据
239
     //获取角色列表数据
232
     getRoleList().then((res) => {
240
     getRoleList().then((res) => {
233
       setRoleList(res.records);
241
       setRoleList(res.records);
242
+    }).catch((err) => {
243
+      console.log(err.message)
234
     });
244
     });
235
   }, []);
245
   }, []);
236
   useEffect(() => {
246
   useEffect(() => {
241
         } else {
251
         } else {
242
           form.setFieldsValue(res);
252
           form.setFieldsValue(res);
243
         }
253
         }
254
+      }).catch((err) => {
255
+        console.log(err.message)
244
       });
256
       });
245
     } else {
257
     } else {
246
       form.resetFields();
258
       form.resetFields();

+ 8
- 3
src/pages/MonitoringScreen/hook.js Parādīt failu

8
 
8
 
9
   const toggleFullScreen = useCallback((e) => {
9
   const toggleFullScreen = useCallback((e) => {
10
     if (!document.fullscreenElement) {
10
     if (!document.fullscreenElement) {
11
-      elRef.current.requestFullscreen().then(() => {
12
-        setIsFullScreen(true);
13
-      });
11
+      elRef.current
12
+        .requestFullscreen()
13
+        .then(() => {
14
+          setIsFullScreen(true);
15
+        })
16
+        .catch((err) => {
17
+          console.log(err.message);
18
+        });
14
     }
19
     }
15
   }, []);
20
   }, []);
16
 
21
 

+ 2
- 0
src/pages/MonitoringScreen/index.jsx Parādīt failu

139
       } else {
139
       } else {
140
         setWeather('暂无天气信息');
140
         setWeather('暂无天气信息');
141
       }
141
       }
142
+    }).catch((err) => {
143
+      console.log(err.message)
142
     });
144
     });
143
   }, []);
145
   }, []);
144
 
146
 

+ 66
- 0
src/pages/OrderManage/JobWarning/detail.jsx Parādīt failu

1
+import React, { useState, useEffect } from 'react';
2
+import { Card, Form, Button } from 'antd';
3
+import ProCard from '@ant-design/pro-card';
4
+import { getOrderDetail } from '@/services/order'
5
+import { history } from 'umi';
6
+
7
+const FormItem = Form.Item;
8
+const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
9
+const goBack = () => {
10
+  history.goBack();
11
+};
12
+export default (props) => {
13
+  const { location } = props;
14
+  const { id } = location.query;
15
+  const [dispatch, setDispatch] = useState();
16
+
17
+  useEffect(() => {
18
+    getOrderDetail(id).then((res) => {
19
+      setDispatch(res)
20
+    }).catch((err) => {
21
+      console.log(err.message)
22
+    });
23
+  }, [id])
24
+  return (
25
+    <Card>
26
+      <ProCard tabs={{ type: 'card' }}>
27
+        <ProCard.TabPane key={1} tab="订单调度">
28
+          <Form {...formItemLayout}>
29
+            <FormItem label="订单号">
30
+              {dispatch?.personName}
31
+            </FormItem>
32
+            <FormItem label="客户姓名">
33
+              {dispatch?.personName}
34
+            </FormItem>
35
+            <FormItem label="联系电话">
36
+              {dispatch?.phone}
37
+            </FormItem>
38
+            <FormItem label="预约地址">
39
+              {dispatch?.address}
40
+            </FormItem>
41
+            <FormItem label="预约时间">
42
+              {dispatch?.appointmentDate}
43
+            </FormItem>
44
+            <FormItem label="合作社名">
45
+              {dispatch?.orgName}
46
+            </FormItem>
47
+            <FormItem label="农机类型">
48
+              {dispatch?.typeName}
49
+            </FormItem>
50
+            <FormItem label="农机">
51
+              {dispatch?.machinery}
52
+            </FormItem>
53
+            <FormItem label="农机手">
54
+              {dispatch?.person}
55
+            </FormItem>
56
+            <FormItem label=" " colon={false}>
57
+              <Button type="default" onClick={() => goBack()}>
58
+                返回
59
+              </Button>
60
+            </FormItem>
61
+          </Form>
62
+        </ProCard.TabPane>
63
+      </ProCard>
64
+    </Card>
65
+  );
66
+};

+ 51
- 1
src/pages/OrderManage/JobWarning/index.jsx Parādīt failu

1
+import { history } from 'umi';
2
+import { Button } from 'antd'
3
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
4
+import moment from 'moment';
5
+import PageTable from '@/components/PageTable';
6
+import { getOrderDetail, getWarnList } from '@/services/order'
7
+
8
+const formatterTime = (val) => {
9
+  return val ? moment(val).format('YYYY-MM-DD') : '';
10
+};
1
 export default (props) => {
11
 export default (props) => {
2
-  return <div>预警监管</div>;
12
+  const getOrderDetail = (val) => {
13
+    history.push(`./detail.jsx?id=${val}`);
14
+  }
15
+  const columns = [
16
+    {
17
+      title: '预警时间',
18
+      dataIndex: 'createDate',
19
+      key: 'createDate',
20
+      render: (t) => formatterTime(t),
21
+      search: false,
22
+      width: 80
23
+    },
24
+    {
25
+      title: '消息',
26
+      dataIndex: 'orderNo',
27
+      key: 'orderNo',
28
+      render: (_, record) => '您有 【' + record.orderNo + '】 将于 【' + formatterTime(record.appointmentDate) + '】 预约作业,请尽快处理'
29
+    },
30
+    {
31
+      title: '操作',
32
+      valueType: 'option',
33
+      render: (_, record) => [
34
+        <Button style={{ padding: 0 }} type="link" key={1} onClick={() => getOrderDetail(record.orderId)}>
35
+          订单详情
36
+        </Button>
37
+      ],
38
+    },
39
+  ];
40
+
41
+  return (
42
+    <PageHeaderWrapper>
43
+      <PageTable
44
+        request={getWarnList}
45
+        columns={columns}
46
+        rowKey="orderId"
47
+        options={false}
48
+        search={false}
49
+        scroll={{ x: 1000 }}
50
+      />
51
+    </PageHeaderWrapper>
52
+  );
3
 };
53
 };

+ 10
- 0
src/pages/OrderManage/OrderList/index.jsx Parādīt failu

39
   useEffect(() => {
39
   useEffect(() => {
40
     getCooperativeList().then((res) => {
40
     getCooperativeList().then((res) => {
41
       setCooperativeList(res.records);
41
       setCooperativeList(res.records);
42
+    }).catch((err) => {
43
+      console.log(err.message)
42
     });
44
     });
43
     getMachineryTypeList().then((res) => {
45
     getMachineryTypeList().then((res) => {
44
       setMachineryTypeList(res.records);
46
       setMachineryTypeList(res.records);
47
+    }).catch((err) => {
48
+      console.log(err.message)
45
     });
49
     });
46
   }, []);
50
   }, []);
47
   const columns = [
51
   const columns = [
52
+    {
53
+      title: '订单号',
54
+      dataIndex: 'orderNo',
55
+      key: 'orderNo',
56
+      search: false
57
+    },
48
     {
58
     {
49
       title: '合作社',
59
       title: '合作社',
50
       dataIndex: 'orgId',
60
       dataIndex: 'orgId',

+ 15
- 5
src/pages/OrderManage/dispatch.jsx Parādīt failu

51
       } else {
51
       } else {
52
         setDispatch({ ...dispatch, machineryId: e })
52
         setDispatch({ ...dispatch, machineryId: e })
53
       }
53
       }
54
-    }))
54
+    })).catch((err) => {
55
+      console.log(err.message)
56
+    });
55
   }
57
   }
56
   const changeUser = (e) => {
58
   const changeUser = (e) => {
57
     setDispatch({ ...dispatch, workerId: e })
59
     setDispatch({ ...dispatch, workerId: e })
76
       setDispatch(res)
78
       setDispatch(res)
77
       getMachineryList({ orgId: res.orgId, status: 1, typeId: res.typeId, pageSize: 999 }).then((res2) => {
79
       getMachineryList({ orgId: res.orgId, status: 1, typeId: res.typeId, pageSize: 999 }).then((res2) => {
78
         setMachineryList(res2.records)
80
         setMachineryList(res2.records)
79
-      })
81
+      }).catch((err) => {
82
+        console.log(err.message)
83
+      });
80
       getUserList({ org_id: res.orgId, pageSize: 999 }).then(res3 => {
84
       getUserList({ org_id: res.orgId, pageSize: 999 }).then(res3 => {
81
         setUserList(res3.records)
85
         setUserList(res3.records)
82
-      })
86
+      }).catch((err) => {
87
+        console.log(err.message)
88
+      });
83
       if (res.dispatchStatus == 1) {
89
       if (res.dispatchStatus == 1) {
84
         getdispatchId(id).then(res4 => {
90
         getdispatchId(id).then(res4 => {
85
           setDispatchId(res4.dispatchId)
91
           setDispatchId(res4.dispatchId)
86
           setDispatch({ ...res, machineryId: res4.machineryId, workerId: res4.workerId })
92
           setDispatch({ ...res, machineryId: res4.machineryId, workerId: res4.workerId })
87
-        })
93
+        }).catch((err) => {
94
+          console.log(err.message)
95
+        });
88
       }
96
       }
89
-    })
97
+    }).catch((err) => {
98
+      console.log(err.message)
99
+    });
90
   }, [id])
100
   }, [id])
91
   return (
101
   return (
92
     <Card>
102
     <Card>

+ 4
- 0
src/pages/OrderManage/index.jsx Parādīt failu

38
   useEffect(() => {
38
   useEffect(() => {
39
     getCooperativeList().then((res) => {
39
     getCooperativeList().then((res) => {
40
       setCooperativeList(res.records);
40
       setCooperativeList(res.records);
41
+    }).catch((err) => {
42
+      console.log(err.message)
41
     });
43
     });
42
     getMachineryTypeList().then((res) => {
44
     getMachineryTypeList().then((res) => {
43
       setMachineryTypeList(res.records);
45
       setMachineryTypeList(res.records);
46
+    }).catch((err) => {
47
+      console.log(err.message)
44
     });
48
     });
45
   }, []);
49
   }, []);
46
   const columns = [
50
   const columns = [

+ 2
- 0
src/pages/SystemManagement/BasicParameters/index.jsx Parādīt failu

19
   useEffect(() => {
19
   useEffect(() => {
20
     getSetting().then((res) => {
20
     getSetting().then((res) => {
21
       setData(res.records);
21
       setData(res.records);
22
+    }).catch((err) => {
23
+      console.log(err.message)
22
     });
24
     });
23
   }, []);
25
   }, []);
24
   return (
26
   return (

+ 3
- 1
src/pages/SystemManagement/Region/index.jsx Parādīt failu

27
         message.success(`修改成功`);
27
         message.success(`修改成功`);
28
         onCancel();
28
         onCancel();
29
         actionRef.current.reload();
29
         actionRef.current.reload();
30
+      }).catch((err) => {
31
+        console.log(err.message)
30
       });
32
       });
31
     } else {
33
     } else {
32
       addRegion(values)
34
       addRegion(values)
59
         actionRef.current.reload();
61
         actionRef.current.reload();
60
       })
62
       })
61
       .catch((err) => {
63
       .catch((err) => {
62
-        message.error(err);
64
+        console.log(err.message)
63
       });
65
       });
64
   };
66
   };
65
   useEffect(() => {
67
   useEffect(() => {

+ 5
- 5
src/pages/SystemManagement/UserRights/index.jsx Parādīt failu

58
         actionRef.current.reload();
58
         actionRef.current.reload();
59
       })
59
       })
60
       .catch((err) => {
60
       .catch((err) => {
61
-        message.error(err);
61
+        console.log(err.message)
62
       });
62
       });
63
   };
63
   };
64
   //列表角色授权
64
   //列表角色授权
74
         );
74
         );
75
       })
75
       })
76
       .catch((err) => {
76
       .catch((err) => {
77
-        message.error(err);
77
+        console.log(err.message)
78
       });
78
       });
79
   };
79
   };
80
 
80
 
240
         onEmpowerCancel();
240
         onEmpowerCancel();
241
       })
241
       })
242
       .catch((err) => {
242
       .catch((err) => {
243
-        message.error(err);
243
+        console.log(err.message)
244
         setPLoading(false);
244
         setPLoading(false);
245
       });
245
       });
246
   };
246
   };
303
         setTreeList(list2);
303
         setTreeList(list2);
304
       })
304
       })
305
       .catch((err) => {
305
       .catch((err) => {
306
-        message.error(err);
306
+        console.log(err.message)
307
       });
307
       });
308
     getPermissionList()
308
     getPermissionList()
309
       .then((res) => {
309
       .then((res) => {
310
         setPermissionAllList(res);
310
         setPermissionAllList(res);
311
       })
311
       })
312
       .catch((err) => {
312
       .catch((err) => {
313
-        message.error(err);
313
+        console.log(err.message)
314
       });
314
       });
315
   }, []);
315
   }, []);
316
   useEffect(() => {
316
   useEffect(() => {

+ 6
- 0
src/services/order.js Parādīt failu

6
  * @returns
6
  * @returns
7
  */
7
  */
8
 export const getOrderList = (params) => request('/order', { params });
8
 export const getOrderList = (params) => request('/order', { params });
9
+/**
10
+ * 查询预警列表
11
+ * @param {*} params
12
+ * @returns
13
+ */
14
+export const getWarnList = (params) => request('/order?isWarn=true', { params });
9
 
15
 
10
 /**
16
 /**
11
  * 查询订单详情
17
  * 查询订单详情