Forráskód Böngészése

修改派单用户接口

Renxy 1 éve
szülő
commit
0a5445e916

+ 8 - 2
src/pages/Center/MyTask/List/WorkOrderList.js

@@ -65,7 +65,7 @@ const WorkOrderList = (props) => {
             <Row justify="space-between" style={{ marginBottom: '0.2rem' }}>
               <Col className={styles.fontS24}>{workOrder?.CreateTime}</Col>
               <Col className={styles.fontS24}>
-                工单负责人:{workOrder?.Repairman?.CName || '-'}
+                工单负责人:{workOrder?.Repairman || '-'}
               </Col>
             </Row>
             <Row justify="space-between">
@@ -126,7 +126,13 @@ const WorkOrderList = (props) => {
               CreateTime: item.CreateTime
                 ? dayjs(item.CreateTime).format('YYYY-MM-DD HH:mm')
                 : '-',
-              Repairman: userList.find((user) => item.Responsible === user.ID),
+              Repairman: item.Responsible.split(',')
+                .map(
+                  (cur) =>
+                    userList.find((item) => item.ID == Number(cur))?.CName,
+                )
+                .filter((item) => item)
+                .join(','),
               OrderStatus: OrderStatus.find(
                 (status) => status.value === item.Status,
               ),

+ 1 - 1
src/pages/Home/QualityMng.js

@@ -162,7 +162,7 @@ export const WaterQuality = ({ showTip = false }) => {
           </li>
           <li>
             <div className={styles.pageTopValue}>{getValue(snapshot?.dph)}</div>
-            <div>外供水(PH)</div>
+            <div>外供水PH</div>
           </li>
         </ul>
       </div>

+ 6 - 6
src/pages/TaskManage/models/user.js

@@ -1,13 +1,13 @@
-import { queryUserList } from "../../../services/user";
+import { queryDispatchUserList } from '@/services/user';
 
 export default {
-    namespace: 'taskUser',
+  namespace: 'taskUser',
   state: {
     userList: [],
   },
   effects: {
     *fetchUserList({ payload }, { call, put }) {
-      const response = yield call(queryUserList, payload);
+      const response = yield call(queryDispatchUserList, payload);
       if (response) {
         yield put({
           type: 'userListHandler',
@@ -17,12 +17,12 @@ export default {
     },
   },
 
-  reducers:{
+  reducers: {
     userListHandler(state, { payload }) {
       return {
         ...state,
         userList: payload,
       };
     },
-  }
-};
+  },
+};

+ 4 - 0
src/services/user.js

@@ -11,3 +11,7 @@ export async function queryCurrentV2() {
 export async function queryDailyWorkReport(project_id) {
   return request(`/api/v1//mandate/daily-work-report?project_id=${project_id}`);
 }
+//获取派遣工单用户列表
+export async function queryDispatchUserList(param) {
+  return request(`/api/v1/user/record/${param.project_id}`);
+}