集成

src/components/Autocomplete/index.jsx

@@ -43,6 +43,7 @@ export default (item) => {
     // setvalue(val);
   };
   const selectValue = (val) => {
+    console.log(val);
     onChange(val)   
   };
   return (

src/components/InitForm/index.jsx

@@ -1070,7 +1070,7 @@ let InitForm = ({
 
                 const props = {
                   name: "file",
-                  action: "/wms/ngic-base-business/sysAttachment/uploadFile",
+                  action: "/wmspro/ngic-base-business/sysAttachment/uploadFile",
                   listType: item.listType == "img" ? "picture-card" : "text",
                   accept: item.listType == "img" ? ".jpg,.png,.jpeg," : "*",
                   multiple: item.multiple ? item.multiple : false,

src/components/Tableform/mtable.jsx

@@ -118,7 +118,7 @@ class Mtable extends PureComponent {
                 delete newparams.pageSize;
               }
 
-              let res = await request("/wms" + path, {
+              let res = await request("/wmspro" + path, {
                 body: JSON.stringify(newparams ? newparams : {}),
                 headers,
                 method: "POST",

src/pages/system/Staff/fields.jsx

@@ -23,10 +23,10 @@ export default {
   //   name: ["userName"],
   //   required: true,
   // },
-  accountName: {
+  userName: {
     type: "autocompleteinput",
     title: "用户名-姓名-联系电话-邮箱",
-    name: ["accountName"],
+    name: ["userName"],
     required: true,
     requestOptions: {
       url: "/ngic-auth/sysUser/queryLikeIotUsername",
@@ -75,7 +75,7 @@ export default {
       options: {
         database: (params) =>
           doFetch({
-            url: "/wmspro/ngic-auth/sysStore/selectionBox",
+            url: "/ngic-auth/sysStore/selectionBox",
             params: { ...params },
           }),
         params: {

src/pages/system/Staff/index.jsx

@@ -28,83 +28,83 @@ const initState = {
       key: "1",
       tab: "正式用户",
     },
-    {
-      key: "2",
-      tab: "用户申请",
-    },
+    // {
+    //   key: "2",
+    //   tab: "用户申请",
+    // },
   ];
 function reducer(state, action) {
   let { type } = action,
     newState = {};
-    switch (type) {
-      case "add":
-        newState = {
-          ...state,
-          vs: true,
-          iftype: {
-            title: "新增用户",
-            val: type,
-          },
-          fields: { ...action.fields },
-        };
-        break;
-      case "edit":
-        newState = {
-          ...state,
-          vs: true,
-          iftype: {
-            title: "编辑用户",
-            val: type,
-          },
-          fields: { ...action.fields },
-          curitem: action.curitem,
-        };
-        break;
-      case "audit":
-        newState = {
-          ...state,
-          vs: true,
-          iftype: {
-            title: "审批用户",
-            val: type,
-          },
-          fields: { ...action.fields },
-          curitem: action.curitem,
-        };
-        break;
-      case "see":
-        newState = {
-          ...state,
-          detail: {
-            dataSource: action.dataSource,
-            totalCard: action.totalCard,
-          },
-          visible: true,
-        };
-        break;
-      case "start":
-        newState = {
-          ...state,
-          extraparams: {
-            orderType: action.tabKey,
-          },
-        };
-        break;
-      case "close":
-        newState = {
-          ...state,
-          vs: false,
-          fields: {},
-          iftype: {},
-          curitem: {},
-          detail: {
-            dataSource: {},
-            totalCard: [],
-          },
-          visible: false,
-        };
-        break;
-    }
+  switch (type) {
+    case "add":
+      newState = {
+        ...state,
+        vs: true,
+        iftype: {
+          title: "新增用户",
+          val: type,
+        },
+        fields: { ...action.fields },
+      };
+      break;
+    case "edit":
+      newState = {
+        ...state,
+        vs: true,
+        iftype: {
+          title: "编辑用户",
+          val: type,
+        },
+        fields: { ...action.fields },
+        curitem: action.curitem,
+      };
+      break;
+    case "audit":
+      newState = {
+        ...state,
+        vs: true,
+        iftype: {
+          title: "审批用户",
+          val: type,
+        },
+        fields: { ...action.fields },
+        curitem: action.curitem,
+      };
+      break;
+    case "see":
+      newState = {
+        ...state,
+        detail: {
+          dataSource: action.dataSource,
+          totalCard: action.totalCard,
+        },
+        visible: true,
+      };
+      break;
+    case "start":
+      newState = {
+        ...state,
+        extraparams: {
+          orderType: action.tabKey,
+        },
+      };
+      break;
+    case "close":
+      newState = {
+        ...state,
+        vs: false,
+        fields: {},
+        iftype: {},
+        curitem: {},
+        detail: {
+          dataSource: {},
+          totalCard: [],
+        },
+        visible: false,
+      };
+      break;
+  }
   return newState;
 }
 
@@ -130,13 +130,13 @@ const Staff = (props) => {
     columns = [
       {
         title: "用户名",
-        dataIndex: "accountName",
-        key: "accountName",
+        dataIndex: "userName",
+        key: "userName",
       },
       {
         title: "姓名",
-        dataIndex: "userName",
-        key: "userName",
+        dataIndex: "fullName",
+        key: "fullName",
         render: (_, row) => {
           return (
             <Tooltip title={row.userName}>
@@ -161,7 +161,7 @@ const Staff = (props) => {
                   });
                 }}
               >
-                {row.userName}
+                {row.fullName}
               </a>
             </Tooltip>
           );
@@ -315,21 +315,21 @@ const Staff = (props) => {
     ];
   function extraAction(text, record, _, action) {
     return [
-      extraparams.orderType == "1" &&
-        getPrem("sysUser_restPassword", action, "重置密码", null, {
-          title: "确认重置密码？",
-          onConfirm: () => {
-            doFetch({
-              url: "/ngic-auth/sysUser/restPassword",
-              params: { id: record.id },
-            }).then((res) => {
-              if (res.code == "0000") {
-                message.success(res.msg);
-                reload();
-              }
-            });
-          },
-        }),
+      // extraparams.orderType == "1" &&
+      //   getPrem("sysUser_restPassword", action, "重置密码", null, {
+      //     title: "确认重置密码？",
+      //     onConfirm: () => {
+      //       doFetch({
+      //         url: "/ngic-auth/sysUser/restPassword",
+      //         params: { id: record.id },
+      //       }).then((res) => {
+      //         if (res.code == "0000") {
+      //           message.success(res.msg);
+      //           reload();
+      //         }
+      //       });
+      //     },
+      //   }),
       extraparams.orderType == "1" &&
         getPrem("sysDepartment_save", action, "修改", () => {
           doFetch({
@@ -348,6 +348,15 @@ const Staff = (props) => {
                     },
                   };
                 }
+                if (i == "userName") {
+                  defaultFields[i].disabled = true;
+                  defaultFields[i].value = `${data["userName"]}-${
+                    data["fullName"]
+                  }${data["telephone"] ? "-" + data["telephone"] : ""}${
+                    data["mailNo"] ? "-" + data["mailNo"] : ""
+                  }`;
+                  // defaultFields[i].value = data["userName"];
+                }
               }
               dispatch({
                 type: "edit",
@@ -453,6 +462,9 @@ const Staff = (props) => {
   let saveData = (values, fn) => {
     let newfields = JSON.parse(JSON.stringify(values));
     //新增&修改
+    let originalString = newfields.userName;
+    let userName = originalString?.substring(0, originalString.indexOf("-"));
+    newfields.userName = userName;
     let difrid = iftype.val != "add" ? { id: curitem.id } : {};
     run({
       url:
@@ -469,6 +481,9 @@ const Staff = (props) => {
       onClick={() => {
         for (let i in defaultFields) {
           defaultFields[i].value = i.indexOf("List") != -1 ? [] : "";
+          if (i == "userName") {
+            defaultFields["userName"].disabled = false;
+          }
         }
         dispatch({ type: "add", fields: defaultFields });
       }}
@@ -478,22 +493,22 @@ const Staff = (props) => {
   ];
   return (
     <div>
-      {extraparams.orderType == "1" && (
-        <AutoTable
-          pagetitle={props.route.name} //页面标题
-          pageextra={extrarender} //页面操作 新增or批量删除
-          columns={columns}
-          actionRef={actionRef}
-          onRef={(node) => (ChildRef = node)}
-          tabList={tabList}
-          activeTabKey={extraparams.orderType}
-          onTabChange={(key) => {
-            dispatch({ type: "start", tabKey: key });
-          }}
-          path={"/ngic-auth/sysUser/query/page"}
-        ></AutoTable>
-      )}
-      {extraparams.orderType == "2" && (
+      {/* {extraparams.orderType == "1" && ( */}
+      <AutoTable
+        pagetitle={props.route.name} //页面标题
+        pageextra={extrarender} //页面操作 新增or批量删除
+        columns={columns}
+        actionRef={actionRef}
+        onRef={(node) => (ChildRef = node)}
+        // tabList={tabList}
+        // activeTabKey={extraparams.orderType}
+        onTabChange={(key) => {
+          dispatch({ type: "start", tabKey: key });
+        }}
+        path={"/ngic-auth/sysUser/query/page"}
+      ></AutoTable>
+      {/* ) */}
+      {/* {extraparams.orderType == "2" && (
         <AutoTable
           pagetitle={props.route.name} //页面标题
           columns={columnsc}
@@ -506,7 +521,7 @@ const Staff = (props) => {
           }}
           path={"/ngic-auth/sysAccountApply/queryList"}
         ></AutoTable>
-      )}
+      )} */}
       <DrawInitForm
         title={iftype.title}
         visible={vs}

src/services/craft.js

@@ -2,7 +2,7 @@ import request from "@/utils/request";
 
 //单位下拉框
 export async function unitSelect(params) {
-  return request(`/wms/ngic-base-business/sysDic/querySelectListByParentKey`, {
+  return request(`/wmspro/ngic-base-business/sysDic/querySelectListByParentKey`, {
     method: "POST",
     data: params,
   });
@@ -10,7 +10,7 @@ export async function unitSelect(params) {
 //序列号规则
 export async function serialNumberRuleSelect(params) {
   return request(
-    `/wms/ngic-base-business/bmMainNumberRule/querySunSelectByNoTypeCode`,
+    `/wmspro/ngic-base-business/bmMainNumberRule/querySunSelectByNoTypeCode`,
     {
       method: "POST",
       data: params,
@@ -19,7 +19,7 @@ export async function serialNumberRuleSelect(params) {
 }
 //工艺路线
 export async function processLineSelect(params) {
-  return request(`/wms/ngic-workmanship/pmProcessLine/selectionBox`, {
+  return request(`/wmspro/ngic-workmanship/pmProcessLine/selectionBox`, {
     method: "POST",
     data: params,
   });
@@ -27,7 +27,7 @@ export async function processLineSelect(params) {
 //工艺路线下的工序 下拉
 export async function processByProcessLine(params) {
   return request(
-    `/wms/ngic-workmanship/workingProcedure/query/selectbox/processLine`,
+    `/wmspro/ngic-workmanship/workingProcedure/query/selectbox/processLine`,
     {
       method: "POST",
       data: params,
@@ -37,7 +37,7 @@ export async function processByProcessLine(params) {
 //车间下的工序 下拉
 export async function workingProcedureByShop(params) {
   return request(
-    `/wms/ngic-workmanship/workingProcedure/query/selectbox/shop`,
+    `/wmspro/ngic-workmanship/workingProcedure/query/selectbox/shop`,
     {
       method: "POST",
       data: params,
@@ -46,7 +46,7 @@ export async function workingProcedureByShop(params) {
 }
 //物料工艺路线所属车间的工序 下拉
 export async function processByShop(params) {
-  return request(`/wms/ngic-workmanship/workingProcedure/query/selectbox`, {
+  return request(`/wmspro/ngic-workmanship/workingProcedure/query/selectbox`, {
     method: "POST",
     data: params,
   });
@@ -54,14 +54,14 @@ export async function processByShop(params) {
 
 //产出物料编号-名称-单位 下拉
 export async function selectboxMaterie(params) {
-  return request(`/wms/ngic-workmanship/pmMaterie/query/selectboxMaterie`, {
+  return request(`/wmspro/ngic-workmanship/pmMaterie/query/selectboxMaterie`, {
     method: "POST",
     data: params,
   });
 }
 //标签模板下拉
 export async function bmTableSelect(params) {
-  return request(`/wms/ngic-base-business/bmTable/querySelectByType`, {
+  return request(`/wmspro/ngic-base-business/bmTable/querySelectByType`, {
     method: "POST",
     data: params,
   });

src/services/device.js

@@ -2,7 +2,7 @@ import request from '@/utils/request';
 
 //设备型号下拉框
 export async function equipmentModelList(params) {
-    return request('/wms/ngic-equipment-asset/equipmentModel/query/selection', {
+    return request('/wmspro/ngic-equipment-asset/equipmentModel/query/selection', {
         method: 'POST',
         data: params,
     });
@@ -10,91 +10,91 @@ export async function equipmentModelList(params) {
 
 //设备型号--(保养标准页面)下拉框
 export async function equipmentMaintainModelList(params) {
-    return request('/wms/ngic-equipment-asset/equipmentModel/query/selection/maintainStandard', {
+    return request('/wmspro/ngic-equipment-asset/equipmentModel/query/selection/maintainStandard', {
         method: 'POST',
         data: params,
     });
 }
 //设备型号--(点检标准页面)下拉框
 export async function equipmentCheckModelList(params) {
-    return request('/wms/ngic-equipment-asset/equipmentModel/query/selection/checkStandard', {
+    return request('/wmspro/ngic-equipment-asset/equipmentModel/query/selection/checkStandard', {
         method: 'POST',
         data: params,
     });
 }
 //根据设备型号id查询是寿命件的备件
 export async function lifespareSelect(params) {
-    return request(`/wms/ngic-equipment-asset/equipmentModelSpare/liveparts/selectionbox/byEquipmentModelId`, {
+    return request(`/wmspro/ngic-equipment-asset/equipmentModelSpare/liveparts/selectionbox/byEquipmentModelId`, {
         method: 'POST',
         data: params
     });
 }
 //备件下拉框
 export async function mdmSpareList(params) {
-    return request(`/wms/ngic-spare-parts/mdmSpareParts/mdmSpareList`, {
+    return request(`/wmspro/ngic-spare-parts/mdmSpareParts/mdmSpareList`, {
         method: 'POST',
         data: params
     });
 }
 //设备供应商详情
 export async function deviceprovideDetail(params) {
-    return request('/wms/ngic-auth/sysSupplier/query/detail', {
+    return request('/wmspro/ngic-auth/sysSupplier/query/detail', {
         method: 'POST',
         data: params,
     });
 }
 //供应商下拉框
 export async function equipmentSupplierList(params) {
-    return request('/wms/ngic-equipment-asset/equipmentSupplier/query/selection', {
+    return request('/wmspro/ngic-equipment-asset/equipmentSupplier/query/selection', {
         method: 'POST',
         data: params,
     });
 }
 //设备供应商删除前校验
 export async function deleteProvideCheck(params) {
-    return request('/wms/ngic-equipment-asset/equipmentSupplier/deleteById', {
+    return request('/wmspro/ngic-equipment-asset/equipmentSupplier/deleteById', {
         method: 'POST',
         data: params,
     });
 }
 //设备信息
 export async function equipmentDetail(params) {
-    return request('/wms/ngic-equipment-asset/equipment/queryDetail', {
+    return request('/wmspro/ngic-equipment-asset/equipment/queryDetail', {
         method: 'POST',
         data: params,
     });
 }
 //查询父设备id和子设备id，添加子设备时使用
 export async function equipmentChildren(params) {
-    return request('/wms/ngic-equipment-asset/equipment/queryChildren', {
+    return request('/wmspro/ngic-equipment-asset/equipment/queryChildren', {
         method: 'POST',
         data: params,
     });
 }
 //履历详情
 export async function equipmentLogDetail(params) {
-    return request('/wms/ngic-equipment-asset/equipmentLog/query/detail', {
+    return request('/wmspro/ngic-equipment-asset/equipmentLog/query/detail', {
         method: 'POST',
         data: params,
     });
 }
 //设备类型树查询
 export async function deviceTypequeryTreeList(params) {
-    return request(`/wms/ngic-equipment-asset/equipmentType/queryTreeList`, {
+    return request(`/wmspro/ngic-equipment-asset/equipmentType/queryTreeList`, {
         method: 'POST',
         data: params,
     });
 }
 //设备详情
 export async function equipmentAllDetail(params) {
-    return request('/wms/ngic-equipment-asset/equipment/query/all/detail', {
+    return request('/wmspro/ngic-equipment-asset/equipment/query/all/detail', {
         method: 'POST',
         data: params,
     });
 }
 //设备型号详情
 export async function equipmentModelDetails(params) {
-    return request('/wms/ngic-equipment-asset/equipmentModelSpare/queryById', {
+    return request('/wmspro/ngic-equipment-asset/equipmentModelSpare/queryById', {
         method: 'POST',
         data: params,
     });
@@ -102,14 +102,14 @@ export async function equipmentModelDetails(params) {
 
 //设备下拉框
 export async function equipmentList(params) {
-    return request('/wms/ngic-equipment-asset/equipment/query/selection', {
+    return request('/wmspro/ngic-equipment-asset/equipment/query/selection', {
         method: 'POST',
         data: params,
     });
 }
 //IOT设备下拉框
 export async function equipmentIotRelationList(params) {
-    return request('/wms/ngic-equipment-asset/equipmentIotRelation/query/device/selection', {
+    return request('/wmspro/ngic-equipment-asset/equipmentIotRelation/query/device/selection', {
         method: 'POST',
         data: params,
     });
@@ -117,7 +117,7 @@ export async function equipmentIotRelationList(params) {
 
 //设备下拉框（过滤已报修）
 export async function canApplyRepair(params) {
-    return request('/wms/ngic-equipment-repair/omEquipmentApplyRepair/canApplyRepair/equipmens/selection', {
+    return request('/wmspro/ngic-equipment-repair/omEquipmentApplyRepair/canApplyRepair/equipmens/selection', {
         method: 'POST',
         data: params,
     });
@@ -125,7 +125,7 @@ export async function canApplyRepair(params) {
 
 //关联备件
 export async function equipmentModelSpareImport(params) {
-    return request('/wms/ngic-equipment-asset/equipmentModelSpare/importExcel', {
+    return request('/wmspro/ngic-equipment-asset/equipmentModelSpare/importExcel', {
         method: 'POST',
         data: params,
         type: "form"

src/services/login.js

@@ -10,7 +10,7 @@ export async function fakeAccountLogin(params) {
 
 //登出
 export async function fakeAccountLoginOut(params) {
-  return request(`/mespro/logout`, {
+  return request(`/wmspro/logout`, {
     method: "POST",
     body: params,
   });

src/services/platform.js

@@ -2,20 +2,20 @@ import request from "@/utils/request";
 
 //查询编号类型下拉框(去除已存在的没有子类的类型)
 export async function bmNoType(params) {
-  return request(`/wms/ngic-base-business/bmNoType/querySelect`, {
+  return request(`/wmspro/ngic-base-business/bmNoType/querySelect`, {
     method: "POST",
     data: params,
   });
 }
 //查询编号类型下拉框全部
 export async function bmNoTypeAll(params) {
-  return request(`/wms/ngic-base-business/bmNoType/querySelectAll`, {
+  return request(`/wmspro/ngic-base-business/bmNoType/querySelectAll`, {
     method: "POST",
     data: params,
   });
 }
 export async function bmNoRule(params) {
-  return request(`/wms/ngic-base-business/bmNoRule/querySelect`, {
+  return request(`/wmspro/ngic-base-business/bmNoRule/querySelect`, {
     method: "POST",
     data: params,
   });
@@ -23,7 +23,7 @@ export async function bmNoRule(params) {
 //根据表单id查询条件下拉框
 export async function paFormConditionSelect(params) {
   return request(
-    `/wms/ngic-base-business/paFormCondition/querySelectByFormId`,
+    `/wmspro/ngic-base-business/paFormCondition/querySelectByFormId`,
     {
       method: "POST",
       data: params,
@@ -33,7 +33,7 @@ export async function paFormConditionSelect(params) {
 //根据条件id查询条件值的下拉框
 export async function queryConValueSelect(params) {
   return request(
-    `/wms/ngic-base-business/paFormCondition/queryConValueSelectByconId`,
+    `/wmspro/ngic-base-business/paFormCondition/queryConValueSelectByconId`,
     {
       method: "POST",
       data: params,
@@ -42,7 +42,7 @@ export async function queryConValueSelect(params) {
 }
 //标签模板
 export async function bmTableFileSelect(params) {
-  return request(`/wms/ngic-base-business/bmTableFile/querySelect`, {
+  return request(`/wmspro/ngic-base-business/bmTableFile/querySelect`, {
     method: "POST",
     data: params,
   });
@@ -50,14 +50,14 @@ export async function bmTableFileSelect(params) {
 
 //推送类型下拉
 export async function paBusinessMsgScene(params) {
-  return request(`/wms/ngic-base-business/paBusinessMsgScene/queryAllForSelect`, {
+  return request(`/wmspro/ngic-base-business/paBusinessMsgScene/queryAllForSelect`, {
       method: 'POST',
       data: params,
   });
 }
 //推送配置
 export async function paBusinessMsgOption(params) {
-  return request(`/wms/ngic-base-business/paBusinessMsgOption/queryById`, {
+  return request(`/wmspro/ngic-base-business/paBusinessMsgOption/queryById`, {
       method: 'POST',
       data: params,
   });

src/utils/request.js

@@ -8,7 +8,7 @@ import { history } from "umi";
 const { NODE_ENV } = process.env;
 const baseUrl = NODE_ENV == "development" ? "/wmspro" : "";
 const codeMessage = {
-  200: "服务器成功返回请求的数据。",
+  // 200: "服务器成功返回请求的数据。",
   201: "新建或修改数据成功。",
   202: "一个请求已经进入后台排队（异步任务）。",
   204: "删除数据成功。",
@@ -30,8 +30,12 @@ const codeMessage = {
 
 const errorHandler = (error) => {
   const { response } = error;
+  console.log("异常处理",error);
+  if (response.status === 200) {
+    return;
+  }
   if (response && response.status) {
-    const errorText = codeMessage[response.status] || response.statusText;
+    const errorText = codeMessage?.[response.status] || response.statusText;
     const { status, url } = response;
     if (response?.url.indexOf("api/user_token") == -1) {
       notification.error({